From f87568e9b29ab6dc2b2bff4bee254a8f1b6bb5c8 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 17 Mar 2021 01:37:43 -0300 Subject: Register Artis to the location master. It's now official. --- db/constants.conf | 1 + npc/029-0/_import.txt | 1 + npc/029-0/town.txt | 11 +++++++++++ npc/commands/warp.txt | 1 + npc/config/location.txt | 10 +++++----- 5 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 npc/029-0/town.txt diff --git a/db/constants.conf b/db/constants.conf index 7e14026dc..e92fa2c70 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -2092,6 +2092,7 @@ constants_db: { TP_BOSSR: 128 TP_LILIT: 256 TP_CANDOR: 512 + TP_ARTIS: 1024 comment__: "Grand Collector Quest enum" COLLECT_CHESTPLATE: 1 diff --git a/npc/029-0/_import.txt b/npc/029-0/_import.txt index a1ee90f8c..18816bb55 100644 --- a/npc/029-0/_import.txt +++ b/npc/029-0/_import.txt @@ -5,4 +5,5 @@ "npc/029-0/event.txt", "npc/029-0/mobs.txt", "npc/029-0/sakar.txt", +"npc/029-0/town.txt", "npc/029-0/warps.txt", diff --git a/npc/029-0/town.txt b/npc/029-0/town.txt new file mode 100644 index 000000000..c1e5eec51 --- /dev/null +++ b/npc/029-0/town.txt @@ -0,0 +1,11 @@ +// TMW-2 Script +// Author: +// Jesusalva +// Description: +// Reset LOCATION$ when entering a town + +029-0,203,85,0 script #LocArtis NPC_HIDDEN,3,3,{ +OnTouch: + EnterTown("Artis"); end; +} + diff --git a/npc/commands/warp.txt b/npc/commands/warp.txt index 00058c9ce..adca7ab9f 100644 --- a/npc/commands/warp.txt +++ b/npc/commands/warp.txt @@ -78,6 +78,7 @@ OnInit: "^FROST", "024-1 94 42", // Frostia "^FORT", "025-1 100 83", // Fortress Town "^MAGI|^ACADEMY", "027-1 89 83", // Magic Academy + "^ART", "029-0 203 85", // Artis // TBR - To Be Removed "^BOSS", "boss 45 45", // (TBR) Monster King's Throne Room diff --git a/npc/config/location.txt b/npc/config/location.txt index f33abbe76..19ce476fd 100644 --- a/npc/config/location.txt +++ b/npc/config/location.txt @@ -7,11 +7,11 @@ OnInit: // TP_FORT TP_BOSSR - setarray $@LOCMASTER_TP, TP_CANDOR,TP_TULIM,TP_HALIN,TP_HURNS, TP_LOF,TP_LILIT,TP_NIVAL, TP_FROST, TP_FORT; - setarray $@LOCMASTER_LOC$, "Candor", "Tulim", "Halin", "Hurns", "LoF", "Lilit", "Nival", "Frostia", "Fort"; - setarray $@LOCMASTER_MAP$, "005-1", "003-1", "009-1", "012-1", "017-1", "018-5", "020-1", "024-1", "025-2"; - setarray $@LOCMASTER_X, 43, 40, 26, 86, 119, 111, 56, 94, 108; - setarray $@LOCMASTER_Y, 99, 49, 30, 69, 87, 53, 62, 42, 32; + setarray $@LOCMASTER_TP, TP_CANDOR,TP_TULIM,TP_HALIN,TP_HURNS, TP_LOF,TP_LILIT,TP_NIVAL, TP_FROST, TP_FORT,TP_ARTIS; + setarray $@LOCMASTER_LOC$, "Candor", "Tulim", "Halin", "Hurns", "LoF", "Lilit", "Nival", "Frostia", "Fort", "Artis"; + setarray $@LOCMASTER_MAP$, "005-1", "003-1", "009-1", "012-1", "017-1", "018-5", "020-1", "024-1", "025-2", "029-0"; + setarray $@LOCMASTER_X, 43, 40, 26, 86, 119, 111, 56, 94, 108, 203; + setarray $@LOCMASTER_Y, 99, 49, 30, 69, 87, 53, 62, 42, 32 85; //debugmes "Locmaster: Index 0: %s [%s.gat (%d, %d)]", $@LOCMASTER_LOC$[0], $@LOCMASTER_MAP$[0], $@LOCMASTER_X[0], $@LOCMASTER_Y[0]; //debugmes "Locmaster: Index 2: %s [%s.gat (%d, %d)]", $@LOCMASTER_LOC$[2], $@LOCMASTER_MAP$[2], $@LOCMASTER_X[2], $@LOCMASTER_Y[2]; -- cgit v1.2.3-70-g09d2