fixed spawn of treasure boxes

fixed present_log
Mobs drops: expanded 8 slots into 10 (except READING info from TXT / SQL dbs. But added a plug - to make eA work with old DBs)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1115 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 82 insertions, 8 deletions

diff --git a/npc/guild/ev_agit_event.txt b/npc/guild/ev_agit_event.txt
index 1c9808414..2696d5864 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.3
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -19,6 +19,8 @@
 //= 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]
+//= 1.4 Fixed treasure chests spawn! We had to unroll some loops
+//= Now they appear in castles from 00:01 to 00:24. [Lupus]
 //============================================================
 
 // WoE Start/Stop times
@@ -51,34 +53,76 @@ L_Start:
 - script TreasSpawn -1,{
 	end;
 
-OnClock0000:
+OnClock0001:
 	callfunc "F_GldTreas","aldeg_cas01","A01",$boxNumA01,$@bxA01,$@boxIdA01,1324,114,218,123,227,0;
+	end;
+OnClock0002:
 	callfunc "F_GldTreas","aldeg_cas02","A02",$boxNumA02,$@bxA02,$@boxIdA02,1326,130,226,138,235,0;
+	end;
+OnClock0003:
 	callfunc "F_GldTreas","aldeg_cas03","A03",$boxNumA03,$@bxA03,$@boxIdA03,1328,220,264,229,273,0;
+	end;
+OnClock0004:
 	callfunc "F_GldTreas","aldeg_cas04","A04",$boxNumA04,$@bxA04,$@boxIdA04,1330,80,8,89,17,0;
+	end;
+OnClock0005:
 	callfunc "F_GldTreas","aldeg_cas05","A05",$boxNumA05,$@bxA05,$@boxIdA05,1332,58,8,65,15,0;
-
+	end;
+OnClock0006:
 	callfunc "F_GldTreas","gefg_cas01","G01",$boxNumG01,$@bxG01,$@boxIdG01,1334,150,108,158,114,0;
+	end;
+OnClock0007:
 	callfunc "F_GldTreas","gefg_cas02","G02",$boxNumG02,$@bxG02,$@boxIdG02,1336,136,112,145,118,0;
+	end;
+OnClock0008:
 	callfunc "F_GldTreas","gefg_cas03","G03",$boxNumG03,$@bxG03,$@boxIdG03,1338,266,286,275,293,0;
+	end;
+OnClock0009:
 	callfunc "F_GldTreas","gefg_cas04","G04",$boxNumG04,$@bxG04,$@boxIdG04,1340,112,114,119,123,0;
+	end;
+OnClock0010:
 	callfunc "F_GldTreas","gefg_cas05","G05",$boxNumG05,$@bxG05,$@boxIdG05,1342,140,106,147,113,0;
-
+	end;
+OnClock0011:
 	callfunc "F_GldTreas","payg_cas01","Py01",$boxNumPy01,$@bxPy01,$@boxIdPy01,1344,286,4,295,13,0;
+	end;
+OnClock0012:
 	callfunc "F_GldTreas","payg_cas02","Py02",$boxNumPy02,$@bxPy02,$@boxIdPy02,1346,140,140,148,149,0;
+	end;
+OnClock0013:
 	callfunc "F_GldTreas","payg_cas03","Py03",$boxNumPy03,$@bxPy03,$@boxIdPy03,1348,154,164,162,173,0;
+	end;
+OnClock0014:
 	callfunc "F_GldTreas","payg_cas04","Py04",$boxNumPy04,$@bxPy04,$@boxIdPy04,1350,142,44,151,51,0;
+	end;
+OnClock0015:
 	callfunc "F_GldTreas","payg_cas05","Py05",$boxNumPy05,$@bxPy05,$@boxIdPy05,1352,152,128,160,135,0;
-
+	end;
+OnClock0016:
 	callfunc "F_GldTreas","prtg_cas01","Pt01",$boxNumPt01,$@bxPt01,$@boxIdPt01,1354,6,204,15,213,0;
+	end;
+OnClock0017:
 	callfunc "F_GldTreas","prtg_cas02","Pt02",$boxNumPt02,$@bxPt02,$@boxIdPt02,1356,198,224,207,233,0;
+	end;
+OnClock0018:
 	callfunc "F_GldTreas","prtg_cas03","Pt03",$boxNumPt03,$@bxPt03,$@boxIdPt03,1358,184,128,193,135,0;
+	end;
+OnClock0019:
 	callfunc "F_GldTreas","prtg_cas04","Pt04",$boxNumPt04,$@bxPt04,$@boxIdPt04,1360,266,158,275,167,0;
+	end;
+OnClock0020:
 	callfunc "F_GldTreas","prtg_cas05","Pt05",$boxNumPt05,$@bxPt05,$@boxIdPt05,1362,272,174,279,181,0;
-
+	end;
+OnClock0021:
 	callfunc "F_GldTreas","nguild_alde","N01",$boxNumN01,$@bxN01,$@boxIdN01,1324,114,218,123,227,0;
+	end;
+OnClock0022:
 	callfunc "F_GldTreas","nguild_gef","N02",$boxNumN02,$@bxN02,$@boxIdN02,1334,150,108,158,114,0;
+	end;
+OnClock0023:
 	callfunc "F_GldTreas","nguild_pay","N03",$boxNumN03,$@bxN03,$@boxIdN03,1344,286,4,295,13,0;
+	end;
+OnClock0024:
 	callfunc "F_GldTreas","nguild_prt","N04",$boxNumN04,$@bxN04,$@boxIdN04,1354,6,204,15,213,0;
 	end;
-}
+}
\ No newline at end of file
diff --git a/npc/guild/gldfunc_treasure.txt b/npc/guild/gldfunc_treasure.txt
index 8f4235556..c1d0f62bd 100644
--- a/npc/guild/gldfunc_treasure.txt
+++ b/npc/guild/gldfunc_treasure.txt
@@ -4,7 +4,7 @@
 //= holyAngelX (1.0)
 //= 1.1 by Akaru and ho|yAnge|X
 //===== Current Version: =====================================
-//= 1.2b
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -32,6 +32,7 @@
 //= v1.2a Function now returns to script that called it.  Removed TreasureSpawn2.
 //= Changed back to using specific global variables for number of boxes and the box id. [kobra_k88]
 //= v1.2b Added a check to allow un broken treasure chests to respawn after map server restart.[kobra_k88]
+//= 1.3 Fixed treasure boxes spawn. (Unrolled one loop a bit) [Lupus]
 //============================================================
 
 
@@ -51,6 +52,35 @@ function	script	F_GldTreas	{
 	set getarg(3), getarg(2);	//sets the counter variable = to the box number amount
 
 TreasureSpawn:
+
+	set getarg(4), getarg(5);	//sets the box id variable = to the box id
+	set $@temp, rand(4);
+	if ($@temp > 2) set getarg(4), getarg(4) + 1;
+	areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
+	set getarg(3), getarg(3) - 1;
+	if(getarg(3) <= 0) return;
+
+	set getarg(4), getarg(5);	//sets the box id variable = to the box id
+	set $@temp, rand(4);
+	if ($@temp > 2) set getarg(4), getarg(4) + 1;
+	areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
+	set getarg(3), getarg(3) - 1;
+	if(getarg(3) <= 0) return;
+
+	set getarg(4), getarg(5);	//sets the box id variable = to the box id
+	set $@temp, rand(4);
+	if ($@temp > 2) set getarg(4), getarg(4) + 1;
+	areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
+	set getarg(3), getarg(3) - 1;
+	if(getarg(3) <= 0) return;
+
+	set getarg(4), getarg(5);	//sets the box id variable = to the box id
+	set $@temp, rand(4);
+	if ($@temp > 2) set getarg(4), getarg(4) + 1;
+	areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
+	set getarg(3), getarg(3) - 1;
+	if(getarg(3) <= 0) return;
+
 	set getarg(4), getarg(5);	//sets the box id variable = to the box id
 	set $@temp, rand(4);
 	if ($@temp > 2) set getarg(4), getarg(4) + 1;