diff options
Diffstat (limited to 'npc/quests')
| -rw-r--r-- | npc/quests/The_Sign_Quest.txt | 55 | ||||
| -rw-r--r-- | npc/quests/seals/brisingamen_seal.txt | 5 | ||||
| -rw-r--r-- | npc/quests/seals/god_weapon_creation.txt | 6 | ||||
| -rw-r--r-- | npc/quests/skills/alchemist_skills.txt | 13 | ||||
| -rw-r--r-- | npc/quests/skills/wizard_skills.txt | 5 |
5 files changed, 44 insertions, 40 deletions
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;
|