diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt index ab5518346c..9dad8f0440 100644 --- a/npc/cities/prontera.txt +++ b/npc/cities/prontera.txt @@ -1,20 +1,13 @@ //===== rAthena Script ======================================= //= Prontera Town -//===== By: ================================================== -//= kobra_k88 -//===== Current Version: ===================================== -//= 2.1 -//===== Compatible With: ===================================== -//= rAthena Project //===== Description: ========================================= -//= [Official Conversion] //= NPCs in Prontera -//===== Additional Comments: ================================= -//= Fully working -//= +AntiNovice exploit fix [Lupus] 1.2 added baby novice check -//= Spellchecked [massdriller] +//===== Changelogs: ========================================== +//= 1.0 Initial release [kobra_k88] +//= 1.2 added baby novice check [Lupus] +//= 1.3 Spellchecked [massdriller] //= 1.4 Optimized. Novices > 20 BaseJob can go to Culvert, too [Lupus] -//= 1.5a Added a Jawaii related npc [MasterOfMuppets] +//= 1.5 Added a Jawaii related npc [MasterOfMuppets] //= 1.6 Replaced sewer_prt with (MISC_QUEST & 8) [Lupus] //= 1.7 Removed Duplicates [Silent] //= 1.8 Moved Culvert to quests/quests_prontera.txt @@ -25,7 +18,7 @@ // Prontera //============================================================ -prontera,160,330,0 script Guard#pront::prtguard 105,{ +- script Guard#pront::prtguard 105,{ mes "[Prontera Guard]"; mes "Welcome to Prontera."; close; diff --git a/npc/pre-re/cities/prontera.txt b/npc/pre-re/cities/prontera.txt new file mode 100644 index 0000000000..4b88e1fa00 --- /dev/null +++ b/npc/pre-re/cities/prontera.txt @@ -0,0 +1,21 @@ +//===== rAthena Script ======================================= +//= Prontera Town +//===== Description: ========================================= +//= NPCs in Prontera +//===== Changelogs: ========================================== +//= 1.0 Initial release [kobra_k88] +//= 1.2 added baby novice check [Lupus] +//= 1.3 Spellchecked [massdriller] +//= 1.4 Optimized. Novices > 20 BaseJob can go to Culvert, too [Lupus] +//= 1.5 Added a Jawaii related npc [MasterOfMuppets] +//= 1.6 Replaced sewer_prt with (MISC_QUEST & 8) [Lupus] +//= 1.7 Removed Duplicates [Silent] +//= 1.8 Moved Culvert to quests/quests_prontera.txt +//= 1.9 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] +//= 2.0 Removed "Hans Solo", as he is a Jawaii NPC. [L0ne_W0lf] +//= 2.1 Disabled the Library Curator (bugreport:4105) [L0ne_W0lf] +//============================================================ + +// Prontera +//============================================================ +prontera,160,330,4 duplicate(prtguard) Guard#5pront 105 diff --git a/npc/pre-re/scripts_athena.conf b/npc/pre-re/scripts_athena.conf index fa7c315bc3..eac26b68cb 100644 --- a/npc/pre-re/scripts_athena.conf +++ b/npc/pre-re/scripts_athena.conf @@ -10,6 +10,7 @@ npc: npc/pre-re/cities/alberta.txt npc: npc/pre-re/cities/izlude.txt npc: npc/pre-re/cities/jawaii.txt npc: npc/pre-re/cities/lutie.txt +npc: npc/pre-re/cities/prontera.txt npc: npc/pre-re/cities/yuno.txt // --------------------------- Guides --------------------------- diff --git a/npc/re/cities/prontera.txt b/npc/re/cities/prontera.txt new file mode 100644 index 0000000000..86676f541d --- /dev/null +++ b/npc/re/cities/prontera.txt @@ -0,0 +1,22 @@ +//===== rAthena Script ======================================= +//= Prontera Town +//===== Description: ========================================= +//= NPCs in Prontera +//===== Changelogs: ========================================== +//= 1.0 Initial release [kobra_k88] +//= 1.2 added baby novice check [Lupus] +//= 1.3 Spellchecked [massdriller] +//= 1.4 Optimized. Novices > 20 BaseJob can go to Culvert, too [Lupus] +//= 1.5 Added a Jawaii related npc [MasterOfMuppets] +//= 1.6 Replaced sewer_prt with (MISC_QUEST & 8) [Lupus] +//= 1.7 Removed Duplicates [Silent] +//= 1.8 Moved Culvert to quests/quests_prontera.txt +//= 1.9 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] +//= 2.0 Removed "Hans Solo", as he is a Jawaii NPC. [L0ne_W0lf] +//= 2.1 Disabled the Library Curator (bugreport:4105) [L0ne_W0lf] +//============================================================ + +// Prontera +//============================================================ +prontera,52,344,5 duplicate(prtguard) Guard#1pront 105 + diff --git a/npc/re/guides/guides_lighthalzen.txt b/npc/re/guides/guides_lighthalzen.txt index a60c1a6791..11f728f1fb 100644 --- a/npc/re/guides/guides_lighthalzen.txt +++ b/npc/re/guides/guides_lighthalzen.txt @@ -1,19 +1,12 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Lighthalzen Guides -//===== By: ================================================== -//= L0ne_W0lf -//===== Current Version: ===================================== -//= 1.2 -//===== Compatible With: ===================================== -//= rAthena Project -//===== Description: ========================================= -//= [Official Conversion] +//===== Description: ========================================= //= Guides for the city of Lighthalzen. -//===== Additional Comments: ================================= -//= 1.0 First version, Renewal guide. +//===== Changelogs: ========================================== +//= 1.0 Initial release for Renewal [L0ne_W0lf] //= 1.1 Optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 852,{ cutin "ein_soldier",2; @@ -185,3 +178,4 @@ L_Mark: lighthalzen,220,310,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz02 852 lighthalzen,154,100,5 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz03 852 lighthalzen,307,224,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz04 852 +lighthalzen,247,82,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz05 852 diff --git a/npc/re/guides/guides_payon.txt b/npc/re/guides/guides_payon.txt index 6666d6d237..19a5473df0 100644 --- a/npc/re/guides/guides_payon.txt +++ b/npc/re/guides/guides_payon.txt @@ -1,21 +1,14 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Payon Guides -//===== By: ================================================== -//= L0ne_W0lf -//===== Current Version: ===================================== -//= 1.2 -//===== Compatible With: ===================================== -//= rAthena Project -//===== Description: ========================================= -//= [Official Conversion] +//===== Description: ========================================= //= Guides for the city of Payon. -//===== Additional Comments: ================================= -//= 1.0 First version, Renewal guides. +//===== Changelogs: ========================================== +//= 1.0 Initial release for Renewal [L0ne_W0lf] //= 1.1 Fixed and optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ -payon,163,64,3 script Guide#01payon::GuidePayon 708,{ +payon,160,67,3 script Guide#01payon::GuidePayon 708,{ cutin "pay_soldier",2; mes "[Payon Guide]"; mes "Welcome to ^8B4513Payon^000000,"; diff --git a/npc/re/guides/guides_prontera.txt b/npc/re/guides/guides_prontera.txt index 9a8f551cc7..73bb170f3f 100644 --- a/npc/re/guides/guides_prontera.txt +++ b/npc/re/guides/guides_prontera.txt @@ -1,19 +1,11 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Prontera Guides -//===== By: ================================================== -//= L0ne_W0lf -//===== Current Version: ===================================== -//= 1.1 -//===== Compatible With: ===================================== -//= rAthena Project -//===== Description: ========================================= -//= [Official Conversion] +//===== Description: ========================================= //= Guides for the city of Prontera. -//===== Additional Comments: ================================= -//= 1.0 First version, Renewal guides. +//===== Changelogs: ========================================== +//= 1.0 Initial release for Renewal [L0ne_W0lf] //= 1.1 Navigation system update. [Euphy] -//= Optimized. -//============================================================ +//============================================================ prontera,154,187,4 script Guide#01prontera::GuideProntera 105,{ cutin "prt_soldier",2; @@ -299,4 +291,4 @@ L_Mark: prontera,282,208,2 duplicate(GuideProntera) Guide#02prontera 105 prontera,29,200,6 duplicate(GuideProntera) Guide#03prontera 105 prontera,160,29,0 duplicate(GuideProntera) Guide#04prontera 105 -prontera,151,330,4 duplicate(GuideProntera) Guide#05prontera 105 +prontera,159,326,4 duplicate(GuideProntera) Guide#05prontera 105 diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf index 2c7b047ad1..1b8a0a05c2 100644 --- a/npc/re/scripts_athena.conf +++ b/npc/re/scripts_athena.conf @@ -20,6 +20,7 @@ npc: npc/re/cities/lutie.txt npc: npc/re/cities/malangdo.txt npc: npc/re/cities/malaya.txt npc: npc/re/cities/mora.txt +npc: npc/re/cities/prontera.txt npc: npc/re/cities/yuno.txt // --------------------------- Guides ---------------------------