summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-08-23 17:34:44 +0000
committerJesusaves <cpntb1@ymail.com>2020-08-23 17:34:44 +0000
commit98ff7bd722dbb2cd5f2e1234ad7e48b206bfb66d (patch)
treecfd41ede2a6c5f6e1567d571fbc8ac77d778b00a
parentf1c46db9680829c1b0b54587a5a3011d6ea31973 (diff)
parentf37e13f8ce62bb37973978fc6db26f68b737c834 (diff)
downloadserverdata-98ff7bd722dbb2cd5f2e1234ad7e48b206bfb66d.tar.gz
serverdata-98ff7bd722dbb2cd5f2e1234ad7e48b206bfb66d.tar.bz2
serverdata-98ff7bd722dbb2cd5f2e1234ad7e48b206bfb66d.tar.xz
serverdata-98ff7bd722dbb2cd5f2e1234ad7e48b206bfb66d.zip
Merge branch 'frostia-warp-fix' into 'master'
Fixed teleporter bug (hopefully) See merge request TMW2/serverdata!42
-rw-r--r--npc/functions/teleporter.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/functions/teleporter.txt b/npc/functions/teleporter.txt
index e8d151b44..f3fb5efb6 100644
--- a/npc/functions/teleporter.txt
+++ b/npc/functions/teleporter.txt
@@ -32,11 +32,11 @@ function script TeleporterGate {
next;
menuint
rif(TELEPORTERS & TP_FROST && .@IF != TP_FROST, l("Frostia")), TP_FROST,
- rif(TELEPORTERS & TP_HALIN && .@IF != TP_FROST, l("Halinarzo")), TP_HALIN,
- rif(TELEPORTERS & TP_LILIT && .@IF != TP_FROST, l("Lilit")), TP_LILIT,
- rif(TELEPORTERS & TP_TULIM && .@IF != TP_FROST, l("Tulimshar")), TP_TULIM,
- rif(TELEPORTERS & TP_HURNS && .@IF != TP_FROST, l("Hurnscald")), TP_HURNS,
- rif(TELEPORTERS & TP_NIVAL && .@IF != TP_FROST, l("Nivalis")), TP_NIVAL,
+ 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,