summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/cities/gonryun.txt9
-rw-r--r--npc/cities/lighthalzen.txt5
-rw-r--r--npc/cities/umbala.txt5
-rw-r--r--npc/jobs/novice/novice.txt15
-rw-r--r--npc/merchants/socket_enchant.txt9
-rw-r--r--npc/other/dts_warper.txt21
-rw-r--r--npc/quests/The_Sign_Quest.txt55
-rw-r--r--npc/quests/seals/brisingamen_seal.txt5
-rw-r--r--npc/quests/seals/god_weapon_creation.txt6
-rw-r--r--npc/quests/skills/alchemist_skills.txt13
-rw-r--r--npc/quests/skills/wizard_skills.txt5
-rw-r--r--npc/warps/dungeons/lhalzen_dun.txt9
13 files changed, 85 insertions, 73 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 4f9c51556..196aeeee9 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -33,6 +33,7 @@ Playtester
Date Added
======
09/01
+ * Tried to remove all duplicates (in default NPCs) [Toms]
* Removed useless 'npc\other\old' directory, who would need that anyway... [DracoRPG]
* Commented out the path to Divorce NPC as Lupus forgot to add it for good [DracoRPG]
* Fixed critical syntax errors in the new Valkyrie script, (č_é) @ Lupus [DracoRPG]
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index 150d095ff..29a30510c 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -12,13 +12,14 @@
// May be missing npc's and dialogue.
//= 1.1 Fixed Typo’s [Nexon]
//= 1.2 Removed Duplicates [Silent]
+//= 1.3 Max NPC Name is 23 [Toms]
//============================================================
//Event–˘’˛¸I
-alberta.gat,245,69,4 script Gonryun Public Relations Official#01 776,{
+alberta.gat,245,69,4 script Public Relations#01 776,{
mes "[Waba]";
mes "Hello there! I have traveled far from the Kingdom of Gonryun, my hometown.";
mes "I invite all to visit and celebrate the diversity of Gonryun! We welcome all sorts of visitors.";
@@ -58,7 +59,7 @@ alberta.gat,245,69,4 script Gonryun Public Relations Official#01 776,{
//===============================================================================
-gon_fild01.gat,255,79,6 script Gonryun Public Relations Official#02 776,{
+gon_fild01.gat,255,79,6 script Public Relations#02 776,{
mes "[Waba]";
mes "We are ready to head back as soon as the conditions are favorable.";
next;
@@ -74,7 +75,7 @@ gon_fild01.gat,255,79,6 script Gonryun Public Relations Official#02 776,{
//===============================================================================
-gon_fild01.gat,187,239,4 script Gonryun Public Relations Official#03 776,{
+gon_fild01.gat,187,239,4 script Public Relations#03 776,{
mes "[Choseryu]";
mes "The sacred pillar of light connects this island to Gonryun Kingdom. There's no time to idly chit chat now, be on your way.";
mes "I hope you will have many fond memories of Gonryun before you leave.";
@@ -83,7 +84,7 @@ gon_fild01.gat,187,239,4 script Gonryun Public Relations Official#03 776,{
//===============================================================================
-gonryun.gat,153,64,0 script Gonryun Public Relations Official#04 776,{
+gonryun.gat,153,64,0 script Public Relations#04 776,{
mes "[Choseryu]";
mes "If you're ready to set sail I can send you back to the harbor.";
next;
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index a18b4db36..3564084d3 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA
//===== Current Version: =====================================
-//= 0.8
+//= 0.9
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 0.6 Fixed some typos+Coordinates. [Musashiden]
//= 0.7 Implemented some more crap NPCs and the second entrance to biolabs [MasterOfMuppets]
//= 0.8 Removed Duplicates [Silent]
+//= 0.9 Removed Duplicates [Toms]
//=============================================================
lighthalzen.gat,198,285,5 script Jiwon 862,{
@@ -1908,7 +1909,7 @@ lhz_in01.gat,173,28,4 script Guard#01::LhzRekGuard 868,{
}
-lhz_in01.gat,180,28,4 duplicate(LhzRekGuard) Guard#02 868
+lhz_in01.gat,180,28,4 duplicate(LhzRekGuard) Guard#03 868
lhz_in01.gat,72,209,4 script Guide#01 862,{
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index 49b71609b..c0ae1e84d 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -20,6 +20,7 @@
//= 1.7 - Fixed bugs and exploits [Lupus]
//= 1.8 - Warps you to Niff with 1HP [Lance]
//= 1.9 - Moved Umbala Event, Create Essence/Dismantle Stone, and Skeletal Gate to npc/quests/quests_umbala.txt [Evera]
+//= 2.0 - Removed duplicates, max NPC name length is 23, so Utan Tribe Young Adult#1, the 1 is skipped [Toms]
//============================================================
@@ -530,7 +531,7 @@ LumWord:
}
//=====================================================================
-umbala.gat,140,157,6 script Utan Tribe Young Adult#1 785,{
+umbala.gat,140,157,6 script Utan Tribe Young Adult::UtanTribeYougAdult1 785,{
if(event_umbala < 3) goto LumWord;
mes "[Seirutan]";
mes "Bungy jumping is extremely dangerous.";
@@ -668,7 +669,7 @@ LumWord:
}
//=====================================================================
-umbala.gat,139,205,4 script Utan Tribe Young Adult#5 785,{
+umbala.gat,139,205,4 script Utan Tribe Young Adult::UtanTribeYougAdult5 785,{
if(event_umbala < 3) goto LumWord;
mes "[Tsunitan]";
mes "Awesome! I haven't seen an outsider in some time.";
diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index 7016a1fb2..67e5ce2a6 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Dr.Evil & MasterOfMuppets
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN 3422+(Requires jA Script System)
//===== Description: =========================================
@@ -14,6 +14,7 @@
//= to Dr.Evil who did 90% of the work =)
//= 1.0b Temp measure to stop exploits. [Vicious]
//= 1.2 Removed Duplicates [Silent]
+//= 1.3 Removed Duplicates [Toms]
//============================================================
//====================================================================
@@ -2038,7 +2039,7 @@ new_1-2.gat,38,182,4 script Helper 92,{
}
}
-new_1-2.gat,17,182,6 script Helper 84,{
+new_1-2.gat,17,182,6 script Helper#2 84,{
if (!(NEW_MES_FLAG4)) {
mes "[Elmeen]";
mes "Congratulations!";
@@ -2418,7 +2419,7 @@ function script training_personnel3 {
return;
}
-new_1-3.gat,95,30,4 script Training Center Employee#01 84,{
+new_1-3.gat,95,30,4 script Training Center Employee::TrainingCenterEmploye#1 84,{
callfunc "training_personnel";
switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) {
case 1: callfunc "training_personnel2"; break;
@@ -2426,7 +2427,7 @@ new_1-3.gat,95,30,4 script Training Center Employee#01 84,{
case 3: callfunc "training_personnel0";
}
}
-new_2-3.gat,95,30,4 script Training Center Employee#02 84,{
+new_2-3.gat,95,30,4 script Training Center Employee::TrainingCenterEmploye#2 84,{
callfunc "training_personnel";
switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) {
case 1: callfunc "training_personnel1"; break;
@@ -2434,7 +2435,7 @@ new_2-3.gat,95,30,4 script Training Center Employee#02 84,{
case 3: callfunc "training_personnel0";
}
}
-new_3-3.gat,95,30,4 script Training Center Employee#03 84,{
+new_3-3.gat,95,30,4 script Training Center Employee::TrainingCenterEmploye#3 84,{
callfunc "training_personnel";
switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) {
case 1: callfunc "training_personnel1"; break;
@@ -2442,7 +2443,7 @@ new_3-3.gat,95,30,4 script Training Center Employee#03 84,{
case 3: callfunc "training_personnel0";
}
}
-new_4-3.gat,95,30,4 script Training Center Employee#04 84,{
+new_4-3.gat,95,30,4 script Training Center Employee::TrainingCenterEmploye#4 84,{
callfunc "training_personnel";
switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) {
case 1: callfunc "training_personnel1"; break;
@@ -2450,7 +2451,7 @@ new_4-3.gat,95,30,4 script Training Center Employee#04 84,{
case 3: callfunc "training_personnel0";
}
}
-new_5-3.gat,95,30,4 script Training Center Employee#05 84,{
+new_5-3.gat,95,30,4 script Training Center Employee::TrainingCenterEmploye#5 84,{
callfunc "training_personnel";
switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) {
case 1: callfunc "training_personnel1"; break;
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index ecf6835fc..35a62d77d 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Sousuke_PL
//===== Current Version: =====================================
-//= 0.1a
+//= 0.1b
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -11,6 +11,7 @@
//= cards too?
//===== Additional Comments: =================================
//= 0.1a added missing L_No: to 2 funcs [Lupus]
+//= 0.1b Removed duplicates [Toms]
//============================================================
@@ -826,6 +827,6 @@ function script f_armor_s2 {
}
-prt_in.gat,33,70,5 duplicate(Socket Enchant) Socket Enchant 84
-payon.gat,140,151,5 duplicate(Socket Enchant) Socket Enchant 84
-morocc.gat,51,41,5 duplicate(Socket Enchant) Socket Enchant 84 \ No newline at end of file
+prt_in.gat,33,70,5 duplicate(Socket Enchant) Socket Enchant#2 84
+payon.gat,140,151,5 duplicate(Socket Enchant) Socket Enchant#3 84
+morocc.gat,51,41,5 duplicate(Socket Enchant) Socket Enchant#4 84 \ No newline at end of file
diff --git a/npc/other/dts_warper.txt b/npc/other/dts_warper.txt
index c22d52567..8f36f9d95 100644
--- a/npc/other/dts_warper.txt
+++ b/npc/other/dts_warper.txt
@@ -72,18 +72,18 @@
//============================================================
//Yuno
-yuno.gat,153,191,4 script Cool Event Voting Staff#01 874,{
+yuno.gat,153,191,4 script Cool Event Voting Staff::CoolEventVotingStaff01 874,{
callfunc "F_DTS_Warp",0,0;
}
yuno.gat,162,191,6 script Kafra Voting Staff#01 861,{
callfunc "F_DTS_Warp",1,8;
}
//Lighthalzen
-lighthalzen.gat,154,60,6 script Cool Event Voting Staff#02 874,{
+lighthalzen.gat,154,60,6 script Cool Event Voting Staff::CoolEventVotingStaff02 874,{
callfunc "F_DTS_Warp",0,0;
}
//Prontera
-prontera.gat,147,125,4 script Cool Event Voting Staff#03 874,{
+prontera.gat,147,125,4 script Cool Event Voting Staff::CoolEventVotingStaff03 874,{
callfunc "F_DTS_Warp",0,0;
}
prontera.gat,164,125,6 script Kafra Voting Staff#02 115,{
@@ -837,17 +837,17 @@ function script F_DTS_Warp {
if (@dtswarp$[@num] == "Cancel") goto Lcancel;
if (Zeny<4000) goto Lnomoney;
set Zeny, Zeny-4000;
- if (@dtswarpmap$[@num] == "Toy Factory, Level 2") warp "xmas_dun02.gat",130,123;
+ if (@dtswarpmap$[@num] == "Toy Factory, Level 2") warp "xmas_dun02.gat",130,123;
//Maps to warp to
- if (@dtswarpmap$[@num] == "Clock Tower, Level 3") warp "alde_dun03.gat",265,22;
+ if (@dtswarpmap$[@num] == "Clock Tower, Level 3") warp "alde_dun03.gat",265,22;
- if (@dtswarpmap$[@num] == "Lava Dungeon, Level 2") warp "mag_dun02.gat",47,40;
+ if (@dtswarpmap$[@num] == "Lava Dungeon, Level 2") warp "mag_dun02.gat",47,40;
- if (@dtswarpmap$[@num] == "Bailand, Level 4") warp "iz_dun03.gat",32,63;
+ if (@dtswarpmap$[@num] == "Bailand, Level 4") warp "iz_dun03.gat",32,63;
- if (@dtswarpmap$[@num] == "Clock Tower, Basement 3") warp "alde_dun03.gat",277,178;
+ if (@dtswarpmap$[@num] == "Clock Tower, Basement 3") warp "alde_dun03.gat",277,178;
- if (@dtswarpmap$[@num] == "Glastheim Entrance") warp "glast_01.gat",375,304;
+ if (@dtswarpmap$[@num] == "Glastheim Entrance") warp "glast_01.gat",375,304;
cutin "", 255;
end;
@@ -896,7 +896,8 @@ function script F_DTS_Warp {
close2;
cutin "", 255;
end;
- }
+
+}
//Elections administration NPC (hidden)
- script DTS_Admin -1,{
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 4329168da..bda2206b2 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN 3422+(Requires jA Script System)
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 1.1a moved #aldesignwarp to fix enless warp [Lupus]
//= 1.2 Fixed a minor bug that prevented people from advancing [MasterOfMuppets]
//= quest at one point.
+//= 1.3 Removed duplicates [Toms]
//============================================================
//===== Configuration : ======================================
prontera.gat,1,1,1 script TheSignConfig -1,{
@@ -97,11 +98,11 @@ alberta.gat,35,241,1 script Sign::GeffeniaSigns 111,{
}
-morocc.gat,168,264,1 duplicate(GeffeniaSigns) Sign 111
-payon.gat,160,183,1 duplicate(GeffeniaSigns) Sign 111
-prontera.gat,147,305,1 duplicate(GeffeniaSigns) Sign 111
-geffen.gat,168,175,1 duplicate(GeffeniaSigns) Sign 111
-aldebaran.gat,54,223,1 duplicate(GeffeniaSigns) Sign 111
+morocc.gat,168,264,1 duplicate(GeffeniaSigns) Sign#2 111
+payon.gat,160,183,1 duplicate(GeffeniaSigns) Sign#3 111
+prontera.gat,147,305,1 duplicate(GeffeniaSigns) Sign#4 111
+geffen.gat,168,175,1 duplicate(GeffeniaSigns) Sign#5 111
+aldebaran.gat,54,223,1 duplicate(GeffeniaSigns) Sign#6 111
prt_in.gat,228,26,4 script Steward 55,{
@@ -832,13 +833,13 @@ L_Stop:
}
-prt_in.gat,248,23,4 script Maid 1275,{
+prt_in.gat,248,23,4 script Maid#2 1275,{
end;
}
-morocc_in.gat,114,162,4 script Young Man 118,{
+morocc_in.gat,114,162,4 script Young Man#13 118,{
if(signquest == 5)
{
@@ -1340,9 +1341,9 @@ end;
}
-payon_in03.gat,81,21,4 duplicate(Sohee) Maid 1170
-payon_in03.gat,78,21,4 duplicate(Miyabi) Maid 1404
-payon_in03.gat,8,31,4 duplicate(Nymph) Maid 1416
+payon_in03.gat,81,21,4 duplicate(Sohee) Maid::Sohee2 1170
+payon_in03.gat,78,21,4 duplicate(Miyabi) Maid::Miyabi2 1404
+payon_in03.gat,8,31,4 duplicate(Nymph) Maid::Nymph2 1416
payon_in03.gat,11,31,4 script Daewoon 808,{
@@ -2408,7 +2409,7 @@ else
end;
}
-prt_maze02.gat,57,152,1 script Girl 91,{
+prt_maze02.gat,57,152,1 script Girl#11 91,{
mes "^3355FFYou catch a glimpse";
mes "of a girl headin directly";
@@ -2791,7 +2792,7 @@ L_stuckup:
mes "I believe I can be";
mes "of assistance.";
emotion 0;
- donpcevent "Aaron::OnHeh";
+ donpcevent "Aaron2::OnHeh";
emotion 0,1;
next;
mes "[Jesqurienne]";
@@ -2839,7 +2840,7 @@ L_won:
// ---------------------------------------------------------
-geffen_in.gat,60,70,6 script Aaron 754,{
+geffen_in.gat,60,70,6 script Aaron::Aaron2 754,{
if(signquest == 10) goto L_done;
if(@signquiz == 1) goto L_startquiz;
@@ -4507,7 +4508,7 @@ L_Hope:
}
-alberta_in.gat,154,171,5 script Maid 758,{
+alberta_in.gat,154,171,5 script Maid#2 758,{
if(bakerlan_test > 11) goto L_Done;
if(bakerlan_test == 11) goto L_Thanks;
@@ -4891,7 +4892,7 @@ L_Over:
close;
}
-yuno.gat,330,100,3 script Knight 734,{
+yuno.gat,330,100,3 script Knight#2 734,{
if (bakerlan_test > 4) goto L_Thanks;
if (bakerlan_test == 3) goto L_Delivery;
@@ -4938,7 +4939,7 @@ L_Thanks:
close;
}
-alde_alche.gat,169,162,7 script Alchemist 749,{
+alde_alche.gat,169,162,7 script Alchemist#2 749,{
if(!bakerlan_test)
{
@@ -5191,7 +5192,7 @@ L_Done:
}
-prt_castle.gat,107,58,5 script Soldier 105,{
+prt_castle.gat,107,58,5 script Soldier#2 105,{
if(bakerlan_test > 10) goto L_Heya;
mes "[Maruin]";
@@ -6398,7 +6399,7 @@ L_Warp:
}
-himinn.gat,48,86,5 script Valkyrie 811,{
+himinn.gat,48,86,5 script Valkyrie#2 811,{
if(signquest == 58) goto L_Done;
if(signquest > 51) goto L_Gods;
@@ -8142,7 +8143,7 @@ nif_in.gat,140,177,1 script #signgrave 111,{
}
-que_sign01.gat,122,141,5 script Witch 792,{
+que_sign01.gat,122,141,5 script Witch#2 792,{
if(Sign_Branch8B && Sign_Branch8B < 4)goto L_MustHurry;
if(signquest > 56) goto L_NoMedal;
@@ -8631,7 +8632,7 @@ gl_dun02.gat,262,265,1 script Mysterious Energy 111,{
}
-gl_dun02.gat,270,98,1 script Mysterious Energy 111,{
+gl_dun02.gat,270,98,1 script Mysterious Energy#2 111,{
if((brokenseal == 1 && Sign_Seal1 == 2) || (brokenseal == 2 && Sign_Seal2 == 2) || (brokenseal == 3 && Sign_Seal3 == 2) || (brokenseal == 4 && Sign_Seal4 == 2))
{
@@ -8655,7 +8656,7 @@ gl_dun02.gat,270,98,1 script Mysterious Energy 111,{
}
-gl_dun02.gat,268,31,1 script Mysterious Energy 111,{
+gl_dun02.gat,268,31,1 script Mysterious Energy#3 111,{
if((brokenseal == 1 && Sign_Seal1 == 3) || (brokenseal == 2 && Sign_Seal2 == 3) || (brokenseal == 3 && Sign_Seal3 == 3) || (brokenseal == 4 && Sign_Seal4 == 3))
{
@@ -8679,7 +8680,7 @@ gl_dun02.gat,268,31,1 script Mysterious Energy 111,{
}
-gl_dun02.gat,139,72,1 script Mysterious Energy 111,{
+gl_dun02.gat,139,72,1 script Mysterious Energy#4 111,{
if((brokenseal == 1 && Sign_Seal1 == 4) || (brokenseal == 2 && Sign_Seal2 == 4) || (brokenseal == 3 && Sign_Seal3 == 4) || (brokenseal == 4 && Sign_Seal4 == 4))
{
@@ -8703,7 +8704,7 @@ gl_dun02.gat,139,72,1 script Mysterious Energy 111,{
}
-gl_dun02.gat,16,26,1 script Mysterious Energy 111,{
+gl_dun02.gat,16,26,1 script Mysterious Energy#5 111,{
if((brokenseal == 1 && Sign_Seal1 == 5) || (brokenseal == 2 && Sign_Seal2 == 5) || (brokenseal == 3 && Sign_Seal3 == 5) || (brokenseal == 4 && Sign_Seal4 == 5))
{
@@ -8727,7 +8728,7 @@ gl_dun02.gat,16,26,1 script Mysterious Energy 111,{
}
-gl_dun02.gat,120,180,1 script Mysterious Energy 111,{
+gl_dun02.gat,120,180,1 script Mysterious Energy#6 111,{
if((brokenseal == 1 && Sign_Seal1 == 6) || (brokenseal == 2 && Sign_Seal2 == 6) || (brokenseal == 3 && Sign_Seal3 == 6) || (brokenseal == 4 && Sign_Seal4 == 6))
{
@@ -8751,7 +8752,7 @@ gl_dun02.gat,120,180,1 script Mysterious Energy 111,{
}
-gl_dun02.gat,42,251,1 script Mysterious Energy 111,{
+gl_dun02.gat,42,251,1 script Mysterious Energy#7 111,{
if((brokenseal == 1 && Sign_Seal1 == 7) || (brokenseal == 2 && Sign_Seal2 == 7) || (brokenseal == 3 && Sign_Seal3 == 7) || (brokenseal == 4 && Sign_Seal4 == 7))
{
@@ -8775,7 +8776,7 @@ gl_dun02.gat,42,251,1 script Mysterious Energy 111,{
}
-gl_dun02.gat,124,231,1 script Mysterious Energy 111,{
+gl_dun02.gat,124,231,1 script Mysterious Energy#8 111,{
if((brokenseal == 1 && Sign_Seal1 == 8) || (brokenseal == 2 && Sign_Seal2 == 8) || (brokenseal == 3 && Sign_Seal3 == 8) || (brokenseal == 4 && Sign_Seal4 == 8))
{
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index 0c425e9a7..39671cccc 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
-//= 1.0
+//= 1.0a
//===== Compatible With: =====================================
//= eAthena
//===== Description: =========================================
//= Quest for breaking the seal of Brisingamen.
//===== Additional Comments: =================================
// 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
+// 1.0a Removed duplicates [Toms]
//============================================================
prt_fild08.gat,175,374,3 script Bard#brising 51,{
@@ -2999,7 +3000,7 @@ prt_castle.gat,80,52,0 script Personnel Record#hiddenbook1 111,{
//-----------librarian----------------------------------------------------------
-prt_castle.gat,84,51,5 script Librarian 105,{
+prt_castle.gat,84,51,5 script Librarian#2 105,{
if($God2 < 50)
{
diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt
index 3ebfe6e94..aabf1a86d 100644
--- a/npc/quests/seals/god_weapon_creation.txt
+++ b/npc/quests/seals/god_weapon_creation.txt
@@ -306,7 +306,7 @@ gld_dun01.gat,28,85,0 script Grunburti 826,{
}
}
-gld_dun02.gat,85,84,0 script Grunburti 826,{
+gld_dun02.gat,85,84,0 script Grunburti#2 826,{
mes "[Dwarf Grunburti]";
mes "Hmmhah! What brought you here, human!";
@@ -600,7 +600,7 @@ gld_dun02.gat,85,84,0 script Grunburti 826,{
}
}
-gld_dun03.gat,92,105,0 script Grunburti 826,{
+gld_dun03.gat,92,105,0 script Grunburti#3 826,{
mes "[Dwarf Grunburti]";
mes "Hmmhah! What brought you here, human!";
@@ -894,7 +894,7 @@ gld_dun03.gat,92,105,0 script Grunburti 826,{
}
}
-gld_dun04.gat,268,230,0 script Grunburti 826,{
+gld_dun04.gat,268,230,0 script Grunburti#4 826,{
mes "[Dwarf Grunburti]";
mes "Hmmhah! What brought you here, human!";
diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index 6088e30d7..c0e592a5c 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Lupus, Reddozen
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena Revision 3800+
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= 1.3b Splitted into different files [DracoRPG]
//= 1.4 Added Creators + Baby Alchemists can pass Bio Ethics
//= Quest too [Lupus]
+//= 1.5 Removed duplicates [Toms]
//============================================================
@@ -124,13 +125,13 @@ lhz_in01.gat,282,172,0 script BioEthTrg1::BETrg1 -1,1,1{
end;
}
-lhz_in01.gat,285,169,7 script Researcher 865,{
+lhz_in01.gat,285,169,7 script Researcher#2 865,{
//Unknown Text
mes "[Researcher]";
mes "Hmm... I wonder...";
close;
}
-lhz_in01.gat,199,137,8 script Scientist 865,{
+lhz_in01.gat,199,137,8 script Scientist#2 865,{
mes "[Scientist]";
mes "Whoa whoa~!";
mes "Please! Don't";
@@ -172,7 +173,7 @@ lhz_in01.gat,204,138,6 script Keshibien 750,{
mes "collaborate with any of them...";
close;
}
-lhz_in01.gat,203,123,8 script Scientist 750,{
+lhz_in01.gat,203,123,8 script Scientist#3 750,{
mes "[Scientist]";
mes "Alright. Pull one test";
mes "tube out of the machine,";
@@ -189,7 +190,7 @@ lhz_in01.gat,203,123,8 script Scientist 750,{
mes "lose the instructions...";
close;
}
-lhz_in01.gat,221,131,3 script Scientist 865,{
+lhz_in01.gat,221,131,3 script Scientist#4 865,{
mes "[Scientist]";
mes "It takes so long for";
mes "this device to process";
@@ -198,7 +199,7 @@ lhz_in01.gat,221,131,3 script Scientist 865,{
mes "heightens my anticipation...";
close;
}
-lhz_in01.gat,218,141,0 script Alchemist 98,{
+lhz_in01.gat,218,141,0 script Alchemist#2 98,{
mes "[Alchemist]";
mes "Out of all humans,";
mes "I believe Kellasus is";
diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt
index 5b5982767..6d4b56d6d 100644
--- a/npc/quests/skills/wizard_skills.txt
+++ b/npc/quests/skills/wizard_skills.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Lupus, Reddozen
//===== Current Version: =====================================
-//= 1.3a
+//= 1.3c
//===== Compatible With: =====================================
//= eAthena Revision 3800+
//===== Description: =========================================
@@ -18,13 +18,14 @@
//= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
//= 1.3a fixed an item ID typo, thx 2Spiritual Kid
//= 1.3b Splitted into different files [DracoRPG]
+//= 1.3c Removed duplicates [Toms]
//============================================================
//============================================================
// WIZARD - SIGHTBLASTER
//============================================================
-gef_tower.gat,116,37,1 script Enoz 748,{
+gef_tower.gat,116,37,1 script Enoz#2 748,{
if(HELLIONQ == 22)goto L_remember;
if(HELLIONQ == 21)goto L_joke;
if(HELLIONQ == 20)goto L_take;
diff --git a/npc/warps/dungeons/lhalzen_dun.txt b/npc/warps/dungeons/lhalzen_dun.txt
index 5e7229ec8..4d4314103 100644
--- a/npc/warps/dungeons/lhalzen_dun.txt
+++ b/npc/warps/dungeons/lhalzen_dun.txt
@@ -23,6 +23,7 @@
//= 1.6b Updated Sewer Pipe [Vicious]
//= 1.7 Fixed a warp-back
//= 1.8 Some small changes [MasterOfMuppets]
+//= 1.9 Removed duplicates [Toms]
//============================================================
lhz_dun03.gat,140,139,0 warp lhz003 1,1,lhz_dun02.gat,150,145
@@ -187,16 +188,16 @@ lhz_cube.gat,10,185,0 script cubew08-2 45,1,1,{
lhz_cube.gat,3,192,0 warp cubew08-3 2,2,lhz_cube.gat,10,74
lhz_cube.gat,10,200,0 warp cubew08-4 2,2,lhz_cube.gat,66,18
//----------------- Room 123 18 ------------------------------
-lhz_cube.gat,130,18,0 script cubew08-1 45,1,1,{
+lhz_cube.gat,130,18,0 script cubew09-1 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,123,11,0 script cubew08-2 45,1,1,{
+lhz_cube.gat,123,11,0 script cubew09-2 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,115,18,0 warp cubew08-3 2,2,lhz_cube.gat,248,184
-lhz_cube.gat,123,26,0 script cubew08-4 45,1,1,{
+lhz_cube.gat,115,18,0 warp cubew09-3 2,2,lhz_cube.gat,248,184
+lhz_cube.gat,123,26,0 script cubew09-4 45,1,1,{
callfunc "randomw";
end;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 05:26:52 +0000