- Added svn:eol-style=native property on some recently added text files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16258 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2012-06-10 06:34:50 +00:00
parent 7876a5a38e
commit ccdc1a396c
11 changed files with 13025 additions and 13025 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,67 +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
//===== 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

View File

@ -1,23 +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
//===== 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

View File

@ -1,83 +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;
}
//===== 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;
}

View File

@ -820,4 +820,4 @@ OnTouch:
end;
}
end;
}
}

View File

@ -225,18 +225,18 @@ function script cute_pet_manager {
}
// NPC Duplicates
prontera,67,212,5 duplicate(CPM1) Cute Pet Manager#1 750;
prontera,242,92,3 duplicate(CPM2) Cute Pet Manager#2 750;
prontera,179,92,3 duplicate(CPM3) Cute Pet Manager#3 750;
prontera,67,212,5 duplicate(CPM1) Cute Pet Manager#1 750
prontera,242,92,3 duplicate(CPM2) Cute Pet Manager#2 750
prontera,179,92,3 duplicate(CPM3) Cute Pet Manager#3 750
geffen,180,125,5 duplicate(CPM1) Cute Pet Manager#4 750;
geffen,152,66,3 duplicate(CPM2) Cute Pet Manager#5 750;
geffen,197,95,3 duplicate(CPM3) Cute Pet Manager#6 750;
geffen,180,125,5 duplicate(CPM1) Cute Pet Manager#4 750
geffen,152,66,3 duplicate(CPM2) Cute Pet Manager#5 750
geffen,197,95,3 duplicate(CPM3) Cute Pet Manager#6 750
morocc,115,83,5 duplicate(CPM1) Cute Pet Manager#7 750;
morocc,218,130,3 duplicate(CPM2) Cute Pet Manager#8 750;
morocc,236,225,3 duplicate(CPM3) Cute Pet Manager#9 750;
morocc,115,83,5 duplicate(CPM1) Cute Pet Manager#7 750
morocc,218,130,3 duplicate(CPM2) Cute Pet Manager#8 750
morocc,236,225,3 duplicate(CPM3) Cute Pet Manager#9 750
payon,109,278,5 duplicate(CPM1) Cute Pet Manager#10 750;
payon,157,124,3 duplicate(CPM2) Cute Pet Manager#11 750;
payon,85,237,3 duplicate(CPM3) Cute Pet Manager#12 750;
payon,109,278,5 duplicate(CPM1) Cute Pet Manager#10 750
payon,157,124,3 duplicate(CPM2) Cute Pet Manager#11 750
payon,85,237,3 duplicate(CPM3) Cute Pet Manager#12 750

View File

@ -16855,4 +16855,4 @@ prontera,161,192,5 script Ash Vacuum Warper 707,{
break;
}
end;
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff