From 1d9b8b3c218e3a2f02de620c125739ed8c202e33 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Wed, 28 Dec 2011 05:37:03 +0000
Subject: [PATCH] BETA: NPC shift action improvements: * Heading is now
displayed. * Collision Radius is now displayed. * Collision Height is
now displayed.
Useful for debug new NPCs.
---
.../dist/game/data/html/admin/npcinfo.htm | 13 ++++++++-----
.../handlers/actionhandlers/L2NpcActionShift.java | 3 +++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/html/admin/npcinfo.htm b/L2J_DataPack_BETA/dist/game/data/html/admin/npcinfo.htm
index f29801f9f1..319f4b6b61 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/admin/npcinfo.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/admin/npcinfo.htm
@@ -16,11 +16,14 @@
</table>
<br><img src="L2UI.SquareWhite" width=260 height=1><br>
<table width=270 border=0>
-<tr><td colspan="4"><table width=270 border=0 bgcolor=131210><tr><td width=270><font color="LEVEL">Npc Info</font> : %name% (<font color="LEVEL">%id%</font>) [<font color=00FF00>%lvl%</font> lvl]</td></tr></table></td></tr>
-<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">ObjectId</font></td><td align=right width=170>%objid%</td></tr></table></td></tr>
-<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Type:</font></td><td align=right width=170><font color=999999>%class%</font></td></tr></table></td></tr>
-<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Spawn</font></td><td align=right width=170>%spawn%</td></tr></table></td></tr>
-<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Location:</font></td><td align=right width=170>%loc%</td></tr></table></td></tr>
+<tr><td colspan="4"><table width=270 border=0><tr><td width=270><font color="LEVEL">Npc Info</font> : %name% (<font color="LEVEL">%id%</font>) [<font color=00FF00>%lvl%</font> lvl]</td></tr></table></td></tr>
+<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">ObjectId</font></td><td align=right width=170>%objid%</td></tr></table></td></tr>
+<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Type:</font></td><td align=right width=170><font color=999999>%class%</font></td></tr></table></td></tr>
+<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Spawn</font></td><td align=right width=170>%spawn%</td></tr></table></td></tr>
+<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Location:</font></td><td align=right width=170>%loc%</td></tr></table></td></tr>
+<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Heading:</font></td><td align=right width=170>%heading%</td></tr></table></td></tr>
+<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Collision Radius:</font></td><td align=right width=170>%collision_radius%</td></tr></table></td></tr>
+<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Collision Height:</font></td><td align=right width=170>%collision_height%</td></tr></table></td></tr>
<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Distance:</font></td><td align=right width=170>2D: %loc2d%, 3D: %loc3d%, You: %dist%</td></tr></table></td></tr>
<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Respawn:</font></td><td align=right width=170>%resp% sec</td></tr></table></td></tr>
<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Aggro:</font></td><td align=right width=170><font color=999999>%aggro%</font></td></tr></table></td></tr>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
index 4f611df8c1..6d30275161 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
@@ -108,6 +108,9 @@ public class L2NpcActionShift implements IActionHandler
html.replace("%wit%", String.valueOf(((L2Character)target).getWIT()));
html.replace("%men%", String.valueOf(((L2Character)target).getMEN()));
html.replace("%loc%", String.valueOf(target.getX()+" "+target.getY()+" "+target.getZ()));
+ html.replace("%heading%", String.valueOf(((L2Character) target).getHeading()));
+ html.replace("%collision_radius%", String.valueOf(((L2Character)target).getTemplate().getfCollisionRadius()));
+ html.replace("%collision_height%", String.valueOf(((L2Character)target).getTemplate().getfCollisionHeight()));
html.replace("%dist%", String.valueOf((int)Math.sqrt(activeChar.getDistanceSq(target))));
byte attackAttribute = ((L2Character)target).getAttackElement();
--
GitLab