summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-01 22:11:36 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-01 22:11:36 +0000
commita9b1f06e98367bda11817d0c64ae2e8af4471f2b (patch)
tree4f1af08f496e625726497e6522310cf81fbbab72 /npc/other
parent911c0ea64888157f7a9496a4a5c516af92c0d11c (diff)
downloadhercules-a9b1f06e98367bda11817d0c64ae2e8af4471f2b.tar.gz
hercules-a9b1f06e98367bda11817d0c64ae2e8af4471f2b.tar.bz2
hercules-a9b1f06e98367bda11817d0c64ae2e8af4471f2b.tar.xz
hercules-a9b1f06e98367bda11817d0c64ae2e8af4471f2b.zip
Tried to remove all duplicates (in default NPCs)
( hope nothing is broken ;) ) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8581 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/dts_warper.txt21
1 files changed, 11 insertions, 10 deletions
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,{