summaryrefslogtreecommitdiff
path: root/npc/custom/eAAC_Scripts
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/eAAC_Scripts
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/eAAC_Scripts')
-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
3 files changed, 79 insertions, 76 deletions
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!";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-11 03:38:25 +0000