summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorHello=) <hello@themanaworld.org>2025-06-15 08:56:09 +0300
committerHello TMW <hello@themanaworld.org>2025-07-02 02:37:33 +0000
commit3585f4a9699deb69a616fb9f689e8d460b5f8ffb (patch)
tree57a5f133739a1a9ac2f0b49ab905a64f3723a3ad /world
parente803cd4b58c4c82e47d70fb8c8e91b7e9544e395 (diff)
downloadserverdata-master.tar.gz
serverdata-master.tar.bz2
serverdata-master.tar.xz
serverdata-master.zip
Even more Teleport Manager fixes/refactor:HEADmaster
1) Fixed sizable refactor BUG, in #bossflee pseudospell. * could've caused unplanned server exit on boss flee! 2) Fix error messages a bit once I'm on fixing bossflee.
Diffstat (limited to 'world')
-rw-r--r--world/map/npc/magic/event-boss-powerup-flee.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/world/map/npc/magic/event-boss-powerup-flee.txt b/world/map/npc/magic/event-boss-powerup-flee.txt
index ee0e68a3..8faf9251 100644
--- a/world/map/npc/magic/event-boss-powerup-flee.txt
+++ b/world/map/npc/magic/event-boss-powerup-flee.txt
@@ -16,11 +16,11 @@ OnCast:
end;
L_EscPlanFail1:
- message strcharinfo(0), "[#bossflee] : Escape plan status: fail! (bad destination?)";
+ message strcharinfo(0), "[bossflee] : Escape plan status: fail! (bad destination?)";
end;
L_EscPlanFail2:
- message strcharinfo(0), "[#bossflee] : Escape plan status: fail! (teleport creation failed)";
+ message strcharinfo(0), "[bossflee] : Escape plan status: fail! (teleport creation failed)";
end;
// Puppet (teleportation pads) logic below.
@@ -64,7 +64,7 @@ function|script|bossflee_parseargs
set @DST_X, @argv[1]; // Dst warp coordinates
set @DST_Y, @argv[2]; // Dst warp coordinates
// Check DST map is okay
- if !(call("teleport_map_valid", @DSTMAP$)) goto L_FailBadmap; // DST: invalid map?
+ if !(mapexists(@DSTMAP$)) goto L_FailBadmap; // DST: invalid map?
// Check DST X,Y sane
if ((@DST_X <= 0) || (@DST_Y <= 0)) goto L_FailBadDstXY1; // DST: invalids coords <= 0?
if ((getmapmaxx(@DSTMAP$) < @DST_X) || (getmapmaxy(@DSTMAP$) < @DST_Y)) goto L_FailBadDstXY2; // Outside of map?
@@ -77,18 +77,18 @@ function|script|bossflee_parseargs
return 0; // Everything OK
L_FailBadmap:
- message strcharinfo(0), "[#bossflee] : unknown flee map:" + @DSTMAP$;
+ message strcharinfo(0), "[bossflee] : unknown flee map:" + @DSTMAP$;
return 1;
L_FailBadDstXY1:
- message strcharinfo(0), "[#bossflee] : flee map X,Y must be > 0! Given X=" + @DST_X + " Y=" + @DST_Y;
+ message strcharinfo(0), "[bossflee] : flee map X,Y must be > 0! Given X=" + @DST_X + " Y=" + @DST_Y;
return 2;
L_FailBadDstXY2:
- message strcharinfo(0), "[#bossflee] : flee map X,Y outside of map! Given X=" + @DST_X+ " Y=" + @DST_Y;
+ message strcharinfo(0), "[bossflee] : flee map X,Y outside of map! Given X=" + @DST_X+ " Y=" + @DST_Y;
return 3;
L_FailDstCollide:
- message strcharinfo(0), "[#bossflee] : flee MAP=" + @DSTMAP$ + " X=" + @DST_X + " Y=" + @DST_Y + " is a collision (impassable)";
+ message strcharinfo(0), "[bossflee] : flee MAP=" + @DSTMAP$ + " X=" + @DST_X + " Y=" + @DST_Y + " is a collision (impassable)";
return 4;
}