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 --- db/re/item_db.txt | 2 +- npc/merchants/shops.txt | 14 +------ npc/merchants/shops_re.txt | 67 ++++++++++++++++++++++++++++++++ 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 ++++++++++++++++++++++++++++++++++++++++ npc/scripts_renewal.conf | 3 ++ sql-files/item_db_re.sql | 5 ++- 9 files changed, 184 insertions(+), 81 deletions(-) create mode 100644 npc/merchants/shops_re.txt create mode 100644 npc/mobs/dungeons/iz_dun_re.txt create mode 100644 npc/mobs/dungeons/lhz_dun_re.txt diff --git a/db/re/item_db.txt b/db/re/item_db.txt index 9187825c7..c1e14e579 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -2207,7 +2207,7 @@ 4299,Clock_Card,Clock Card,6,20,,10,,,,,,,,16,,,,,{ bonus3 bAutoSpellWhenHit,"CR_AUTOGUARD",3+7*(getskilllv("CR_AUTOGUARD")==10),30; },{},{ sc_end SC_AUTOGUARD; } 4300,Chimera_Card,Chimera Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Poison,300+600*(BaseJob==Job_Assassin); },{},{} 4301,Killer_Mantis_Card,Killer Mantis Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Bleeding,600; },{},{} -4302,Tao_Gunka_Card,Tao Gunka Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxHPrate,100; bonus bDef,-50; bonus bMdef,-50; },{},{} +4302,Tao_Gunka_Card,Tao Gunka Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxHPrate,100; bonus bDefRate,-50; bonus bMdefRate,-50; },{},{} 4303,Whisper_Boss_Card,Giant Whisper Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,10; if(readparam(bStr)>=80) bonus bBaseAtk,20; if(readparam(bVit)>=80) bonus bMaxHPrate,3; if(readparam(bLuk)>=80) bonus bCritical,3; },{},{} 4304,Tamruan_Card,Tamruan Card,6,20,,10,,,,,,,,32,,,,,{ bonus bDef,2; bonus2 bSkillAtk,"CR_SHIELDCHARGE",10; bonus2 bSkillAtk,"CR_SHIELDBOOMERANG",10; },{},{} 4305,Turtle_General_Card,Turtle General Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddRace,RC_NonBoss,20; bonus2 bAddRace,RC_Boss,20; bonus3 bAutoSpell,"SM_MAGNUM",10,30; },{},{} diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 6e9a794cc..f8ad2529b 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -34,6 +34,7 @@ //= 2.8 Updates to Brasilis Merchants. [L0ne_W0lf] //= 2.9 Added missing Cooking Items for Material Seller. [tr0n] //= 3.0 Added all new Shops which were available in the latest available official files. [Masao] +//= 3.1 Moved some merchants to a separate renewal file. [Kenpachi] //============================================================ //======================================================= @@ -103,7 +104,6 @@ ein_in01,119,26,4 shop Weapon Dealer#ein 855,1247:-1,1248:-1,1249:-1,13000:-1 ein_in01,189,15,1 shop Tool Dealer#ein 850,1750:-1,1752:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1 einbroch,138,66,4 shop Flu Mask Dealer#ein 850,5114:-1,2218:-1 einbroch,82,199,4 shop Paddler#ein 855,512:-1,645:-1,1750:-1,501:-1 -einbroch,122,250,4 shop Black Marketeer#ein 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 //Official Gunslingers shops. que_ng,179,91,3 shop Chivas Lugal 900,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 que_ng,180,79,3 shop Johnny Waiker 900,13200:-1,13201:-1,13202:-1 @@ -194,8 +194,6 @@ lhz_in02,87,208,3 shop Toy Supplier#lhz 715,2243:-1,2212:-1,2242:-1,2241:-1 lhz_in03,239,106,5 shop Tool Dealer#lhz2 850,501:-1,502:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,611:-1 lhz_in03,258,101,3 shop Arrow Merchant#lhz 855,1750:-1,1770:-1,1752:-1,1751:-1 lhz_in03,249,24,4 shop Merchant#lhz 855,911:-1,910:-1,912:-1,528:-1 -lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 -s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1 //======================================================= // Louyang @@ -212,12 +210,6 @@ xmas_in,168,104,4 shop Armor Dealer#xmas 101,2228:-1,2103:-1,2105:-1,2307:-1,230 xmas_in,169,34,2 shop Gift Seller#xmas 702,2612:-1,744:-1,748:-1,736:-1,746:-1,740:-1,2613:-1 xmas_in,174,98,2 shop Weapon Dealer#xmas 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1 -//======================================================= -// Mid Camp -//======================================================= -mid_camp,129,284,4 shop Trap Specialist#mid 66,7940:-1,12341:-1 -mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 - //======================================================= // Morroc - Post Ep. 12.1 //======================================================= @@ -289,9 +281,7 @@ prt_in,172,132,0 shop Armor Dealer#prt 48,2101:-1,2103:-1,2401:-1,2403:-1,2501:- prt_in,171,140,0 shop Weapon Dealer#prt2 47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1 prt_in,165,140,4 shop Weapon Dealer#prt3 66,1146:-1,1245:-1 prt_in,109,68,4 shop Trap Specialist#prt 66,7940:-1,12341:-1 -prt_in,175,137,4 shop Black Marketeer#prt 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 prt_monk,135,263,5 shop Weapon Dealer#prt4 726,1801:-1,1803:-1,1805:-1 -s_atelier,17,110,1 shop Part-Timer#sc_prt 67,6123:-1,6120:-1 //======================================================= // Rachel @@ -301,9 +291,7 @@ ra_in01,257,269,3 shop Tool Dealer#ra 919,501:-1,502:-1,503:-1,504:-1,506:-1,645 ra_in01,176,389,3 shop Weapon Dealer#ra 931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1,1601:-1,1604:-1,1607:-1 ra_in01,254,300,3 shop Fruit Gardener#ra 931,512:-1,513:-1 ra_in01,263,281,4 shop Trap Specialist#ra 66,7940:-1,12341:-1 -ra_in01,257,266,4 shop Black Marketeer#ra 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 rachel,65,80,1 shop Vegetable Gardener#ra 919,515:-1,535:-1,516:-1 -s_atelier,137,60,3 shop Part-Timer#sc_ra 70,6123:-1,6120:-1 //======================================================= // Turtle Island diff --git a/npc/merchants/shops_re.txt b/npc/merchants/shops_re.txt new file mode 100644 index 000000000..a68854aab --- /dev/null +++ b/npc/merchants/shops_re.txt @@ -0,0 +1,67 @@ +//===== rAthena Script ======================================= +//= Shops +//===== By: ================================================== +//= rAthena Dev Team +//===== Current Version: ===================================== +//= 3.0 +//===== Compatible With: ===================================== +//= rAthena 1.0+ +//===== Description: ========================================= +//= +//===== Additional Comments: ================================= +//= For earlier update notes see the bottom. +//= 2.0 updated several shop npcs. [L0ne_W0lf] +//= Added proper Venom Knife dealer, and consiquently removed wenom Knives from weapon dealers. +//= Moved all Cooking related NPCs to their own section. +//= Re-alphabetized sections. Some of them were out of place. +//= Removed commented out shops. +//= 2.0b Einbech tool dealer got lost somewhere along the way, re-added. [L0ne_W0lf] +//= 2.1 Fixed missing item from "Fresh Fish" from cooking addition shops. [L0ne_W0lf] +//= 2.1a Fixed the second "Line" selling in Comodo Weapon shop. (Should have been Whip) [L0ne_W0lf] +//= 2.2 Added Veins shops. [L0ne_W0lf] +//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 2.4 Fixed Jawaii Ice cream salesman. [L0ne_W0lf] +//= 2.5 Updated Morroc shops to episode 12.1. [L0ne_W0lf] +//= 2.6 Added Brasilis shops. [L0ne_W0lf] +//= Updated Pet Groomers with four new pet feeds. +//= 2.7 Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta. [L0ne_W0lf] +//= Made Brasilis shop names unique, and uncommented. +//= Changed the whip sold in comodo weapon shop. (1956 ->1960) +//= Added Fire and Silver arrow to Einbroch tool dealer. +//= Re-added Bill of Birds to Morroc Item Collectors. +//= 2.7a Actually applied the right update to the comodo weapon shop. [L0ne_W0lf] +//= 2.7b Corrected Brasilis Fruit Merchant. (bugreport:4278) [L0ne_W0lf] +//= 2.8 Updates to Brasilis Merchants. [L0ne_W0lf] +//= 2.9 Added missing Cooking Items for Material Seller. [tr0n] +//= 3.0 Added all new Shops which were available in the latest available official files. [Masao] +//= 3.1 Moved some merchants to a separate renewal file. [Kenpachi] +//============================================================ + +//======================================================= +// Einbroch +//======================================================= +einbroch,122,250,4 shop Black Marketeer#ein 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 + +//======================================================= +// Lighthalzen +//======================================================= +lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 +s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1 + +//======================================================= +// Mid Camp +//======================================================= +mid_camp,129,284,4 shop Trap Specialist#mid 66,7940:-1,12341:-1 +mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 + +//======================================================= +// Prontera +//======================================================= +prt_in,175,137,4 shop Black Marketeer#prt 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 +s_atelier,17,110,1 shop Part-Timer#sc_prt 67,6123:-1,6120:-1 + +//======================================================= +// Rachel +//======================================================= +ra_in01,257,266,4 shop Black Marketeer#ra 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 +s_atelier,137,60,3 shop Part-Timer#sc_ra 70,6123:-1,6120:-1 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 diff --git a/npc/scripts_renewal.conf b/npc/scripts_renewal.conf index a20cec0d6..e468349d3 100644 --- a/npc/scripts_renewal.conf +++ b/npc/scripts_renewal.conf @@ -22,3 +22,6 @@ npc: npc/mobs/fields/dewata.txt npc: npc/mobs/fields/dicastes.txt npc: npc/mobs/fields/malaya.txt npc: npc/mobs/fields/splendide.txt + +//Merchants +npc: npc/merchants/shops_re.txt \ No newline at end of file diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index df448b78e..b34ea6da4 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -371,4 +371,7 @@ REPLACE INTO `item_db_re` VALUES (2560,'Para_Team_Manteau','Eden Team Manteau',5 REPLACE INTO `item_db_re` VALUES (2564,'Feral_Tail','Feral Tail',5,20,NULL,0,NULL,16,NULL,0,0xFFFFFFFF,7,2,4,NULL,75,0,0,'','',''); # Accessories -REPLACE INTO `item_db` VALUES (2629,'Magingiorde','Megingjard',5,20,NULL,8000,NULL,2,NULL,0,0xFFFFFFFF,7,2,136,NULL,94,0,0,'bonus bStr,40+BaseLevel/5; bonus bMdef,7; if(readparam(bStr)==120) bonus2 bAddRace,RC_Boss,10;',NULL,NULL); \ No newline at end of file +REPLACE INTO `item_db` VALUES (2629,'Magingiorde','Megingjard',5,20,NULL,8000,NULL,2,NULL,0,0xFFFFFFFF,7,2,136,NULL,94,0,0,'bonus bStr,40+BaseLevel/5; bonus bMdef,7; if(readparam(bStr)==120) bonus2 bAddRace,RC_Boss,10;',NULL,NULL); + +#Cards +REPLACE INTO `item_db` VALUES (4302,'Tao_Gunka_Card','Tao Gunka Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'bonus bMaxHPrate,100; bonus bDefRate,-50; bonus bMdefRate,-50;',NULL,NULL); \ No newline at end of file -- cgit v1.2.3-70-g09d2