From 4261936c19888f098827b63d5c3c094f818d98b1 Mon Sep 17 00:00:00 2001 From: kenpachi2k11 Date: Sat, 9 Jun 2012 18:48:50 +0000 Subject: Moved a few merchants and mob spawns to separate files to prevent error message when running server in pre-RE mode and with TXT databases. (bugreport:5846) Fixed Tao Gunka Cards (#4302) renewal effect. (bugreport:5866) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16247 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/mobs/dungeons/iz_dun.txt | 10 +---- npc/mobs/dungeons/iz_dun_re.txt | 23 +++++++++++ npc/mobs/dungeons/lhz_dun.txt | 58 +--------------------------- npc/mobs/dungeons/lhz_dun_re.txt | 83 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+), 66 deletions(-) create mode 100644 npc/mobs/dungeons/iz_dun_re.txt create mode 100644 npc/mobs/dungeons/lhz_dun_re.txt (limited to 'npc/mobs') diff --git a/npc/mobs/dungeons/iz_dun.txt b/npc/mobs/dungeons/iz_dun.txt index 8518d020d..6e6901de1 100644 --- a/npc/mobs/dungeons/iz_dun.txt +++ b/npc/mobs/dungeons/iz_dun.txt @@ -10,6 +10,7 @@ //= 1.1 Official kRO 10.1 spawns for 1-4 [Playtester] //= 1.2 More accurate spawns [Playtester] //= 1.3 Added Izlude Dungeon F6 spawns [Chilly] +//= 1.3a Moved Izlude Dungeon F6 spawns to separate file. [Kenpachi] //============================================================ //================================================== @@ -108,12 +109,3 @@ iz_dun04,42,129,0,0 monster Hydra 1068,1,312000,150000,0 iz_dun04,80,233,0,0 monster Hydra 1068,1,318000,150000,0 iz_dun04,69,243,0,0 monster Hydra 1068,1,321000,150000,0 iz_dun04,33,115,0,0 monster Hydra 1068,1,321000,150000,0 - -//================================================== -// iz_dun05 - Undersea Tunnel F6 -//================================================== -iz_dun05,0,0,0,0 monster King Dramoh 2198,20,0,0,0 -iz_dun05,0,0,0,0 monster Sropho 2201,50,0,0,0 -iz_dun05,0,0,0,0 monster Pot Dofle 2203,30,0,0,0 -iz_dun05,0,0,0,0 monster Sedora 2204,50,0,0,0 -iz_dun05,0,0,0,0 boss_monster Kraken 2202,1,7200000,600000,1 diff --git a/npc/mobs/dungeons/iz_dun_re.txt b/npc/mobs/dungeons/iz_dun_re.txt new file mode 100644 index 000000000..70c234ffa --- /dev/null +++ b/npc/mobs/dungeons/iz_dun_re.txt @@ -0,0 +1,23 @@ +//===== rAthena Script ======================================= +//= Byalan Dungeon Monster Spawn Script +//===== By: ================================================== +//= Athena (1.0) +//===== Current Version: ===================================== +//= 1.3 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Additional Comments: ================================= +//= 1.1 Official kRO 10.1 spawns for 1-4 [Playtester] +//= 1.2 More accurate spawns [Playtester] +//= 1.3 Added Izlude Dungeon F6 spawns [Chilly] +//= 1.3a Moved Izlude Dungeon F6 spawns to separate file. [Kenpachi] +//============================================================ + +//================================================== +// iz_dun05 - Undersea Tunnel F6 +//================================================== +iz_dun05,0,0,0,0 monster King Dramoh 2198,20,0,0,0 +iz_dun05,0,0,0,0 monster Sropho 2201,50,0,0,0 +iz_dun05,0,0,0,0 monster Pot Dofle 2203,30,0,0,0 +iz_dun05,0,0,0,0 monster Sedora 2204,50,0,0,0 +iz_dun05,0,0,0,0 boss_monster Kraken 2202,1,7200000,600000,1 diff --git a/npc/mobs/dungeons/lhz_dun.txt b/npc/mobs/dungeons/lhz_dun.txt index 54495a614..d42c7a19d 100644 --- a/npc/mobs/dungeons/lhz_dun.txt +++ b/npc/mobs/dungeons/lhz_dun.txt @@ -22,6 +22,7 @@ //= 1.7a Added dummy event to keep from causnig warnings. [L0ne_W0lf] //= 1.8 Corrected MVP spawn variance (Labs2 MVP). [L0ne_W0lf] //= 1.9 Added Bio4 spawns. [Chilly] +//= 1.9a Moved Bio4 spawns to separate file. [Kenpachi] //============================================================ //================================================== @@ -104,60 +105,3 @@ OnMyMVPDead: OnMy99Dead: end; } - -//======================================================================================== -// lhz_dun04 - Bio-life Labs 4F -//======================================================================================== -lhz_dun04,0,0,0,0 monster Randel 2221,50,5000,0,0 -lhz_dun04,0,0,0,0 monster Flamel 2222,50,5000,0,0 -lhz_dun04,0,0,0,0 monster Celia 2223,50,5000,0,0 -lhz_dun04,0,0,0,0 monster Chen 2224,50,5000,0,0 -lhz_dun04,0,0,0,0 monster Gertie 2225,50,5000,0,0 -lhz_dun04,0,0,0,0 monster Alphoccio 2226,50,5000,0,0 -lhz_dun04,0,0,0,0 monster Trentini 2227,50,5000,0,0 -lhz_dun04,0,0,0,0 monster Paladin Randel 2228,1,2700000,2400000,1 -lhz_dun04,0,0,0,0 monster Creator Flamel 2229,1,3000000,2700000,1 -lhz_dun04,0,0,0,0 monster Professor Celia 2230,1,2580000,2340000,1 -lhz_dun04,0,0,0,0 monster Champion Chen 2231,1,2700000,2500000,1 -lhz_dun04,0,0,0,0 monster Stalker Gertie 2232,1,3300000,3000000,1 -lhz_dun04,0,0,0,0 monster Clown Alphoccio 2233,1,2580000,2460000,1 -lhz_dun04,0,0,0,0 monster Gypsy Trentini 2234,1,2580000,2460000,1 - -lhz_dun04,0,0,0 script mvp_lhz_dun04 -1,{ -OnTimer6000000: // delay1 = 6000000 ms (100 min) - stopnpctimer; - sleep rand(0,30)*60000; // 0 to 30 minutes -OnInit: - // Select Coordinates to summon a random MVP on - switch(rand(1,7)) { - case 1: set .@x,77; set .@y,251; break; - case 2: set .@x,147; set .@y,224; break; - case 3: set .@x,219; set .@y,219; break; - case 4: set .@x,244; set .@y,120; break; - case 5: set .@x,149; set .@y,41; break; - case 6: set .@x,53; set .@y,109; break; - case 7: set .@x,149; set .@y,151; break; - } - set .@mob,rand(2235,2241); - monster "lhz_dun04",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(3)+"::OnMyMVPDead"; - - // Select Coordinates to summon a random 99 on - switch(rand(1,7)) { - case 1: set .@x2,77; set .@y2,251; break; - case 2: set .@x2,147; set .@y2,224; break; - case 3: set .@x2,219; set .@y2,219; break; - case 4: set .@x2,244; set .@y2,120; break; - case 5: set .@x2,149; set .@y2,41; break; - case 6: set .@x2,53; set .@y2,109; break; - case 7: set .@x2,149; set .@y2,151; break; - } - set .@mob2,rand(2228,2234); - monster "lhz_dun04",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(3)+"::OnMy99Dead"; - end; - -OnMyMVPDead: - killmonster "lhz_dun04",strnpcinfo(3)+"::OnMy99Dead"; - initnpctimer; -OnMy99Dead: - end; -} diff --git a/npc/mobs/dungeons/lhz_dun_re.txt b/npc/mobs/dungeons/lhz_dun_re.txt new file mode 100644 index 000000000..03a508ce5 --- /dev/null +++ b/npc/mobs/dungeons/lhz_dun_re.txt @@ -0,0 +1,83 @@ +//===== rAthena Script ======================================= +//= Lighthalzen Dungeon(Biolabs) Monster Spawn Script +//===== By: ================================================== +// The Prometheus Project, rAthena dev team +//===== Current Version: ===================================== +//= 1.9 +//===== Compatible With: ===================================== +//= Any Athena +//===== Additional Comments: ================================= +//= 08/24/05 : Added 1st version. [Muad_Dib] +//= 1.1: Some corrections to level 1, 2 as pointed out by +//= MasterofMuppets. [Skotlex] +//= 1.3: Some fixes based on kRO's "RO Map" [Poki#3] +//= I also made the place more Moby ^^ +//= 1.4: Adjusted spawns according to own info from iRO [MasterOfMuppets] +//= 1.5: More accurate spawn numbers and iRO names thanks to Tharis [Playtester] +//= 1.6: Official X.3 spawns [Playtester] +//= 1.7 Corrected MVP spawn function to be standard to iRO. [L0ne_W0lf] +//= - A random 99 will now be spawned when the MVP spawns. +//= - Spare spawn and MVP spawn now spawn in official locations. +//= - Expandeded timer to allow for varying spawn times. +//= 1.7a Added dummy event to keep from causnig warnings. [L0ne_W0lf] +//= 1.8 Corrected MVP spawn variance (Labs2 MVP). [L0ne_W0lf] +//= 1.9 Added Bio4 spawns. [Chilly] +//= 1.9a Moved Bio4 spawns to separate file. [Kenpachi] +//============================================================ + +//======================================================================================== +// lhz_dun04 - Bio-life Labs 4F +//======================================================================================== +lhz_dun04,0,0,0,0 monster Randel 2221,50,5000,0,0 +lhz_dun04,0,0,0,0 monster Flamel 2222,50,5000,0,0 +lhz_dun04,0,0,0,0 monster Celia 2223,50,5000,0,0 +lhz_dun04,0,0,0,0 monster Chen 2224,50,5000,0,0 +lhz_dun04,0,0,0,0 monster Gertie 2225,50,5000,0,0 +lhz_dun04,0,0,0,0 monster Alphoccio 2226,50,5000,0,0 +lhz_dun04,0,0,0,0 monster Trentini 2227,50,5000,0,0 +lhz_dun04,0,0,0,0 monster Paladin Randel 2228,1,2700000,2400000,1 +lhz_dun04,0,0,0,0 monster Creator Flamel 2229,1,3000000,2700000,1 +lhz_dun04,0,0,0,0 monster Professor Celia 2230,1,2580000,2340000,1 +lhz_dun04,0,0,0,0 monster Champion Chen 2231,1,2700000,2500000,1 +lhz_dun04,0,0,0,0 monster Stalker Gertie 2232,1,3300000,3000000,1 +lhz_dun04,0,0,0,0 monster Clown Alphoccio 2233,1,2580000,2460000,1 +lhz_dun04,0,0,0,0 monster Gypsy Trentini 2234,1,2580000,2460000,1 + +lhz_dun04,0,0,0 script mvp_lhz_dun04 -1,{ +OnTimer6000000: // delay1 = 6000000 ms (100 min) + stopnpctimer; + sleep rand(0,30)*60000; // 0 to 30 minutes +OnInit: + // Select Coordinates to summon a random MVP on + switch(rand(1,7)) { + case 1: set .@x,77; set .@y,251; break; + case 2: set .@x,147; set .@y,224; break; + case 3: set .@x,219; set .@y,219; break; + case 4: set .@x,244; set .@y,120; break; + case 5: set .@x,149; set .@y,41; break; + case 6: set .@x,53; set .@y,109; break; + case 7: set .@x,149; set .@y,151; break; + } + set .@mob,rand(2235,2241); + monster "lhz_dun04",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(3)+"::OnMyMVPDead"; + + // Select Coordinates to summon a random 99 on + switch(rand(1,7)) { + case 1: set .@x2,77; set .@y2,251; break; + case 2: set .@x2,147; set .@y2,224; break; + case 3: set .@x2,219; set .@y2,219; break; + case 4: set .@x2,244; set .@y2,120; break; + case 5: set .@x2,149; set .@y2,41; break; + case 6: set .@x2,53; set .@y2,109; break; + case 7: set .@x2,149; set .@y2,151; break; + } + set .@mob2,rand(2228,2234); + monster "lhz_dun04",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(3)+"::OnMy99Dead"; + end; + +OnMyMVPDead: + killmonster "lhz_dun04",strnpcinfo(3)+"::OnMy99Dead"; + initnpctimer; +OnMy99Dead: + end; +} \ No newline at end of file -- cgit v1.2.3-60-g2f50