diff options
| author | Jesusaves <cpntb1@ymail.com> | 2021-04-13 18:39:07 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2021-04-13 18:39:07 -0300 |
| commit | ef1c3e81e2e0372e882fc7e0d76daf24cc4cc589 (patch) | |
| tree | f43032c25c90af64eb69e2dc61192bfb50428cdb | |
| parent | 2d3024a574858935aac4c4a4fa078b357498531a (diff) | |
| download | serverdata-ef1c3e81e2e0372e882fc7e0d76daf24cc4cc589.tar.gz serverdata-ef1c3e81e2e0372e882fc7e0d76daf24cc4cc589.tar.bz2 serverdata-ef1c3e81e2e0372e882fc7e0d76daf24cc4cc589.tar.xz serverdata-ef1c3e81e2e0372e882fc7e0d76daf24cc4cc589.zip | |
Fix typos and record location changes when using the Koga
| -rw-r--r-- | npc/035-2/koga.txt | 3 | ||||
| -rw-r--r-- | npc/036-2/koga-candor.txt | 2 | ||||
| -rw-r--r-- | npc/functions/location.txt | 17 |
3 files changed, 6 insertions, 16 deletions
diff --git a/npc/035-2/koga.txt b/npc/035-2/koga.txt index a24e6e02..18a0a96c 100644 --- a/npc/035-2/koga.txt +++ b/npc/035-2/koga.txt @@ -15,14 +15,17 @@ L_Leave: goto L_close; L_Tulimshar: + EnterTown("Tulim"); warp "001-1", 63, 73; goto L_close; L_Hurnscald: + EnterTown("Hurns"); warp "008-1", 136, 64; goto L_close; L_Nivalis: + EnterTown("Nival"); warp "031-1", 95, 109; goto L_close; diff --git a/npc/036-2/koga-candor.txt b/npc/036-2/koga-candor.txt index b788e67d..bd34564b 100644 --- a/npc/036-2/koga-candor.txt +++ b/npc/036-2/koga-candor.txt @@ -13,10 +13,12 @@ L_Leave: goto L_close; L_Hurnscald: + EnterTown("Hurns"); warp "008-1", 136, 75; goto L_close; L_Candor: + EnterTown("Candor"); warp "029-1", 46, 109; goto L_close; diff --git a/npc/functions/location.txt b/npc/functions/location.txt index 093764af..e40148c4 100644 --- a/npc/functions/location.txt +++ b/npc/functions/location.txt @@ -85,34 +85,19 @@ function script TPToLoc { function script POL_LocToTP { .@tw$=strtoupper(getarg(0, LOCATION$)); + // TODO: Change this to use the arrays instead if (.@tw$ == "TULIM") return TP_TULIM; - if (.@tw$ == "HALIN") - return TP_HALIN; - if (.@tw$ == "HURNS") return TP_HURNS; - if (.@tw$ == "LOF") - return TP_LOF; - if (.@tw$ == "NIVAL") return TP_NIVAL; - if (.@tw$ == "ARTIS") - return TP_ARTIS; - if (.@tw$ == "CANDOR") return TP_CANDOR; - if (.@tw$ == "LILIT") - return TP_LILIT; - - // TODO: Change this to use npc/config/location.txt instead - if (.@tw$ == "FROSTIA") - return TP_FROST; - return Exception("Invalid town requested / POL_LocToTP", RB_DEFAULT|RB_SPEECH, -1); } |