Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java (modified) (9 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java

@@ -28 +28 @@
 import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.item.L2Item;
 import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -33 +34 @@
 import com.l2jserver.gameserver.skills.BaseStats;
 import com.l2jserver.gameserver.skills.Stats;
-import com.l2jserver.gameserver.templates.item.L2Item;
 import com.l2jserver.util.StringUtil;
 
@@ -53 +53 @@
          * <li> Client packet : Action</li><BR><BR>
          */
+        @Override
         public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
         {
@@ -81 +82 @@
                         html.replace("%objid%", String.valueOf(target.getObjectId()));
                         html.replace("%class%", target.getClass().getSimpleName());
-                        html.replace("%id%",    String.valueOf(((L2Npc)target).getTemplate().npcId));
-                        html.replace("%lvl%",   String.valueOf(((L2Npc)target).getTemplate().level));
-                        html.replace("%name%",  String.valueOf(((L2Npc)target).getTemplate().name));
-                        html.replace("%tmplid%",String.valueOf(((L2Npc)target).getTemplate().npcId));
+                        html.replace("%id%",    String.valueOf(((L2Npc)target).getTemplate().getNpcId()));
+                        html.replace("%lvl%",   String.valueOf(((L2Npc)target).getTemplate().getLevel()));
+                        html.replace("%name%",  String.valueOf(((L2Npc)target).getTemplate().getName()));
+                        html.replace("%tmplid%",String.valueOf(((L2Npc)target).getTemplate().getNpcId()));
                         html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
                         html.replace("%hp%",    String.valueOf((int)((L2Character)target).getCurrentHp()));
@@ -108 +109 @@
                         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))));
                         
@@ -154 +158 @@
                         if (target instanceof L2MerchantInstance)
                         {
-                                html.replace("%butt%","<button value=\"Shop\" action=\"bypass -h admin_showShop "+String.valueOf(((L2Npc)target).getTemplate().npcId)+"\" width=60 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
+                                html.replace("%butt%","<button value=\"Shop\" action=\"bypass -h admin_showShop "+String.valueOf(((L2Npc)target).getTemplate().getNpcId())+"\" width=60 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
                         }
                         else
@@ -247 +251 @@
                         );
                         
-                        if (((L2Npc)target).getTemplate().getDropData() != null)
+                        if (!((L2Npc) target).getTemplate().getDropData().isEmpty())
                         {
                                 StringUtil.append(html1,
                                                 "<br><center><font color=\"LEVEL\">[Drop Info]</font></center>" +
-                                                "<br>Rates legend: <font color=\"ff0000\">50%+</font> <font color=\"00ff00\">30%+</font> <font color=\"0000ff\">less than 30%</font>" +
+                                                "<br>Rates legend: <font color=\"ff9999\">50%+</font> <font color=\"00ff00\">30%+</font> <font color=\"0066ff\">less than 30%</font>" +
                                                 "<table border=0 width=\"100%\">"
                                 );
@@ -265 +269 @@
                                                 
                                                 if (drop.getChance() >= 500000)
-                                                        color = "ff0000";
+                                                        color = "ff9999";
                                                 else if (drop.getChance() >= 300000)
                                                         color = "00ff00";
                                                 else
-                                                        color = "0000ff";
+                                                        color = "0066ff";
                                                 
                                                 StringUtil.append(html1,
-                                                                "<tr><td><font color=\"",
-                                                                color,
-                                                                "\">",
-                                                                item.getName(),
-                                                                "</font></td><td>",
-                                                                (drop.isQuestDrop() ? "Quest" : (cat.isSweep() ? "Sweep" : "Drop")),
-                                                                "</td></tr>"
+                                                                "<tr>",
+                                                                "<td><img src=\"" + item.getIcon() + "\" height=32 width=32></td>" + 
+                                                                "<td><font color=\"", color, "\">", item.getName(), "</font></td>",
+                                                                "<td>", (drop.isQuestDrop() ? "Quest" : (cat.isSweep() ? "Sweep" : "Drop")),"</td>",
+                                                                "</tr>"
                                                 );
                                         }
@@ -292 +294 @@
         }
         
+        @Override
         public InstanceType getInstanceType()
         {