summaryrefslogtreecommitdiff
path: root/npc/guild/ev_agit_event.txt
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-01 21:26:39 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-01 21:26:39 +0000
commit9bcce8c1ddf0e5e131d0cbe3171e6d8b0b392721 (patch)
tree7d6bef434e18384e3ac5cdb6aba28dc210144dac /npc/guild/ev_agit_event.txt
parent5dd2b979968e2a99a896ab062c8f909e31b5cdf1 (diff)
downloadhercules-9bcce8c1ddf0e5e131d0cbe3171e6d8b0b392721.tar.gz
hercules-9bcce8c1ddf0e5e131d0cbe3171e6d8b0b392721.tar.bz2
hercules-9bcce8c1ddf0e5e131d0cbe3171e6d8b0b392721.tar.xz
hercules-9bcce8c1ddf0e5e131d0cbe3171e6d8b0b392721.zip
- Corrected multiple "WoE has begun" announces
- Removed some poor coding from the gunslinger job script - Fixed some engrish - Added missing changelog edit git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10114 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/guild/ev_agit_event.txt')
-rw-r--r--npc/guild/ev_agit_event.txt35
1 files changed, 20 insertions, 15 deletions
diff --git a/npc/guild/ev_agit_event.txt b/npc/guild/ev_agit_event.txt
index ab28d5fdf..202e66e60 100644
--- a/npc/guild/ev_agit_event.txt
+++ b/npc/guild/ev_agit_event.txt
@@ -4,7 +4,7 @@
//= kalen (1.0)
//= 1.1 by Akaru and ho|yAnge|
//===== Current Version: =====================================
-//= 1.5a
+//= 1.6
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -23,6 +23,7 @@
//= Now they appear in castles from 00:01 to 00:24. [Lupus]
//= 1.5 Fixed WOE end messages on non-WOE days, by Avaj
//= 1.5a missing tabs [KarLaeda]
+//= 1.6 Corrected multiple "WoE has begun" announces [ultramage]
//============================================================
//| To know how to set up WoE times, go to doc\woe_time_explanation.txt
// WoE Start/Stop times
@@ -36,25 +37,29 @@ OnClock1600: //start time for Sat(6)
OnClock1800: //end time for Sat(6)
OnAgitInit:
-// starting time checks
-if((gettime(4)==2) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
-if((gettime(4)==4) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
-if((gettime(4)==6) && (gettime(3)>=16 && gettime(3)<18)) goto L_Start;
+ // starting time checks
+ if((gettime(4)==2) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
+ if((gettime(4)==4) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
+ if((gettime(4)==6) && (gettime(3)>=16 && gettime(3)<18)) goto L_Start;
-// end time checks
-if((gettime(4)==2) && (gettime(3)==23)) goto L_End;
-if((gettime(4)==4) && (gettime(3)==23)) goto L_End;
-if((gettime(4)==6) && (gettime(3)==18)) goto L_End;
- end;
+ // end time checks
+ if((gettime(4)==2) && (gettime(3)==23)) goto L_End;
+ if((gettime(4)==4) && (gettime(3)==23)) goto L_End;
+ if((gettime(4)==6) && (gettime(3)==18)) goto L_End;
+ end;
L_End:
-Announce "The War Of Emperium is over!",8;
-AgitEnd;
-end;
+ if (agitcheck()) {
+ Announce "The War Of Emperium is over!",8;
+ AgitEnd;
+ }
+ end;
L_Start:
- Announce "The War Of Emperium has begun!",8;
- AgitStart;
+ if (!agitcheck()) {
+ Announce "The War Of Emperium has begun!",8;
+ AgitStart;
+ }
end;
}