summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-16 10:02:18 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-16 10:02:18 +0000
commite07326b0aa71a74cacd425e30745bb01a60b153f (patch)
treeb72f1f4ada283ca5f02885e957c5e194eb1652a7 /npc/quests
parente4bb98fd9afd36dcd42a4135a55ad8930e2acf01 (diff)
downloadhercules-e07326b0aa71a74cacd425e30745bb01a60b153f.tar.gz
hercules-e07326b0aa71a74cacd425e30745bb01a60b153f.tar.bz2
hercules-e07326b0aa71a74cacd425e30745bb01a60b153f.tar.xz
hercules-e07326b0aa71a74cacd425e30745bb01a60b153f.zip
* Commited Silent's Fix to the duplicate NPCs
- needs testing - can't be fully fixed because of length limitation of names git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7200 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/monstertamers.txt9
-rw-r--r--npc/quests/quests_aldebaran.txt5
-rw-r--r--npc/quests/quests_ayothaya.txt27
-rw-r--r--npc/quests/quests_geffen.txt5
-rw-r--r--npc/quests/quests_lighthalzen.txt11
-rw-r--r--npc/quests/quests_payon.txt7
-rw-r--r--npc/quests/quests_prontera.txt5
-rw-r--r--npc/quests/skills/merchant_skills.txt4
8 files changed, 40 insertions, 33 deletions
diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt
index 024762784..c965a7c99 100644
--- a/npc/quests/monstertamers.txt
+++ b/npc/quests/monstertamers.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88, Darkchild, x[tsk]
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -11,11 +11,12 @@
//===== Additional Comments: =================================
//= May not have all of the Monster Tamers, but the ones here are fully working.
//= 1.1 Fixed exploits [Lupus]
+//= 1.2 Removed Duplicates [Silent]
//============================================================
//<================================================= Alberta ===============================================>\\
-alberta_in.gat,173,77,3 script Monster Tamer 125,{
+alberta_in.gat,173,77,3 script Monster Tamer#01 125,{
mes "[Monster Tamer Iwado]";
mes "Monster taming has never been more popular than it is now! Why not join in on all of the excitement?....";
M_Menu:
@@ -128,7 +129,7 @@ M_Menu:
//<================================================= Al De Baran ===============================================>\\
-aldeba_in.gat,167,177,3 script Monster Tamer 125,{
+aldeba_in.gat,167,177,3 script Monster Tamer#02 125,{
mes "[Monster Tamer YuU]";
mes "You must be looking for some Taming Items.... When it comes to making Taming Items there is no one better than me here in Rune Midgard.";
M_Menu:
@@ -325,7 +326,7 @@ M_Menu:
//<================================================= Izlude ===============================================>\\
-izlude_in.gat,128,64,3 script Monster Tamer 125,{
+izlude_in.gat,128,64,3 script Monster Tamer#03 125,{
mes "[Monster Tamer Shogo]";
mes "Are you pre-occupied with gathering items for your cute pets, and want a break? Then let us find those items for you.....";
M_Menu:
diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt
index 11a4016ea..781b48625 100644
--- a/npc/quests/quests_aldebaran.txt
+++ b/npc/quests/quests_aldebaran.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//=
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -11,13 +11,14 @@
//===== Additional Comments: =================================
//= Fully working
//= 1.1 Fixed Doctor Band items [Lupus]
+//= 1.2 Removed Duplicates [Silent]
//============================================================
//=======================================================================================================//
// 'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quest
//=======================================================================================================//
-aldeba_in.gat,152,166,4 script Trader 86,{
+aldeba_in.gat,152,166,4 script Trader#01 86,{
mes "[Trader]";
mes "Muhahaha! I am the Very Famous Enigmatic Dealer! I am always hustling and bustling in and out of Rune Midgard!";
mes "Take a look at my RARE and UNIQUE items from ALL OVER the WORLD!!";
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index bd749c177..7fe9fdc0f 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -3,7 +3,7 @@
//===== By ================================================
//= Fredzilla
//===== Version ===========================================
-//= 1.4
+//= 1.5
//===== Compatible With ===================================
//= eAthena 1.0
//===== Description =======================================
@@ -24,6 +24,7 @@
//= 1.3 - Fixed exploit [Lupus]
//= 1.4 Updated, more close to the official. Thanks to birkiczd
//= Also optimized it again, remove unused global variable [Lupus]
+//= 1.5 Removed Duplicates [Silent]
//=========================================================
ayo_dun02.gat,277,178,1 script OBB 139,4,4,{
@@ -39,31 +40,31 @@ ayo_dun02.gat,277,178,1 script OBB 139,4,4,{
close;
}
//Dungeon 1 foot prints x 5
-ayo_dun01.gat,30,149,1 script Clue 139,5,5,{
+ayo_dun01.gat,30,149,1 script Clue#01 139,5,5,{
if(weddingring!=3) end;
npctalk "There are some foot prints here, they head off to the East.";
set @footprints1,1;
close;
}
-ayo_dun01.gat,70,149,1 script Clue 139,5,5,{
+ayo_dun01.gat,70,149,1 script Clue#02 139,5,5,{
if(weddingring!=3) end;
npctalk "There are some more foot prints, they are heading off to the East too!";
set @footprints2,1;
close;
}
-ayo_dun01.gat,100,149,1 script Clue 139,5,5,{
+ayo_dun01.gat,100,149,1 script Clue#03 139,5,5,{
if(weddingring!=3) end;
npctalk "More foot prints heading to the East, who do they belong too?";
set @footprints3,1;
close;
}
-ayo_dun01.gat,190,149,1 script Clue 139,5,5,{
+ayo_dun01.gat,190,149,1 script Clue#04 139,5,5,{
if(weddingring!=3) end;
npctalk "More foot prints, but these are going North.";
set @footprints4,1;
close;
}
-ayo_dun01.gat,261,263,1 script Clue 139,5,5,{
+ayo_dun01.gat,261,263,1 script Clue#05 139,5,5,{
if(weddingring!=3) end;
npctalk "There are some foot prints, they seem to head into that hole there.";
set @footprints5,1;
@@ -71,32 +72,32 @@ ayo_dun01.gat,261,263,1 script Clue 139,5,5,{
}
//Dungeon 2 foot prints x 4 + 1 fake
-ayo_dun02.gat,222,204,1 script Clue 139,5,5,{
+ayo_dun02.gat,222,204,1 script Clue#06 139,5,5,{
if(weddingring!=3) end;
npctalk "Yet more foot prints, they are either going South or West.";
set @footprints6,1;
close;
}
-ayo_dun02.gat,169,212,1 script Clue 139,5,5,{
+ayo_dun02.gat,169,212,1 script Clue#07 139,5,5,{
if(weddingring!=3) end;
npctalk "Looks like there are foot print going to the West.";
set @footprints7,1;
close;
}
-ayo_dun02.gat,129,212,1 script Clue 139,5,5,{
+ayo_dun02.gat,129,212,1 script Clue#08 139,5,5,{
if(weddingring!=3) end;
npctalk "Ok these foot prints are either going to the North or West.";
set @footprints8,1;
close;
}
-ayo_dun02.gat,79,212,1 script Clue 139,7,7,{
+ayo_dun02.gat,79,212,1 script Clue#09 139,7,7,{
if(weddingring!=3) end;
npctalk "These are very new, they are going North.";
set @footprints9,1;
close;
}
//FAKE
-ayo_dun02.gat,245,166,1 script Clue 139,7,7,{
+ayo_dun02.gat,245,166,1 script Clue#10 139,7,7,{
if(weddingring!=3) end;
npctalk "Seems something came by this way, to the East.";
close;
@@ -182,7 +183,7 @@ L_QuestOver:
close;
}
-ayothaya.gat,253,99,3 script Fisherman 843,{
+ayothaya.gat,253,99,3 script Fisherman#01 843,{
mes "[Dannai]";
mes "This place is known to be teeming with fish. The fish here tend to eat anything they find, so it's easy to catch them.";
next;
@@ -235,7 +236,7 @@ L_RingCheck:
close;
}
-ayothaya.gat,192,171,4 script Old Man 824,{
+ayothaya.gat,192,171,4 script Old Man#10 824,{
mes "[Tham]";
if(weddingring==3) goto L_OnQ2;
mes "What a nice day it is today, don't you agree?";
diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt
index afa4b310a..e1f5d3af5 100644
--- a/npc/quests/quests_geffen.txt
+++ b/npc/quests/quests_geffen.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
//= Welding Mask and Headset Quests.
//===== Additional Comments: =================================
//= 1.1 Fixed exploits [Lupus]
+//= 1.2 Removed Duplicates [Silent]
//============================================================
@@ -17,7 +18,7 @@
//==============================================================================================//
// Blacksmith: 'Welding Mask' Quest
//==============================================================================================//
-geffen_in.gat,144,166,4 script Blacksmith 63,{
+geffen_in.gat,144,166,4 script Blacksmith#01 63,{
mes "[Blacksmith]";
mes "Who am I?!........";
emotion e_gasp;
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 9f8ab910f..4bd107081 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Persian, Vicious_Pucca, Completed by aoa00
//===== Current Version: =====================================
-//= 1.9
+//= 2.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -32,6 +32,7 @@
//= 1.8 Changed the name of the mobsters to Gangster, as it should be. [MasterOfMuppets]
//= 1.9 Added extra input check on Biolab so that the first letter of the word could be
//= capitalized or undercase. [Evera]
+//= 2.0 Removed Duplicates [Silent]
//============================================================
//= aoa's comment
//= In future, Need for new monsters. No-Drop, No-Exp, Weak "Mobster","VENOMOUS","NOXIOUS"
@@ -113,7 +114,7 @@ ChkEnd:
end;
}
-lighthalzen.gat,267,200,3 script Security Guard 868,{
+lighthalzen.gat,267,200,3 script Security Guard#01 868,{
if(countitem(7350)>0) goto Lhzpass1;
if($@lhz_alert == 1) goto Lhzstop;
@@ -170,7 +171,7 @@ Lhzstop:
close;
}
-lighthalzen.gat,294,223,7 script Security Guard 868,{
+lighthalzen.gat,294,223,7 script Security Guard#02 868,{
if(countitem(7350)>0) goto Lhzpass1;
if($@lhz_alert == 1) goto Lhzstop;
@@ -602,7 +603,7 @@ L_11:
//--------------------------Box--------------------------
-lhz_cube.gat,248,179,0 script Box 111,{
+lhz_cube.gat,248,179,0 script Box#01 111,{
if (axe == 1) goto L_2;
mes "There is an axe in the box.";
next;
@@ -1077,7 +1078,7 @@ L_3:
//--------------------------Box--------------------------
-lhz_cube.gat,248,193,0 script Box 111,{
+lhz_cube.gat,248,193,0 script Box#02 111,{
if (countitem(2657) > 0 || @gotkey || hzdun) goto L_5;
mes "There is a box with three holes.";
next;
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index e5c330c54..1610a2c20 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= 1.1 Helm of Angel bug fixed [Lupus]
//= 1.2 Fixed skirt of virgin [Lupus]
//= 1.3 Fixed exploits [Lupus]
+//= 1.4 Removed Duplicates [Silent]
//============================================================
@@ -131,7 +132,7 @@ payon_in01.gat,18,10,4 script Mystic Lady 75,{
//========================================================================================//
// Oxygen Mask Quest
//========================================================================================//
-payon_in02.gat,25,71,4 script Young Man 86,{
+payon_in02.gat,25,71,4 script Young Man#11 86,{
mes "[Young Man]";
if(countitem(701) >= 5) goto L_GotOra;
mes "Blahhhhhh! I... I... I JUST CAN'T take it anymore!! You little stinky, filthy, BASTARDS!!!";
@@ -225,7 +226,7 @@ L_GotOra:
//========================================================================================//
// Derivuchi Cap(Hat of Petite Diablo), Helm of Angel
//========================================================================================//
-payon_in01.gat,56,12,4 script Young Man 89,{
+payon_in01.gat,56,12,4 script Young Man#12 89,{
mes "[Young Man]";
mes "What is it?............";
next;
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index 41ba16fe9..f24eb904c 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -11,11 +11,12 @@
//===== Additional Comments: =================================
//= Fixed flower name Dreamy -> Illusion
//= 1.2 Fixed exploit [Lupus]
+//= 1.3 Removed Duplicates [Silent]
//============================================================
// Ph.D Hat Quest-------------------------------------------------------
-prt_in.gat,38,108,4 script Teacher 53,{
+prt_in.gat,38,108,4 script Teacher#01 53,{
if(countitem(710) >= 1 && countitem(703) >= 1 && countitem(704) >= 1 && countitem(708) >= 1) goto L_Start;//Items: Illusion Flower, Hinalle, Aloe, Ment,
mes "Don't you think.... ^4444FF'flowers'^000000 are pretty?";
next;
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index 534bba9c5..177e1a2eb 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -22,14 +22,14 @@
//--------------------------------------- Necko: Crazy Uproar--------------------------------\\
-alberta.gat,89,96,5 script Necko 139,0,4,{
+alberta.gat,89,96,5 script Necko#01 139,0,4,{
mes "[!?]";
mes "Muahahahahhhahahahahhahah!!";
mes "Pukakakakakkakakakakakakaka!!";
close;
}
-alberta.gat,83,96,5 script Necko 98,{
+alberta.gat,83,96,5 script Necko#02 98,{
mes "[Necko]";
if (baseClass == Job_Merchant) goto L_Start;