summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-12-02 20:45:52 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-12-02 20:45:52 +0000
commit9585903c287e30279867a9458394dd530f1c2bba (patch)
tree1b9c38b363322de0d85c2f9e44e145683374c23e
parent8df8a2a89f6628fb45c135f1abde6e9d249f5709 (diff)
downloadhercules-9585903c287e30279867a9458394dd530f1c2bba.tar.gz
hercules-9585903c287e30279867a9458394dd530f1c2bba.tar.bz2
hercules-9585903c287e30279867a9458394dd530f1c2bba.tar.xz
hercules-9585903c287e30279867a9458394dd530f1c2bba.zip
- Added mob_avail IDs for iRO Halloween Event 2008, added in r14112. (bugreport:3703)
- Fixed Tatacho's race, should be Brute. (bugreport:3664) - Fixed a label name in Control Device01#aru04. (bugreport:3716) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14185 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/mob_avail.txt5
-rw-r--r--db/mob_db.txt4
-rw-r--r--npc/guild2/arug_cas04.txt2
3 files changed, 8 insertions, 3 deletions
diff --git a/db/mob_avail.txt b/db/mob_avail.txt
index a3c0589f4..4b2e57b34 100644
--- a/db/mob_avail.txt
+++ b/db/mob_avail.txt
@@ -25,6 +25,11 @@
// Sentry
//1904,1286,0
+// iRO Halloween Event 2008
+//3000,1015,0
+//3001,1036,0
+//3002,1298,0
+
// iRO Halloween Event 2009
//3014,1179,0
//3015,1272,0
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 598d812a7..e5c2e5046 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -1032,7 +1032,7 @@
1984,I_ORC_LADY,Shaman Cargalache,Shaman Cargalache,31,2000,0,644,407,1,135,170,10,10,35,42,25,15,69,55,10,12,1,7,42,0x3695,200,1050,900,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
// Another World (13.1)
1985,DANDELION,Dandelion,Dandelion,88,28890,0,8650,3879,2,780,1560,30,35,10,85,4,88,60,30,10,12,1,7,80,12949,150,900,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1986,TATACHO,Tatacho,Tatacho,106,39311,0,23700,13825,1,10000,11000,20,17,106,40,30,25,115,6,10,12,1,7,22,0x108B,150,900,672,480,0,0,0,0,0,0,0,0,6020,4000,579,3000,516,3000,6021,3000,1544,20,1925,10,0,0,0,0,0,0,0,0
+1986,TATACHO,Tatacho,Tatacho,106,39311,0,23700,13825,1,10000,11000,20,17,106,40,30,25,115,6,10,12,1,2,22,0x108B,150,900,672,480,0,0,0,0,0,0,0,0,6020,4000,579,3000,516,3000,6021,3000,1544,20,1925,10,0,0,0,0,0,0,0,0
1987,CENTIPEDE,Centipede,Centipede,110,45662,0,27397,15982,1,15000,16000,40,25,112,43,30,5,131,12,10,12,1,4,45,0x3795,165,1792,792,336,0,0,0,0,0,0,0,0,955,9000,1042,5335,912,5000,943,2500,1741,10,2746,2,2747,2,0,0,0,0,0,0
1988,NEPENTHES,Nepenthes,Nepenthes,75,10350,0,4140,2587,10,415,565,25,10,75,20,30,5,65,5,10,12,1,3,45,0x84,200,637,768,576,0,0,0,0,0,0,0,0,905,9000,6041,3000,993,50,5399,1,1979,1,1926,1,1740,1,0,0,0,0,0,0
1989,HILLSRION,Hillslion,Hillslion,105,34600,0,20760,12110,1,5000,5500,28,15,105,60,30,15,115,5,10,12,0,2,22,0x308D,100,672,500,192,0,0,0,0,0,0,0,0,7054,4850,6032,3000,6020,2000,7063,120,1825,20,1268,10,2440,10,0,0,0,0,0,0
@@ -1043,7 +1043,7 @@
1994,LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,104,25103,0,13040,11410,1,9000,9900,29,5,104,56,30,20,116,4,10,12,1,4,24,0x7795,100,672,500,192,0,0,0,0,0,0,0,0,939,9000,955,9000,943,3000,518,300,526,200,992,160,2744,2,0,0,0,0,0,0
1995,PINGUICULA,Pinguicula,Pinguicula,80,13680,0,5472,3420,1,600,720,25,5,102,23,30,10,86,2,10,12,0,3,62,0x308D,150,864,500,192,0,0,0,0,0,0,0,0,7100,5000,7188,3000,7198,2000,712,1000,2270,10,1980,10,2745,1,0,0,0,0,0,0
1996,BACSOJIN_T,Bacsojin,White Lady,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1997,G_TATACHO,Tatacho,Tatacho,106,39311,0,0,0,1,10000,11000,20,17,106,40,30,25,115,6,10,12,1,7,22,0x108B,150,900,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1997,G_TATACHO,Tatacho,Tatacho,106,39311,0,0,0,1,10000,11000,20,17,106,40,30,25,115,6,10,12,1,2,22,0x108B,150,900,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1998,G_HILLSRION,Hillslion,Hillslion,105,34600,0,0,0,1,5000,5500,28,15,105,60,30,15,115,5,10,12,0,2,22,0x308D,100,672,500,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1999,CENTIPEDE_LARVA,Centipede Larva,Centipede Larva,80,12000,0,3600,4800,1,948,1145,20,20,80,33,15,3,75,10,10,12,0,4,45,0x3795,165,1792,792,336,0,0,0,0,0,0,0,0,955,9000,1042,5335,912,5000,943,2500,732,50,2406,9,0,0,0,0,0,0,0,0
//2000,M_GAMEMASTER,Male Game Master,Game Master,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index e437777d3..afcab1a0d 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -1720,7 +1720,7 @@ arug_cas04,135,212,0 script Control Device02#aru04 111,{
mapannounce "arug_cas04","The 2nd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
setarray $agit_ar04[3],0; //Global Variable
setarray $agit_ar04[2],2; //Global Variable
- donpcevent "Control Device01#aru04::Enable";
+ donpcevent "Control Device01#aru04::OnEnable";
end;
}
else {