From df7b928e6a9ec75a8067ba41ad23a6630adb3fd2 Mon Sep 17 00:00:00 2001 From: Wanne 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 --- Data-1.13/Scripts/HourlyUpdate.lua | 4 ++-- Data/NPCData/087.npc | Bin 1600 -> 1600 bytes Data/Scripts/HourlyUpdate.lua | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Data-1.13/Scripts/HourlyUpdate.lua b/Data-1.13/Scripts/HourlyUpdate.lua index 1ceb6483f..974b1ee7e 100644 --- a/Data-1.13/Scripts/HourlyUpdate.lua +++ b/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/Data/NPCData/087.npc b/Data/NPCData/087.npc index 60e78656c1b1e005f2b2aaf0079d4e03e98cb387..9cf86b816b351f836efe84e85877ef50b665b7e6 100644 GIT binary patch delta 70 zcmX@WbAV?;r_lfZ3=G_i|ABxZn}LA=NKM?WIx&HBO#lB+Ucn^C0h0XB#UL?x T9g_q|>;;n?klM__Y{3iwc~&20 delta 86 zcmX@WbAV?;rz*pL1_o}%|3JWy&A`9_q~M?cBn*=0oX97(@yH`are_S3S1`$OJOc{; Y=VFkUypBl%B=&+y4oGe0V76ce02|&M+5i9m diff --git a/Data/Scripts/HourlyUpdate.lua b/Data/Scripts/HourlyUpdate.lua index 1ceb6483f..974b1ee7e 100644 --- a/Data/Scripts/HourlyUpdate.lua +++ b/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