From 9da6407f713ecdd748d2d358f1167a7f3d4a863d Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 21 Aug 2023 01:19:26 -0300 Subject: Remove redundant code from npc/functions/teleporter.txt Deprecates !117 --- npc/functions/teleporter.txt | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/npc/functions/teleporter.txt b/npc/functions/teleporter.txt index fc6afd973..32f05db22 100644 --- a/npc/functions/teleporter.txt +++ b/npc/functions/teleporter.txt @@ -15,10 +15,7 @@ function script TeleporterGate { if (.@x < 0) return Exception("Invalid Teleport Point: "+.@TP); - // Obtain current Teleport Point (.@IF) - .@x=array_find($@LOCMASTER_MAP$, getmap()); - .@IF=$@LOCMASTER_TP[.@x]; - + // Register current Teleport Point (.@TP) if (!(TELEPORTERS & .@TP)) { TELEPORTERS=TELEPORTERS|.@TP; mesn "Anise Inc."; @@ -31,15 +28,15 @@ function script TeleporterGate { close; next; menuint - rif(TELEPORTERS & TP_FROST && .@IF != TP_FROST, l("Frostia")), TP_FROST, - rif(TELEPORTERS & TP_HALIN && .@IF != TP_HALIN, l("Halinarzo")), TP_HALIN, - rif(TELEPORTERS & TP_LILIT && .@IF != TP_LILIT, l("Lilit")), TP_LILIT, - rif(TELEPORTERS & TP_TULIM && .@IF != TP_TULIM, l("Tulimshar")), TP_TULIM, - rif(TELEPORTERS & TP_HURNS && .@IF != TP_HURNS, l("Hurnscald")), TP_HURNS, - rif(TELEPORTERS & TP_NIVAL && .@IF != TP_NIVAL, l("Nivalis")), TP_NIVAL, - rif(TELEPORTERS & TP_LOF && .@IF != TP_LOF, l("Land Of Fire")), TP_LOF, - rif(TELEPORTERS & TP_FORT && .@IF != TP_FORT, l("Fortress Island")), TP_FORT, - rif(TELEPORTERS & TP_BOSSR && .@IF != TP_BOSSR, l("Moubootaur Maze")), TP_BOOSR, + rif(TELEPORTERS & TP_FROST && .@TP != TP_FROST, l("Frostia")), TP_FROST, + rif(TELEPORTERS & TP_HALIN && .@TP != TP_HALIN, l("Halinarzo")), TP_HALIN, + rif(TELEPORTERS & TP_LILIT && .@TP != TP_LILIT, l("Lilit")), TP_LILIT, + rif(TELEPORTERS & TP_TULIM && .@TP != TP_TULIM, l("Tulimshar")), TP_TULIM, + rif(TELEPORTERS & TP_HURNS && .@TP != TP_HURNS, l("Hurnscald")), TP_HURNS, + rif(TELEPORTERS & TP_NIVAL && .@TP != TP_NIVAL, l("Nivalis")), TP_NIVAL, + rif(TELEPORTERS & TP_LOF && .@TP != TP_LOF, l("Land Of Fire")), TP_LOF, + rif(TELEPORTERS & TP_FORT && .@TP != TP_FORT, l("Fortress Island")), TP_FORT, + rif(TELEPORTERS & TP_BOSSR && .@TP != TP_BOSSR, l("Moubootaur Maze")), TP_BOOSR, l("None"), -1; mes ""; -- cgit v1.2.3-60-g2f50