summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-07-04 13:30:22 -0300
committerJesusaves <cpntb1@ymail.com>2020-07-04 13:30:22 -0300
commit3ddda266d36140239ed2a02e9246f2b975973d73 (patch)
treece351889437d5b3a6c7db01ab30116626cee260a /npc
parent83f299dfbdaa2a8817e58e04c9cc0bef7ceb704f (diff)
downloadserverdata-3ddda266d36140239ed2a02e9246f2b975973d73.tar.gz
serverdata-3ddda266d36140239ed2a02e9246f2b975973d73.tar.bz2
serverdata-3ddda266d36140239ed2a02e9246f2b975973d73.tar.xz
serverdata-3ddda266d36140239ed2a02e9246f2b975973d73.zip
Refactor teleport gates and ensure they all work
Diffstat (limited to 'npc')
-rw-r--r--npc/009-1/teleporter.txt40
-rw-r--r--npc/018-5/teleporter.txt40
-rw-r--r--npc/024-1/teleporter.txt40
-rw-r--r--npc/scripts.conf1
4 files changed, 4 insertions, 117 deletions
diff --git a/npc/009-1/teleporter.txt b/npc/009-1/teleporter.txt
index f36abc917..85d85ef5d 100644
--- a/npc/009-1/teleporter.txt
+++ b/npc/009-1/teleporter.txt
@@ -11,45 +11,7 @@
end;
OnTouch:
- if (!(TELEPORTERS & TP_HALIN)) {
- TELEPORTERS=TELEPORTERS|TP_HALIN;
- mesn "Anise Inc.";
- mesc l("Location Registered. You are now capable to use this warp gate.");
- next;
- }
- mesc l("Where should I warp to?");
- mesc l("Cost: 1 @@", getitemlink(PileOfAsh)), 1;
- if (!countitem(PileOfAsh))
- close;
- next;
- select
- rif(TELEPORTERS & TP_FROST, l("Frostia")),
- rif(TELEPORTERS & TP_HALIN && 0, l("Halinarzo")),
- rif(TELEPORTERS & TP_LILIT, l("Lilit")),
- rif(TELEPORTERS & TP_TULIM, l("Tulimshar")),
- rif(TELEPORTERS & TP_HURNS, l("Hurnscald")),
- rif(TELEPORTERS & TP_NIVAL, l("Nivalis")),
- rif(TELEPORTERS & TP_LOF, l("Land Of Fire")),
- rif(TELEPORTERS & TP_FORT, l("Fortress Island")),
- rif(TELEPORTERS & TP_BOSSR, l("The Monster King Fortress")),
- l("None");
- mes "";
- if (@menu != 9)
- delitem PileOfAsh, 1;
- closedialog;
- switch (@menu) {
- case 1:
- warp "024-1", 155, 82; break;
- case 3:
- warp "018-5", any(89, 90), 45; break;
- case 4:
- warp "003-1", any(40, 41), 49; break;
- case 5:
- warp "012-1", any(86, 87), any(69, 70); break;
- default:
- close;
- }
-
+ TeleporterGate(TP_HALIN);
close;
diff --git a/npc/018-5/teleporter.txt b/npc/018-5/teleporter.txt
index 7b3be840b..8c8d318d2 100644
--- a/npc/018-5/teleporter.txt
+++ b/npc/018-5/teleporter.txt
@@ -11,45 +11,7 @@
end;
OnTouch:
- if (!(TELEPORTERS & TP_LILIT)) {
- TELEPORTERS=TELEPORTERS|TP_LILIT;
- mesn "Anise Inc.";
- mesc l("Location Registered. You are now capable to use this warp gate.");
- next;
- }
- mesc l("Where should I warp to?");
- mesc l("Cost: 1 @@", getitemlink(PileOfAsh)), 1;
- if (!countitem(PileOfAsh))
- close;
- next;
- select
- rif(TELEPORTERS & TP_FROST, l("Frostia")),
- rif(TELEPORTERS & TP_HALIN, l("Halinarzo")),
- rif(TELEPORTERS & TP_LILIT && 0, l("Lilit")),
- rif(TELEPORTERS & TP_TULIM, l("Tulimshar")),
- rif(TELEPORTERS & TP_HURNS, l("Hurnscald")),
- rif(TELEPORTERS & TP_NIVAL, l("Nivalis")),
- rif(TELEPORTERS & TP_LOF, l("Land Of Fire")),
- rif(TELEPORTERS & TP_FORT, l("Fortress Island")),
- rif(TELEPORTERS & TP_BOSSR, l("The Monster King Fortress")),
- l("None");
- mes "";
- if (@menu != 9)
- delitem PileOfAsh, 1;
- closedialog;
- switch (@menu) {
- case 1:
- warp "024-1", 155, 82; break;
- case 2:
- warp "009-1", 113, 91; break;
- case 4:
- warp "003-1", any(40, 41), 49; break;
- case 5:
- warp "012-1", any(86, 87), any(69, 70); break;
- default:
- close;
- }
-
+ TeleporterGate(TP_LILIT);
close;
diff --git a/npc/024-1/teleporter.txt b/npc/024-1/teleporter.txt
index 34595e695..2bed0ae41 100644
--- a/npc/024-1/teleporter.txt
+++ b/npc/024-1/teleporter.txt
@@ -11,45 +11,7 @@
end;
OnTouch:
- if (!(TELEPORTERS & TP_FROST)) {
- TELEPORTERS=TELEPORTERS|TP_FROST;
- mesn "Anise Inc.";
- mesc l("Location Registered. You are now capable to use this warp gate.");
- next;
- }
- mesc l("Where should I warp to?");
- mesc l("Cost: 1 @@", getitemlink(PileOfAsh)), 1;
- if (!countitem(PileOfAsh))
- close;
- next;
- select
- rif(TELEPORTERS & TP_FROST && 0, l("Frostia")),
- rif(TELEPORTERS & TP_HALIN, l("Halinarzo")),
- rif(TELEPORTERS & TP_LILIT, l("Lilit")),
- rif(TELEPORTERS & TP_TULIM, l("Tulimshar")),
- rif(TELEPORTERS & TP_HURNS, l("Hurnscald")),
- rif(TELEPORTERS & TP_NIVAL, l("Nivalis")),
- rif(TELEPORTERS & TP_LOF, l("Land Of Fire")),
- rif(TELEPORTERS & TP_FORT, l("Fortress Island")),
- rif(TELEPORTERS & TP_BOSSR, l("The Monster King Fortress")),
- l("None");
- mes "";
- if (@menu != 9)
- delitem PileOfAsh, 1;
- closedialog;
- switch (@menu) {
- case 2:
- warp "009-1", 113, 91; break;
- case 3:
- warp "018-5", any(89, 90), 45; break;
- case 4:
- warp "003-1", any(40, 41), 49; break;
- case 5:
- warp "012-1", any(86, 87), any(69, 70); break;
- default:
- close;
- }
-
+ TeleporterGate(TP_FROST);
close;
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 31da48aa0..297ff8189 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -69,6 +69,7 @@
"npc/functions/shops.txt",
"npc/functions/siege.txt",
"npc/functions/soul_menhir.txt",
+"npc/functions/teleporter.txt",
"npc/functions/treasure.txt",
"npc/functions/filters.txt",