summaryrefslogtreecommitdiff
path: root/npc/custom
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/custom
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/custom')
-rw-r--r--npc/custom/MVP_arena/arena_mvp.txt65
-rw-r--r--npc/custom/airplane.txt49
-rw-r--r--npc/custom/eAAC_Scripts/disguiser.txt15
-rw-r--r--npc/custom/eAAC_Scripts/quest_warper.txt132
-rw-r--r--npc/custom/eAAC_Scripts/vendmachine.txt8
-rw-r--r--npc/custom/healers/heal_payment.txt35
-rw-r--r--npc/custom/morroc_raceway.txt31
-rw-r--r--npc/custom/mvm.txt11
-rw-r--r--npc/custom/quests/thq/THQS_Quests.txt15
-rw-r--r--npc/custom/warper/warper.txt87
10 files changed, 229 insertions, 219 deletions
diff --git a/npc/custom/MVP_arena/arena_mvp.txt b/npc/custom/MVP_arena/arena_mvp.txt
index 147a22b51..bb19d6a23 100644
--- a/npc/custom/MVP_arena/arena_mvp.txt
+++ b/npc/custom/MVP_arena/arena_mvp.txt
@@ -1,6 +1,7 @@
// ---- MVP ARENA!!!!!! By Darkchild with 16 diff MVP's inside
// -- Optimised The MVP arena!!!! By massdriller
// - NPC in prontera
+// - Removed Duplicates [Silent]
prontera.gat,154,197,3 script MVP Warper 768,{
mes "[ ^0065DFMVP Warper^000000 ]";
@@ -333,7 +334,7 @@ close;
// ---- Inside MVP-Arena NPC's
// --- Alpha-MVP #1
-pvp_n_1-2.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_1-2.gat,100,100,4 script MVP-Protector#01 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -344,7 +345,7 @@ pvp_n_1-2.gat,100,100,4 script MVP-Protector 727,{
}
// --- Alpha-MVP #2
-pvp_n_2-2.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_2-2.gat,100,100,4 script MVP-Protector#02 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -354,7 +355,7 @@ pvp_n_2-2.gat,100,100,4 script MVP-Protector 727,{
}
// --- Alpha-MVP #3
-pvp_n_3-2.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_3-2.gat,100,100,4 script MVP-Protector#03 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -364,7 +365,7 @@ pvp_n_3-2.gat,100,100,4 script MVP-Protector 727,{
}
// --- Alpha-MVP #4
-pvp_n_4-2.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_4-2.gat,100,100,4 script MVP-Protector#04 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -374,7 +375,7 @@ pvp_n_4-2.gat,100,100,4 script MVP-Protector 727,{
}
// --- Alpha-MVP #5
-pvp_n_5-2.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_5-2.gat,100,100,4 script MVP-Protector#05 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -384,7 +385,7 @@ pvp_n_5-2.gat,100,100,4 script MVP-Protector 727,{
}
// --- Alpha-MVP #6
-pvp_n_6-2.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_6-2.gat,100,100,4 script MVP-Protector#06 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -394,7 +395,7 @@ pvp_n_6-2.gat,100,100,4 script MVP-Protector 727,{
}
// --- Alpha-MVP #7
-pvp_n_7-2.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_7-2.gat,100,100,4 script MVP-Protector#07 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -403,12 +404,12 @@ pvp_n_7-2.gat,100,100,4 script MVP-Protector 727,{
close;
}
// --- Alpha-MVP #8
-pvp_n_8-2.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_8-2.gat,100,100,4 script MVP-Protector#08 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M2";
}
// --- Beta-MVP #1
-pvp_n_1-3.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_1-3.gat,100,100,4 script MVP-Protector#09 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -419,7 +420,7 @@ pvp_n_1-3.gat,100,100,4 script MVP-Protector 727,{
}
// --- Beta-MVP #2
-pvp_n_2-3.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_2-3.gat,100,100,4 script MVP-Protector#10 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -429,7 +430,7 @@ pvp_n_2-3.gat,100,100,4 script MVP-Protector 727,{
}
// --- Beta-MVP #3
-pvp_n_3-3.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_3-3.gat,100,100,4 script MVP-Protector#11 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -439,7 +440,7 @@ pvp_n_3-3.gat,100,100,4 script MVP-Protector 727,{
}
// --- Beta-MVP #4
-pvp_n_4-3.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_4-3.gat,100,100,4 script MVP-Protector#12 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -449,7 +450,7 @@ pvp_n_4-3.gat,100,100,4 script MVP-Protector 727,{
}
// --- Beta-MVP #5
-pvp_n_5-3.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_5-3.gat,100,100,4 script MVP-Protector#13 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -459,7 +460,7 @@ pvp_n_5-3.gat,100,100,4 script MVP-Protector 727,{
}
// --- Beta-MVP #6
-pvp_n_6-3.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_6-3.gat,100,100,4 script MVP-Protector#14 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -469,7 +470,7 @@ pvp_n_6-3.gat,100,100,4 script MVP-Protector 727,{
}
// --- Beta-MVP #7
-pvp_n_7-3.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_7-3.gat,100,100,4 script MVP-Protector#15 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -479,12 +480,12 @@ pvp_n_7-3.gat,100,100,4 script MVP-Protector 727,{
}
// --- Beta-MVP #8
-pvp_n_8-3.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_8-3.gat,100,100,4 script MVP-Protector#16 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M2";
}
// --- Theta-MVP #1
-pvp_n_1-4.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_1-4.gat,100,100,4 script MVP-Protector#17 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -495,7 +496,7 @@ pvp_n_1-4.gat,100,100,4 script MVP-Protector 727,{
}
// --- Theta-MVP #2
-pvp_n_2-4.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_2-4.gat,100,100,4 script MVP-Protector#18 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -505,7 +506,7 @@ pvp_n_2-4.gat,100,100,4 script MVP-Protector 727,{
}
// --- Theta-MVP #3
-pvp_n_3-4.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_3-4.gat,100,100,4 script MVP-Protector#19 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -515,7 +516,7 @@ pvp_n_3-4.gat,100,100,4 script MVP-Protector 727,{
}
// --- Theta-MVP #4
-pvp_n_4-4.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_4-4.gat,100,100,4 script MVP-Protector#20 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -525,7 +526,7 @@ pvp_n_4-4.gat,100,100,4 script MVP-Protector 727,{
}
// --- Theta-MVP #5
-pvp_n_5-4.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_5-4.gat,100,100,4 script MVP-Protector#21 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -535,7 +536,7 @@ pvp_n_5-4.gat,100,100,4 script MVP-Protector 727,{
}
// --- Theta-MVP #6
-pvp_n_6-4.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_6-4.gat,100,100,4 script MVP-Protector#22 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -545,7 +546,7 @@ pvp_n_6-4.gat,100,100,4 script MVP-Protector 727,{
}
// --- Theta-MVP #7
-pvp_n_7-4.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_7-4.gat,100,100,4 script MVP-Protector#23 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -555,12 +556,12 @@ pvp_n_7-4.gat,100,100,4 script MVP-Protector 727,{
}
// --- Theta-MVP #8
-pvp_n_8-4.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_8-4.gat,100,100,4 script MVP-Protector#24 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M2";
}
// --- Epsilon-MVP #1
-pvp_n_1-5.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_1-5.gat,100,100,4 script MVP-Protector#25 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -571,7 +572,7 @@ pvp_n_1-5.gat,100,100,4 script MVP-Protector 727,{
}
// --- Epsilon-MVP #2
-pvp_n_2-5.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_2-5.gat,100,100,4 script MVP-Protector#26 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -581,7 +582,7 @@ pvp_n_2-5.gat,100,100,4 script MVP-Protector 727,{
}
// --- Epsilon-MVP #3
-pvp_n_3-5.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_3-5.gat,100,100,4 script MVP-Protector#27 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -591,7 +592,7 @@ pvp_n_3-5.gat,100,100,4 script MVP-Protector 727,{
}
// --- Epsilon-MVP #4
-pvp_n_4-5.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_4-5.gat,100,100,4 script MVP-Protector#28 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -601,7 +602,7 @@ pvp_n_4-5.gat,100,100,4 script MVP-Protector 727,{
}
// --- Epsilon-MVP #5
-pvp_n_5-5.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_5-5.gat,100,100,4 script MVP-Protector#29 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -611,7 +612,7 @@ pvp_n_5-5.gat,100,100,4 script MVP-Protector 727,{
}
// --- Epsilon-MVP #6
-pvp_n_6-5.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_6-5.gat,100,100,4 script MVP-Protector#30 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -621,7 +622,7 @@ pvp_n_6-5.gat,100,100,4 script MVP-Protector 727,{
}
// --- Epsilon-MVP #7
-pvp_n_7-5.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_7-5.gat,100,100,4 script MVP-Protector#31 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M";
@@ -630,7 +631,7 @@ pvp_n_7-5.gat,100,100,4 script MVP-Protector 727,{
close;
}
// --- Epsilon-MVP #8
-pvp_n_8-5.gat,100,100,4 script MVP-Protector 727,{
+pvp_n_8-5.gat,100,100,4 script MVP-Protector#32 727,{
mes "[ ^0065DFMVP-Protector^000000 ]";
callfunc "Ramvp_M2";
}
diff --git a/npc/custom/airplane.txt b/npc/custom/airplane.txt
index 854ba98ee..0e599ff04 100644
--- a/npc/custom/airplane.txt
+++ b/npc/custom/airplane.txt
@@ -4,7 +4,7 @@
//= Edited And removed irrelevent comments by eAthena Dev Team
//= Draike\Bluto\Hephaestus
//===== Current Version: =====================================
-//= 2.0 eAthena Release
+//= 2.1 eAthena Release
//===== Compatible With: =====================================
//= eAthena SVN 02/05/2005 +
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= ALWAYS HAVE AT LEAST TWELVE (12) LOCATIONS AS THE MINIMUM. This is unless you modify to OnMinutes and change the schedule around.
//= If you have "airplane.gat,103,72,0 warp airs02a 1,1,airplane.gat,102,200" as a warp, remove it. Where it's supposed to go, I have no clue.
+//= 2.1 Removed Duplicates [Silent]
//============================================================
payon.gat,153,43,5 script itinsetter -1,{
@@ -265,73 +266,73 @@ callfunc "F_Itin";
airport.gat,153,43,5 script Airport Porter 774,{
callfunc "F_Porter",0;
}
-prt_fild08.gat,206,279,5 script Porter 774,{
+prt_fild08.gat,206,279,5 script Porter#01 774,{
callfunc "F_Porter",1;
}
-gef_fild00.gat,50,364,5 script Porter 774,{
+gef_fild00.gat,50,364,5 script Porter#02 774,{
callfunc "F_Porter",5;
}
-moc_fild10.gat,163,173,5 script Porter 774,{
+moc_fild10.gat,163,173,5 script Porter#03 774,{
callfunc "F_Porter",6;
}
-mjolnir_12.gat,61,380,5 script Porter 774,{
+mjolnir_12.gat,61,380,5 script Porter#04 774,{
callfunc "F_Porter",3;
}
-pay_fild08.gat,159,91,5 script Porter 774,{
+pay_fild08.gat,159,91,5 script Porter#05 774,{
callfunc "F_Porter",2;
}
-pay_fild03.gat,194,181,5 script Porter 774,{
+pay_fild03.gat,194,181,5 script Porter#06 774,{
callfunc "F_Porter",4;
}
-glast_01.gat,196,326,1 script Porter 774,{
+glast_01.gat,196,326,1 script Porter#07 774,{
callfunc "F_Porter",7;
}
-umbala.gat,188,98,3 script Porter 774,{
+umbala.gat,188,98,3 script Porter#08 774,{
callfunc "F_Porter",8;
}
-comodo.gat,203,75,8 script Porter 774,{
+comodo.gat,203,75,8 script Porter#09 774,{
callfunc "F_Porter",9;
}
-amatsu.gat,115,78,8 script Porter 774,{
+amatsu.gat,115,78,8 script Porter#10 774,{
callfunc "F_Porter",10;
}
-niflheim.gat,132,242,5 script Porter 774,{
+niflheim.gat,132,242,5 script Porter#11 774,{
callfunc "F_Porter",11;
}
-xmas.gat,232,309,5 script Porter 774,{
+xmas.gat,232,309,5 script Porter#12 774,{
callfunc "F_Porter",12;
}
-louyang.gat,35,279,8 script Porter 774,{
+louyang.gat,35,279,8 script Porter#13 774,{
callfunc "F_Porter",13;
}
-gonryun.gat,82,95,7 script Porter 774,{
+gonryun.gat,82,95,7 script Porter#14 774,{
callfunc "F_Porter",14;
}
-yuno.gat,58,195,4 script Porter 774,{
+yuno.gat,58,195,4 script Porter#15 774,{
callfunc "F_Porter",15;
}
-moc_fild04.gat,210,326,2 script Porter 774,{
+moc_fild04.gat,210,326,2 script Porter#16 774,{
callfunc "F_Porter",16;
}
-jawaii.gat,247,174,7 script Porter 774,{
+jawaii.gat,247,174,7 script Porter#17 774,{
callfunc "F_Porter",17;
}
-gef_fild10.gat,159,95,2 script Porter 774,{
+gef_fild10.gat,159,95,2 script Porter#18 774,{
callfunc "F_Porter",18;
}
-mjolnir_02.gat,76,364,5 script Porter 774,{
+mjolnir_02.gat,76,364,5 script Porter#19 774,{
callfunc "F_Porter",19;
}
-gefenia01.gat,97,22,6 script Porter 774,{
+gefenia01.gat,97,22,6 script Porter#20 774,{
callfunc "F_Porter",20;
}
-ayothaya.gat,182,105,5 script Porter 774,{
+ayothaya.gat,182,105,5 script Porter#21 774,{
callfunc "F_Porter",21;
}
-lighthalzen.gat,99,241,4 script Porter 774,{
+lighthalzen.gat,99,241,4 script Porter#22 774,{
callfunc "F_Porter",22;
}
-jupe_gate.gat,46,18,7 script Porter 774,{
+jupe_gate.gat,46,18,7 script Porter#23 774,{
callfunc "F_Porter",23;
}
airport.gat,141,43,5 script Itinerary Schedule 837,{
diff --git a/npc/custom/eAAC_Scripts/disguiser.txt b/npc/custom/eAAC_Scripts/disguiser.txt
index 218de0196..1bce6f677 100644
--- a/npc/custom/eAAC_Scripts/disguiser.txt
+++ b/npc/custom/eAAC_Scripts/disguiser.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= PalasX (http://cashaan.dontexist.org)
//===== Current Version: =====================================
-//= v1.20 Unified
+//= v1.21 Unified
//===== Compatible With: =====================================
//= SVN 5690+ (getmonsterinfo)
//===== Description: =========================================
@@ -16,37 +16,38 @@
//= Uses GetMonsterInfo to pull monster names from server, but
//= without sql_query, the mob IDs are set statically
//= Went crazy with the functions, the script is TINY now :)
+//= 1.21 Removed Duplicates [Silent]
//============================================================
//////////////////////////
//Places all of our NPCs//
//////////////////////////
-prt_fild05.gat,277,226,5 script Dullahan Master 736,{
+prt_fild05.gat,277,226,5 script Dullahan Master#01 736,{
callfunc "PXC_Disguiser",0,quest_disguise;
Close;
}
-moc_fild10.gat,34,283,4 script Dullahan Master 736,{
+moc_fild10.gat,34,283,4 script Dullahan Master#02 736,{
callfunc "PXC_Disguiser",1,quest_disguise;
close;
}
-gef_fild00.gat,97,123,4 script Dullahan Master 736,{
+gef_fild00.gat,97,123,4 script Dullahan Master#03 736,{
callfunc "PXC_Disguiser",2,quest_disguise;
close;
}
-pay_fild01.gat,369,305,4 script Dullahan Master 736,{
+pay_fild01.gat,369,305,4 script Dullahan Master#04 736,{
callfunc "PXC_Disguiser",3,quest_disguise;
close;
}
-pay_fild03.gat,313,40,4 script Dullahan Master 736,{
+pay_fild03.gat,313,40,4 script Dullahan Master#05 736,{
callfunc "PXC_Disguiser",4,quest_disguise;
close;
}
-prt_fild08.gat,362,185,4 script Dullahan Master 736,{
+prt_fild08.gat,362,185,4 script Dullahan Master#06 736,{
callfunc "PXC_Disguiser",5,quest_disguise;
close;
diff --git a/npc/custom/eAAC_Scripts/quest_warper.txt b/npc/custom/eAAC_Scripts/quest_warper.txt
index 2fbc252f7..a72306e89 100644
--- a/npc/custom/eAAC_Scripts/quest_warper.txt
+++ b/npc/custom/eAAC_Scripts/quest_warper.txt
@@ -4,7 +4,7 @@
//= Old Warper 2 by Darkchild - Remade with quest format by DZeroX
//= Huge Rewrite by Neouni
//===== Current Version: ==========================================
-//= 2.0b
+//= 2.1
//===== Compatible With: ==========================================
//= Any eAthena Version
//===== Description: ==============================================
@@ -72,6 +72,8 @@
// - Old Dungeon fee system removed, all dungeon fees now set to 0
//-2.0b
// - Special warpname menu option name bug fixed
+//-2.1
+// - Removed Duplicates [Silent]
//=================================================================
//========================Function=&=Script========================
@@ -1867,274 +1869,274 @@ binget:
}
//============================Warpras==============================
-alb2trea.gat,73,101,4 script Warpra 113,{
+alb2trea.gat,73,101,4 script Warpra#01 113,{
callfunc "Q_Warpra",1;
}
-ama_fild01.gat,178,325,1 script Warpra 113,{
+ama_fild01.gat,178,325,1 script Warpra#02 113,{
callfunc "Q_Warpra",1;
}
-gef_fild10.gat,71,339,4 script Warpra 113,{
+gef_fild10.gat,71,339,4 script Warpra#03 113,{
callfunc "Q_Warpra",1;
}
-izlu2dun.gat,104,82,4 script Warpra 113,{
+izlu2dun.gat,104,82,4 script Warpra#04 113,{
callfunc "Q_Warpra",1;
}
-mjolnir_02.gat,85,363,4 script Warpra 113,{
+mjolnir_02.gat,85,363,4 script Warpra#05 113,{
callfunc "Q_Warpra",1;
}
-moc_fild04.gat,207,331,4 script Warpra 113,{
+moc_fild04.gat,207,331,4 script Warpra#06 113,{
callfunc "Q_Warpra",1;
}
-moc_fild19.gat,106,97,4 script Warpra 113,{
+moc_fild19.gat,106,97,4 script Warpra#07 113,{
callfunc "Q_Warpra",1;
}
-moc_ruins.gat,64,166,4 script Warpra 113,{
+moc_ruins.gat,64,166,4 script Warpra#08 113,{
callfunc "Q_Warpra",1;
}
-niflheim.gat,197,192,3 script Warpra 113,{
+niflheim.gat,197,192,3 script Warpra#09 113,{
callfunc "Q_Warpra",1;
}
-pay_arche.gat,39,135,4 script Warpra 113,{
+pay_arche.gat,39,135,4 script Warpra#10 113,{
callfunc "Q_Warpra",1;
}
-prt_fild05.gat,273,215,4 script Warpra 113,{
+prt_fild05.gat,273,215,4 script Warpra#11 113,{
callfunc "Q_Warpra",1;
}
-tur_dun01.gat,148,239,4 script Warpra 113,{
+tur_dun01.gat,148,239,4 script Warpra#12 113,{
callfunc "Q_Warpra",1;
}
-valkyrie.gat,48,35,8 script Warpra 113,{
+valkyrie.gat,48,35,8 script Warpra#13 113,{
callfunc "Q_Warpra",1;
}
-yuno_fild03.gat,37,135,4 script Warpra 113,{
+yuno_fild03.gat,37,135,4 script Warpra#14 113,{
callfunc "Q_Warpra",1;
}
-alberta.gat,32,240,4 script Warpra 113,{
+alberta.gat,32,240,4 script Warpra#15 113,{
callfunc "QWS_Town_Warpra",1,"Alberta Town";
close;
}
-aldebaran.gat,146,118,4 script Warpra 113,{
+aldebaran.gat,146,118,4 script Warpra#16 113,{
callfunc "QWS_Town_Warpra",2,"Aldebaran Town";
close;
}
-ayothaya.gat,216,171,5 script Warpra 113,{
+ayothaya.gat,216,171,5 script Warpra#17 113,{
callfunc "QWS_Town_Warpra",4,"Ayotaya Town";
close;
}
-amatsu.gat,193,81,1 script Warpra 113,{
+amatsu.gat,193,81,1 script Warpra#18 113,{
callfunc "QWS_Town_Warpra",3,"Amatsu Town";
close;
}
-comodo.gat,195,158,4 script Warpra 113,{
+comodo.gat,195,158,4 script Warpra#19 113,{
callfunc "QWS_Town_Warpra",5,"Comodo Town";
close;
}
-einbroch.gat,229,196,5 script Warpra 113,{
+einbroch.gat,229,196,5 script Warpra#20 113,{
callfunc "QWS_Town_Warpra",7,"Einbroch Town";
close;
}
-einbech.gat,173,131,5 script Warpra 113,{
+einbech.gat,173,131,5 script Warpra#21 113,{
callfunc "QWS_Town_Warpra",6,"Einbech Town";
close;
}
-geffen.gat,116,66,4 script Warpra 113,{
+geffen.gat,116,66,4 script Warpra#22 113,{
callfunc "QWS_Town_Warpra",8,"Geffen Town";
close;
}
-gonryun.gat,152,130,4 script Warpra 113,{
+gonryun.gat,152,130,4 script Warpra#23 113,{
callfunc "QWS_Town_Warpra",9,"Gonryun Town";
close;
}
-hugel.gat,90,127,5 script Warpra 113,{
+hugel.gat,90,127,5 script Warpra#24 113,{
callfunc "QWS_Town_Warpra",10,"Hugel Town";
close;
}
-jawaii.gat,107,182,5 script Warpra 113,{
+jawaii.gat,107,182,5 script Warpra#25 113,{
callfunc "QWS_Town_Warpra",12,"Jawaii Town";
close;
}
-izlude.gat,132,116,4 script Warpra 113,{
+izlude.gat,132,116,4 script Warpra#26 113,{
callfunc "QWS_Town_Warpra",11,"Izlude Town";
close;
}
-lighthalzen.gat,153,100,5 script Warpra 113,{
+lighthalzen.gat,153,100,5 script Warpra#27 113,{
callfunc "QWS_Town_Warpra",13,"Lighthalzen Town";
close;
}
-louyang.gat,211,106,4 script Warpra 113,{
+louyang.gat,211,106,4 script Warpra#28 113,{
callfunc "QWS_Town_Warpra",14,"Louyang Town";
close;
}
-morocc.gat,157,95,4 script Warpra 113,{
+morocc.gat,157,95,4 script Warpra#29 113,{
callfunc "QWS_Town_Warpra",16,"Morroc Town";
close;
}
-nif_fild01.gat,319,77,1 script Warpra 113,{
+nif_fild01.gat,319,77,1 script Warpra#30 113,{
callfunc "QWS_Town_Warpra",17,"Niflheim Town";
close;
}
-payon.gat,183,110,4 script Warpra 113,{
+payon.gat,183,110,4 script Warpra#31 113,{
callfunc "QWS_Town_Warpra",18,"Payon Town";
close;
}
-prontera.gat,147,172,5 script Warpra 113,{
+prontera.gat,147,172,5 script Warpra#32 113,{
callfunc "QWS_Town_Warpra",0,"Prontera Town";
close;
}
-umbala.gat,133,130,4 script Warpra 113,{
+umbala.gat,133,130,4 script Warpra#33 113,{
callfunc "QWS_Town_Warpra",19,"Umbala Town";
close;
}
-xmas.gat,151,136,4 script Warpra 113,{
+xmas.gat,151,136,4 script Warpra#34 113,{
callfunc "QWS_Town_Warpra",15,"Lutie Town";
close;
}
-yuno.gat,138,162,4 script Warpra 113,{
+yuno.gat,138,162,4 script Warpra#35 113,{
callfunc "QWS_Town_Warpra",20,"Yuno Town";
close;
}
-abyss_02.gat,274,266,1 script Warpra 113,{
+abyss_02.gat,274,266,1 script Warpra#36 113,{
callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake";
close;
}
-ama_dun02.gat,192,118,5 script Warpra Helper 112,{
+ama_dun02.gat,192,118,5 script Warpra Helper#01 112,{
callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon";
close;
}
-anthell02.gat,170,165,3 script Warpra Helper 112,{
+anthell02.gat,170,165,3 script Warpra Helper#02 112,{
callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon";
close;
}
-ayo_dun02.gat,258,193,5 script Warpra Helper 112,{
+ayo_dun02.gat,258,193,5 script Warpra Helper#03 112,{
callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon";
close;
}
-ein_dun02.gat,292,282,1 script Warpra Helper 112,{
+ein_dun02.gat,292,282,1 script Warpra Helper#04 112,{
callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon";
close;
}
-iz_dun03.gat,202,47,2 script Warpra Helper 112,{
+iz_dun03.gat,202,47,2 script Warpra Helper#05 112,{
callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon";
close;
}
-c_tower3.gat,129,106,4 script Warpra Helper 112,{
+c_tower3.gat,129,106,4 script Warpra Helper#06 112,{
callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon";
close;
}
-mjo_dun02.gat,39,25,4 script Warpra Helper 112,{
+mjo_dun02.gat,39,25,4 script Warpra Helper#07 112,{
callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon";
close;
}
-prt_sewb2.gat,176,30,3 script Warpra Helper 112,{
+prt_sewb2.gat,176,30,3 script Warpra Helper#08 112,{
callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon";
close;
}
-gefenia03.gat,137,34,0 script Warpra Helper 112,{
+gefenia03.gat,137,34,0 script Warpra Helper#09 112,{
callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon";
close;
}
-gef_dun02.gat,218,61,2 script Warpra Helper 112,{
+gef_dun02.gat,218,61,2 script Warpra Helper#10 112,{
callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon";
close;
}
-glast_01.gat,371,308,3 script Warpra Helper 112,{
+glast_01.gat,371,308,3 script Warpra Helper#11 112,{
callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon";
close;
}
-gon_dun01.gat,167,273,4 script Warpra Helper 112,{
+gon_dun01.gat,167,273,4 script Warpra Helper#12 112,{
callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon";
close;
}
-juperos_02.gat,127,154,5 script Warpra Helper 112,{
+juperos_02.gat,127,154,5 script Warpra Helper#13 112,{
callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave";
close;
}
-kh_dun01.gat,14,224,3 script Warpra Helper 112,{
+kh_dun01.gat,14,224,3 script Warpra Helper#14 112,{
callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon";
close;
}
-lhz_dun02.gat,156,151,5 script Warpra Helper 112,{
+lhz_dun02.gat,156,151,5 script Warpra Helper#15 112,{
callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab";
close;
}
-lou_dun02.gat,168,264,4 script Warpra Helper 112,{
+lou_dun02.gat,168,264,4 script Warpra Helper#16 112,{
callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon";
close;
}
-mag_dun02.gat,46,41,3 script Warpra Helper 112,{
+mag_dun02.gat,46,41,3 script Warpra Helper#17 112,{
callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon";
close;
}
-odin_tem01.gat,115,148,3 script Warpra Helper 112,{
+odin_tem01.gat,115,148,3 script Warpra Helper#18 112,{
callfunc "QWS_Dungeon_Warpra",18,"Odin Temple";
close;
}
-orcsdun01.gat,185,11,3 script Warpra Helper 112,{
+orcsdun01.gat,185,11,3 script Warpra Helper#19 112,{
callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon";
close;
}
-pay_dun03.gat,162,143,3 script Warpra Helper 112,{
+pay_dun03.gat,162,143,3 script Warpra Helper#20 112,{
callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon";
close;
}
-moc_pryd02.gat,101,95,3 script Warpra Helper 112,{
+moc_pryd02.gat,101,95,3 script Warpra Helper#21 112,{
callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon";
close;
}
-in_sphinx2.gat,274,268,1 script Warpra Helper 112,{
+in_sphinx2.gat,274,268,1 script Warpra Helper#22 112,{
callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon";
close;
}
-tha_t07.gat,111,162,3 script Warpra Helper 112,{
+tha_t07.gat,111,162,3 script Warpra Helper#23 112,{
callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower";
close;
}
-treasure02.gat,104,40,3 script Warpra Helper 112,{
+treasure02.gat,104,40,3 script Warpra Helper#24 112,{
callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon";
close;
}
-xmas_dun02.gat,124,131,3 script Warpra Helper 112,{
+xmas_dun02.gat,124,131,3 script Warpra Helper#25 112,{
callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon";
close;
}
-um_dun02.gat,44,28,3 script Warpra Helper 112,{
+um_dun02.gat,44,28,3 script Warpra Helper#26 112,{
callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon";
close;
}
-tur_dun02.gat,162,23,3 script Warpra Helper 112,{
+tur_dun02.gat,162,23,3 script Warpra Helper#27 112,{
callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon";
close;
}
-prt_maze02.gat,102,69,4 script Warpra Helper 112,{
+prt_maze02.gat,102,69,4 script Warpra Helper#28 112,{
callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon";
close;
}
diff --git a/npc/custom/eAAC_Scripts/vendmachine.txt b/npc/custom/eAAC_Scripts/vendmachine.txt
index 807a14e28..92a542a21 100644
--- a/npc/custom/eAAC_Scripts/vendmachine.txt
+++ b/npc/custom/eAAC_Scripts/vendmachine.txt
@@ -1,10 +1,12 @@
//=====================================
// Vending Machine Script
-// v2.3
+// v2.4
//=====================================
// by Celestria
//=====================================
// Changelog:
+// 2.4 - Removed Duplicates [Silent]
+//
// 2.3 - Added in "Slam" feature, as well as admin ability to turn machine on and off.
// - Added admin menu. Allows GMs to put machines in/out of service, and to clear
// all jammed items.
@@ -201,9 +203,7 @@ B_Cancel:
close;
B_StillJammed:
- mes "You shake and punch the vending machine, but it appears no matter how much energy you exert, the dang item isn't
-
-going to come loose.";
+ mes "You shake and punch the vending machine, but it appears no matter how much energy you exert, the dang item isn't going to come loose.";
next;
mes "["+strcharinfo(0)+"]";
mes "DANG VENDING MACHINES!";
diff --git a/npc/custom/healers/heal_payment.txt b/npc/custom/healers/heal_payment.txt
index bcb6d4e1e..2a64035d2 100644
--- a/npc/custom/healers/heal_payment.txt
+++ b/npc/custom/healers/heal_payment.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Yor & abunch of other people
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@@ -15,9 +15,10 @@
//= calculation is done at start of the script
//= Added Duplicates And Correct payon Loc [Darkchild]
//= Some modifications. Added NPC locations. [massdriller]
+//= Removed Duplicates [Silent]
//============================================================
-prontera.gat,150,184,5 script Healer#h1-1::Healer 742,{
+prontera.gat,150,184,5 script Healer#h2-1::Healer2 742,{
set @tempHp, MaxHp-Hp;
set @tempSpReal, MaxSp-Sp;
set @tempSp, ((MaxSp-Sp) * BaseLevel) / 5;
@@ -89,18 +90,18 @@ prontera.gat,150,184,5 script Healer#h1-1::Healer 742,{
}
-morocc.gat,159,96,5 duplicate(Healer) Healer#h2-2 742
-ayothaya.gat,155,111,5 duplicate(Healer) Healer#h2-3 742
-geffen.gat,121,61,5 duplicate(Healer) Healer#h2-4 742
-umbala.gat,94,162,5 duplicate(Healer) Healer#h2-5 742
-payon.gat,180,105,5 duplicate(Healer) Healer#h2-6 742
-alberta.gat,185,144,5 duplicate(Healer) Healer#h2-7 742
-aldebaran.gat,134,123,5 duplicate(Healer) Healer#h2-8 742
-izlude.gat,125,118,5 duplicate(Healer) Healer#h2-9 742
-xmas.gat,149,136,5 duplicate(Healer) Healer#h2-10 742
-comodo.gat,188,162,5 duplicate(Healer) Healer#h2-11 742
-amatsu.gat,200,80,5 duplicate(Healer) Healer#h2-12 742
-gonryun.gat,164,130,5 duplicate(Healer) Healer#h2-13 742
-yuno.gat,152,186,5 duplicate(Healer) Healer#h2-14 742
-niflheim.gat,188,180,5 duplicate(Healer) Healer#h2-15 742
-louyang.gat,225,103,5 duplicate(Healer) Healer#h2-16 742 \ No newline at end of file
+morocc.gat,159,96,5 duplicate(Healer2) Healer#h2-2 742
+ayothaya.gat,155,111,5 duplicate(Healer2) Healer#h2-3 742
+geffen.gat,121,61,5 duplicate(Healer2) Healer#h2-4 742
+umbala.gat,94,162,5 duplicate(Healer2) Healer#h2-5 742
+payon.gat,180,105,5 duplicate(Healer2) Healer#h2-6 742
+alberta.gat,185,144,5 duplicate(Healer2) Healer#h2-7 742
+aldebaran.gat,134,123,5 duplicate(Healer2) Healer#h2-8 742
+izlude.gat,125,118,5 duplicate(Healer2) Healer#h2-9 742
+xmas.gat,149,136,5 duplicate(Healer2) Healer#h2-10 742
+comodo.gat,188,162,5 duplicate(Healer2) Healer#h2-11 742
+amatsu.gat,200,80,5 duplicate(Healer2) Healer#h2-12 742
+gonryun.gat,164,130,5 duplicate(Healer2) Healer#h2-13 742
+yuno.gat,152,186,5 duplicate(Healer2) Healer#h2-14 742
+niflheim.gat,188,180,5 duplicate(Healer2) Healer#h2-15 742
+louyang.gat,225,103,5 duplicate(Healer2) Healer#h2-16 742 \ No newline at end of file
diff --git a/npc/custom/morroc_raceway.txt b/npc/custom/morroc_raceway.txt
index 910cdc592..d0c21a09b 100644
--- a/npc/custom/morroc_raceway.txt
+++ b/npc/custom/morroc_raceway.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= acky (god@acky.com)
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= Any eAthena Version
//===== Description: =========================================
@@ -16,10 +16,11 @@
//= must finish before a new race can be started.
//=
//= Removed permanent global variables
+//= 1.2 Removed Duplicates [Silent]
//============================================================
//Warps you into race way
-morocc.gat,166,105,6 script Race Girl 116,{
+morocc.gat,166,105,6 script Race Girl#01 116,{
mes "[Race Girl]";
mes "Would you like to visit ^0000FFMorroc Raceway^000000?";
next;
@@ -34,7 +35,7 @@ close;
}
//Warps you out of raceway
-pvp_y_1-5.gat,169,265,5 script Race Girl 116,{
+pvp_y_1-5.gat,169,265,5 script Race Girl#02 116,{
mes "[Race Girl]";
mes "Welcome to Morroc Raceway!";
next;
@@ -207,39 +208,39 @@ close;
}
//Check Point Marker Flags
-pvp_y_1-5.gat,144,267,4 script Check Point 1 722,{
+pvp_y_1-5.gat,144,267,4 script Check Point 1#01 722,{
end;
}
-pvp_y_1-5.gat,144,257,4 script Check Point 1 722,{
+pvp_y_1-5.gat,144,257,4 script Check Point 1#02 722,{
end;
}
-pvp_y_1-5.gat,70,252,3 script Check Point 2 722,{
+pvp_y_1-5.gat,70,252,3 script Check Point 2#01 722,{
end;
}
-pvp_y_1-5.gat,77,243,3 script Check Point 2 722,{
+pvp_y_1-5.gat,77,243,3 script Check Point 2#02 722,{
end;
}
-pvp_y_1-5.gat,81,48,1 script Check Point 3 722,{
+pvp_y_1-5.gat,81,48,1 script Check Point 3#01 722,{
end;
}
-pvp_y_1-5.gat,72,40,1 script Check Point 3 722,{
+pvp_y_1-5.gat,72,40,1 script Check Point 3#02 722,{
end;
}
-pvp_y_1-5.gat,244,65,7 script Check Point 4 722,{
+pvp_y_1-5.gat,244,65,7 script Check Point 4#01 722,{
end;
}
-pvp_y_1-5.gat,252,57,7 script Check Point 4 722,{
+pvp_y_1-5.gat,252,57,7 script Check Point 4#02 722,{
end;
}
-pvp_y_1-5.gat,259,260,5 script Check Point 5 722,{
+pvp_y_1-5.gat,259,260,5 script Check Point 5#01 722,{
end;
}
-pvp_y_1-5.gat,251,252,5 script Check Point 5 722,{
+pvp_y_1-5.gat,251,252,5 script Check Point 5#02 722,{
end;
}
-pvp_y_1-5.gat,174,249,4 script Finish Line 722,{
+pvp_y_1-5.gat,174,249,4 script Finish Line#01 722,{
end;
}
-pvp_y_1-5.gat,174,238,4 script Finish Line 722,{
+pvp_y_1-5.gat,174,238,4 script Finish Line#02 722,{
end;
} \ No newline at end of file
diff --git a/npc/custom/mvm.txt b/npc/custom/mvm.txt
index 8059fcc30..6a2ae567d 100644
--- a/npc/custom/mvm.txt
+++ b/npc/custom/mvm.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= acky - god@acky.com
//===== Current Version: =====================================
-//= 1.1.2
+//= 1.1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -16,6 +16,7 @@
//= Added Duel Room
//= ---------------------------------------------------------
//= Script is messy! Be careful!
+//= 1.1.3 Removed Duplicate Names [Silent]
//= 1.1.2 Changed all gmcommand to atcommand as Poki#3 suggested. [Vicious]
//============================================================
@@ -191,7 +192,7 @@ mes "[Referee]";
mes "Alright";
close;
}
-gon_test.gat,56,91,6 duplicate(monsterreferee) Referee 61
+gon_test.gat,56,91,6 duplicate(monsterreferee) Referee#01 61
// Usher //
@@ -767,7 +768,7 @@ end;
}
// Duel Arena //
-gon_test.gat,58,103,5 script Duel Master 92,{
+gon_test.gat,58,103,5 script Duel Master#01 92,{
if ($@duelist1$ == "") set @duel,0;
if ($@monster1 == "") set @duel,0;
set @marena,1;
@@ -859,7 +860,7 @@ close;
}
// Duel Exit //
-gon_test.gat,42,8,5 script Duel Master 92,{
+gon_test.gat,42,8,5 script Duel Master#02 92,{
mes "[Duel Master]";
mes "Would you like to return?";
menu "Yes",L_Leave,"No",-;
@@ -892,4 +893,4 @@ close;
}
gon_test.gat,49,5,5 duplicate(SummonPad) Summon Pad 4 111,2,2
-gon_test.gat,55,8,6 duplicate(monsterreferee) Referee 61 \ No newline at end of file
+gon_test.gat,55,8,6 duplicate(monsterreferee) Referee#02 61 \ No newline at end of file
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index ca282164f..cc5eeb037 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -10,7 +10,7 @@
// revised By Warlock //
///////////////////////////////////////////////////////////
//===== Version ===========================================
-//= 1.2
+//= 1.3
//===== Compatible With ===================================
//= eAthena 1.0
//===== Description =======================================
@@ -20,6 +20,7 @@
//= #Treasure_Token - used to keep track of tokens
//= 1.0 - Straight conversionof Aegis NPC file
//= 1.2 some bugfixes, typos [Lupus]
+//= 1.3 Removed Duplicates [Silent]
//////////////////////////////////////////////////////////
@@ -311,7 +312,7 @@ N_QuestStart2:
close;
}
//3-4
-mjolnir_02.gat,87,357,6 script Man 51,{
+mjolnir_02.gat,87,357,6 script Man#01 51,{
if (three_qset == 4 && countitem(1041) > 49) goto N_QuestComp;
if (three_qset == 4) goto N_QuestStart;
mes "[Rudolfo]";
@@ -455,7 +456,7 @@ N_QuestStart:
}
///////Job list 5///////
//5-1;
-prt_maze01.gat,18,184,6 script Lithin 752,{
+prt_maze01.gat,18,184,6 script Lithin#01 752,{
if (five_qset == 1 && countitem(1028) > 14) goto N_QuestComp;
if (five_qset == 1) goto N_QuestStart;
mes "[Lithin]";
@@ -482,7 +483,7 @@ N_QuestStart:
close;
}
//5-2 goes to 6-2 using callfunc;
-moc_ruins.gat,75,167,6 script Lithin 87,{
+moc_ruins.gat,75,167,6 script Lithin#02 87,{
if (five_qset == 2 && countitem(932) > 29) goto N_QuestComp;
if (five_qset == 2) goto N_QuestStart;
if (six_qset == 2) goto N_QuestStart2;
@@ -534,7 +535,7 @@ N_QuestStart:
close;
}
//5-4;
-gef_tower.gat,49,27,6 script Wizard 735,{
+gef_tower.gat,49,27,6 script Wizard#01 735,{
if (five_qset == 4 && countitem(1059) > 49) goto N_QuestComp;
if (five_qset == 4) goto N_QuestStart;
mes "[Wizard]";
@@ -631,7 +632,7 @@ N_QuestStart:
close;
}
//6-4;
-gef_tower.gat,52,87,6 script Wizard 735,{
+gef_tower.gat,52,87,6 script Wizard#02 735,{
if (six_qset == 4 && countitem(944) > 19) goto N_QuestComp;
if (six_qset == 4) goto N_QuestStart;
mes "[Zuuzuu]";
@@ -974,7 +975,7 @@ N_QuestStart:
close;
}
//10-2;
-pay_fild10.gat,145,252,6 script Man 122,{
+pay_fild10.gat,145,252,6 script Man#02 122,{
if (ten_qset == 2 && countitem(1029) > 0) goto N_QuestComp;
if (ten_qset == 2) goto N_QuestStart;
mes "[Man]";
diff --git a/npc/custom/warper/warper.txt b/npc/custom/warper/warper.txt
index c9b74f1a1..c9858ceda 100644
--- a/npc/custom/warper/warper.txt
+++ b/npc/custom/warper/warper.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Darkchild
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= Any eAthena Version;
//===== Description: =========================================
@@ -21,13 +21,14 @@
//= 1.6 Rewrote a lot. Changed the sprite, some locations. [Poki#3]
//= TODO Add an option for selecting the level of the dungeon. [Poki#3]
//= 1.7 Temporary? Added F_ClearGarbage to clear unused/outdated variables [Lupus]
+//= 1.8 Removed Duplicates [Silent]
//============================================================
//============================================================
//= To allow selecting the Level of the Dungeon you want to
//= Warp to set the @lvlselect variable to 1 (Not implemented yet!)
//============================================================
-- script Warp Agent::warpra 859,{
+- script Warp Agent#01::warpra 859,{
// set @lvlselect,0;
callfunc "F_ClearGarbage"; //Clear outdated, unused variables
@@ -97,46 +98,46 @@ dturtle: warp "tur_dun01.gat", 149, 238; end;
}
//----------------Towns----------------\\
-alberta.gat,31,240,4 duplicate(warpra) Warp Agent 859
-aldebaran.gat,145,118,4 duplicate(warpra) Warp Agent 859
-amatsu.gat,192,81,1 duplicate(warpra) Warp Agent 859
-ayothaya.gat,144,117,6 duplicate(warpra) Warp Agent 859
-comodo.gat,194,158,4 duplicate(warpra) Warp Agent 859
-einbroch.gat,59,205,4 duplicate(warpra) Warp Agent 859
-einbroch.gat,243,189,2 duplicate(warpra) Warp Agent 859
-einbech.gat,135,249,4 duplicate(warpra) Warp Agent 859
-geffen.gat,115,66,4 duplicate(warpra) Warp Agent 859
-gonryun.gat,151,130,4 duplicate(warpra) Warp Agent 859
-izlude.gat,133,117,4 duplicate(warpra) Warp Agent 859
-hugel.gat,88,151,5 duplicate(warpra) Warp Agent 859
-lighthalzen.gat,155,79,6 duplicate(warpra) Warp Agent 859
-louyang.gat,210,106,4 duplicate(warpra) Warp Agent 859
-morocc.gat,156,95,4 duplicate(warpra) Warp Agent 859
-prontera.gat,161,192,4 duplicate(warpra) Warp Agent 859
-payon.gat,182,110,4 duplicate(warpra) Warp Agent 859
-umbala.gat,132,130,4 duplicate(warpra) Warp Agent 859
-xmas.gat,150,136,4 duplicate(warpra) Warp Agent 859
-yuno.gat,137,162,4 duplicate(warpra) Warp Agent 859
+alberta.gat,31,240,4 duplicate(warpra) Warp Agent#02 859
+aldebaran.gat,145,118,4 duplicate(warpra) Warp Agent#03 859
+amatsu.gat,192,81,1 duplicate(warpra) Warp Agent#04 859
+ayothaya.gat,144,117,6 duplicate(warpra) Warp Agent#05 859
+comodo.gat,194,158,4 duplicate(warpra) Warp Agent#06 859
+einbroch.gat,59,205,4 duplicate(warpra) Warp Agent#07 859
+einbroch.gat,243,189,2 duplicate(warpra) Warp Agent#08 859
+einbech.gat,135,249,4 duplicate(warpra) Warp Agent#09 859
+geffen.gat,115,66,4 duplicate(warpra) Warp Agent#10 859
+gonryun.gat,151,130,4 duplicate(warpra) Warp Agent#11 859
+izlude.gat,133,117,4 duplicate(warpra) Warp Agent#12 859
+hugel.gat,88,151,5 duplicate(warpra) Warp Agent#13 859
+lighthalzen.gat,155,79,6 duplicate(warpra) Warp Agent#14 859
+louyang.gat,210,106,4 duplicate(warpra) Warp Agent#15 859
+morocc.gat,156,95,4 duplicate(warpra) Warp Agent#16 859
+prontera.gat,161,192,4 duplicate(warpra) Warp Agent#17 859
+payon.gat,182,110,4 duplicate(warpra) Warp Agent#18 859
+umbala.gat,132,130,4 duplicate(warpra) Warp Agent#19 859
+xmas.gat,150,136,4 duplicate(warpra) Warp Agent#20 859
+yuno.gat,137,162,4 duplicate(warpra) Warp Agent#21 859
//----------------Dungeons----------------\\
-ama_dun01.gat,233,9,1 duplicate(warpra) Warp Agent 859
-moc_fild04.gat,207,331,4 duplicate(warpra) Warp Agent 859
-ayo_fild02.gat,279,154,4 duplicate(warpra) Warp Agent 859
-izlu2dun.gat,104,82,4 duplicate(warpra) Warp Agent 859
-prt_sewb1.gat,125,253,4 duplicate(warpra) Warp Agent 859
-mjolnir_02.gat,85,363,4 duplicate(warpra) Warp Agent 859
-einbech.gat,81,101,1 duplicate(warpra) Warp Agent 859
-glast_01.gat,370,308,4 duplicate(warpra) Warp Agent 859
-yuno_fild03.gat,37,135,4 duplicate(warpra) Warp Agent 859
-niflheim.gat,32,161,4 duplicate(warpra) Warp Agent 859
-gef_fild10.gat,71,339,4 duplicate(warpra) Warp Agent 859
-pay_arche.gat,39,135,4 duplicate(warpra) Warp Agent 859
-moc_ruins.gat,64,166,4 duplicate(warpra) Warp Agent 859
-moc_fild19.gat,106,97,4 duplicate(warpra) Warp Agent 859
-alb2trea.gat,73,101,4 duplicate(warpra) Warp Agent 859
-tur_dun01.gat,148,239,4 duplicate(warpra) Warp Agent 859
-lhz_dun01.gat,157,285,4 duplicate(warpra) Warp Agent 859
-hu_fild05.gat,186,210,4 duplicate(warpra) Warp Agent 859
-yuno_fild07.gat,221,179,4 duplicate(warpra) Warp Agent 859
-tha_scene01.gat,139,194,1 duplicate(warpra) Warp Agent 859
-odin_tem01.gat,96,149,4 duplicate(warpra) Warp Agent 859
+ama_dun01.gat,233,9,1 duplicate(warpra) Warp Agent#22 859
+moc_fild04.gat,207,331,4 duplicate(warpra) Warp Agent#23 859
+ayo_fild02.gat,279,154,4 duplicate(warpra) Warp Agent#24 859
+izlu2dun.gat,104,82,4 duplicate(warpra) Warp Agent#25 859
+prt_sewb1.gat,125,253,4 duplicate(warpra) Warp Agent#26 859
+mjolnir_02.gat,85,363,4 duplicate(warpra) Warp Agent#27 859
+einbech.gat,81,101,1 duplicate(warpra) Warp Agent#28 859
+glast_01.gat,370,308,4 duplicate(warpra) Warp Agent#29 859
+yuno_fild03.gat,37,135,4 duplicate(warpra) Warp Agent#30 859
+niflheim.gat,32,161,4 duplicate(warpra) Warp Agent#31 859
+gef_fild10.gat,71,339,4 duplicate(warpra) Warp Agent#32 859
+pay_arche.gat,39,135,4 duplicate(warpra) Warp Agent#33 859
+moc_ruins.gat,64,166,4 duplicate(warpra) Warp Agent#34 859
+moc_fild19.gat,106,97,4 duplicate(warpra) Warp Agent#35 859
+alb2trea.gat,73,101,4 duplicate(warpra) Warp Agent#36 859
+tur_dun01.gat,148,239,4 duplicate(warpra) Warp Agent#37 859
+lhz_dun01.gat,157,285,4 duplicate(warpra) Warp Agent#38 859
+hu_fild05.gat,186,210,4 duplicate(warpra) Warp Agent#39 859
+yuno_fild07.gat,221,179,4 duplicate(warpra) Warp Agent#40 859
+tha_scene01.gat,139,194,1 duplicate(warpra) Warp Agent#41 859
+odin_tem01.gat,96,149,4 duplicate(warpra) Warp Agent#42 859
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 07:40:42 +0000