summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-12-14 17:19:13 -0200
committerJesusaves <cpntb1@ymail.com>2018-12-14 17:19:13 -0200
commit12f6599bd11525b853d3da4381a4f49efb25e5f5 (patch)
treefb8db791233af77cc957307fe30d8b5dc2b4c603
parentf51f98404b78716831bd94aaa502bb0bb45c2a59 (diff)
downloadserverdata-12f6599bd11525b853d3da4381a4f49efb25e5f5.tar.gz
serverdata-12f6599bd11525b853d3da4381a4f49efb25e5f5.tar.bz2
serverdata-12f6599bd11525b853d3da4381a4f49efb25e5f5.tar.xz
serverdata-12f6599bd11525b853d3da4381a4f49efb25e5f5.zip
Squash bug, and add a getmap() helper for future uses
-rw-r--r--db/re/item_db.conf2
-rw-r--r--npc/functions/main.txt6
2 files changed, 7 insertions, 1 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index f4403d09b..e9418777c 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1820,7 +1820,7 @@ item_db: (
@delay = 3;
@type = 1;
// Effect up on Aeros
- getmapxy(.@ma$,.@xa,.@ya);
+ getmapxy(.@ma$,.@xa,.@ya,0);
if (.@ma$ ~= "001-*")
@min+=400;
doevent "rand_sc_heal::OnUse";
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index 38034980e..8ddcd631b 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -255,6 +255,12 @@ function script any_of {
// TMW2 Custom Functions
/////////////////////////////////////////////
+function script getmap {
+ if (getmapxy(.@mapName$, .@xpos, .@ypos, 0) != 0)
+ return false;
+ return .@mapName$;
+}
+
function script isin {
if (getmapxy(.@mapName$, .@xpos, .@ypos, 0) != 0)
return false;