From c76520133af5eb354e047290dc8d94ace3c0e519 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Tue, 3 Jun 2014 18:42:57 +0000
Subject: [PATCH] Merged from revision: 2051 - Fixed resetting boxes fought (by
 anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2052 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/Scripts/HourlyUpdate.lua |   4 ++--
 gamedir/Data/NPCData/087.npc               | Bin 0 -> 1600 bytes
 gamedir/Data/Scripts/HourlyUpdate.lua      |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 gamedir/Data/NPCData/087.npc

diff --git a/gamedir/Data-1.13/Scripts/HourlyUpdate.lua b/gamedir/Data-1.13/Scripts/HourlyUpdate.lua
index 1ceb6483f..974b1ee7e 100644
--- a/gamedir/Data-1.13/Scripts/HourlyUpdate.lua
+++ b/gamedir/Data-1.13/Scripts/HourlyUpdate.lua
@@ -17,13 +17,13 @@ function HourlyQuestUpdate()
 	end
 
 	-- Bar/night club
-	if ( cHour > 15 or cHour < 2) then
+	if ( cHour >= 15 or cHour < 2) then
 	
 		SetFactTrue( Facts.FACT_CLUB_OPEN )
 		SetFactFalse( Facts.FACT_PAST_CLUB_CLOSING_AND_PLAYER_WARNED )
 
 		-- Reset boxes fought
-		for i = 0,3 do
+		for i = 0,2 do
 			-- Set false
 			gfBoxerFought(i,false)
 		end
diff --git a/gamedir/Data/NPCData/087.npc b/gamedir/Data/NPCData/087.npc
new file mode 100644
index 0000000000000000000000000000000000000000..9cf86b816b351f836efe84e85877ef50b665b7e6
GIT binary patch
literal 1600
zcmeH_O-{o=4254x6p1z|;=d_>g^B~QV#TTp5F7*viK77$+wOrYfI!C2Gf5m$)B`}I
zrqh0Y_Or(Ta0U^96etos=t-cTkrJTS@L`*8*PJ3%tswJy!=|r!?)i?>f0_df0>4p0
z4}4hP^k&NI4KL-4da>-1<Jjv%f8>|Ag8B#clhitK{gbnPO1`>CKUY4ZKEu%Sgwp6w
z9Z<j4V=9ej&RgSri5Tx=)9XLF{7CslfthJ4JlEf*&mdlZUj;PzPdyL*7*y9k>GClD
z=x?3%2e`)DS9L!v{YKy-4R7hULjR?fuJ)^?-}UwHi0t9ebZUJZc>Yjf%@z4*2``nO
zPc)wOAG`W7c^P@YseV0&`2u@B|C0rf>vZU^heOXBeY_uFvY3~N%{Rx?^ROSx{~GH5
s*x!(!@B03@AL^vNACCVz-*~@VO?D#OX`kQz9k=)Ey$Sd~{n-h81BjcwnE(I)

literal 0
HcmV?d00001

diff --git a/gamedir/Data/Scripts/HourlyUpdate.lua b/gamedir/Data/Scripts/HourlyUpdate.lua
index 1ceb6483f..974b1ee7e 100644
--- a/gamedir/Data/Scripts/HourlyUpdate.lua
+++ b/gamedir/Data/Scripts/HourlyUpdate.lua
@@ -17,13 +17,13 @@ function HourlyQuestUpdate()
 	end
 
 	-- Bar/night club
-	if ( cHour > 15 or cHour < 2) then
+	if ( cHour >= 15 or cHour < 2) then
 	
 		SetFactTrue( Facts.FACT_CLUB_OPEN )
 		SetFactFalse( Facts.FACT_PAST_CLUB_CLOSING_AND_PLAYER_WARNED )
 
 		-- Reset boxes fought
-		for i = 0,3 do
+		for i = 0,2 do
 			-- Set false
 			gfBoxerFought(i,false)
 		end