浏览代码

Implemented Shadowlady's idea to allow for different woe start/stop times on different days.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@257 54d463be-8e91-2dee-dedb-b68131a5f0ec
kobra_k88 20 年之前
父节点
当前提交
3bf7211462
共有 2 个文件被更改,包括 21 次插入14 次删除
  1. 4 1
      npc/Changelog.txt
  2. 17 13
      npc/guild/ev_agit_event.txt

+ 4 - 1
npc/Changelog.txt

@@ -34,8 +34,11 @@ Other Ppl
 
 Date		Added
 ======
+11/19
+	* ev_agit_event.txt: Implemented Shadowlady's idea of allowing different woe start/stop times
+	  for different days of the week.[kobra_k88]
 11/18
-      * Fixed typo in payon.txt [celest]
+	* Fixed typo in payon.txt [celest]
 	* - Fixed infinite zeny exploit in novice_skills.txt(other quest skills npcs need revision!!!)
 	  - Fixed typos on izlude.txt, wrong label in umbala.txt [shadow]
 	* Added custom WOE warper (now you can get to Novice Castles from Prontera) [Lupus]

+ 17 - 13
npc/guild/ev_agit_event.txt

@@ -11,13 +11,14 @@
 //= Auto Start for War of Emperium
 //=============================================
 //= gettime(3): Gets hour (24 hour time)
-//= gettime(4): Use it if you only want to have WoE start on 
-//= certain days.
-//= 1=Monday, 2=Tuesday, 3=Wednesday, 4=Thursday, etc.
+//= gettime(4): Gets day of week 1=Monday, 2=Tuesday,
+//= 3=Wednesday, 4=Thursday, etc.
 //===== Additional Comments: =================================
 //= v1.1a changed OnInit to OnAgitInit.[kobra_k88]
 //= v1.2 added gettime checks. removed $AgitStarted var.[kobra_k88]
 //= v1.3 Moved treasure spawn time here.[kobra_k88]
+//= v1.3a Implemented Shadowlady's idea to allow for different
+//= start/stop times on different days.[kobra_k88]
 //============================================================
 
 // WoE Start/Stop times
@@ -25,21 +26,24 @@
 - script Agit_Event -1,{
 	end;
 
+OnClock2100:	//start time for Tues(2), Thurs(4)
+OnClock2300:	//end time for Tues(2), Thurs(4)
+OnClock1600:	//start time for Sat(6)
+OnClock1800:	//end time for Sat(6)
 OnAgitInit:
-	if(gettime(3) >= 17 || gettime(3) < 10) goto L_Stop;
+	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;
+	if(gettime(4)!=2 || gettime(4)!=4 || gettime(4)!=6) end;	//stops script on non woe day
 
-OnClock1000:
-//	if(gettime(4)!=1 || gettime(4)!=3 || gettime(4)!=6) end;
-	Announce "The War Of Emperium has begun!",8;
-	AgitStart;
-	Break;
-
-OnClock1700:
-L_Stop:
-//	if(gettime(4)!=1 || gettime(4)!=3 || gettime(4)!=6) end;
 	Announce "The War Of Emperium is over!",8;
 	AgitEnd;
 	Break;
+
+L_Start:
+	Announce "The War Of Emperium has begun!",8;
+	AgitStart;
+	Break;
 }
 
 // Treasure Spawn Time