Changeset 5164

Timestamp:

Feb 1, 2012 2:40:13 AM (4 months ago)

Author:

UnAfraid

Message:

BETA: Half-Kill is now possible against monsters in h5.

Location:

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver

Files:

• model/actor/L2Character.java (modified) (3 diffs)
• model/stats/Formulas.java (modified) (2 diffs)
• network/SystemMessageId.java (modified) (2 diffs)

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -37 +37 @@
 import com.l2jserver.gameserver.ai.L2AttackableAI;
 import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.datatables.AccessLevels;
 import com.l2jserver.gameserver.datatables.DoorTable;
 import com.l2jserver.gameserver.datatables.ItemTable;
@@ -52 +53 @@
 import com.l2jserver.gameserver.model.FusionSkill;
 import com.l2jserver.gameserver.model.IChanceSkillTrigger;
+import com.l2jserver.gameserver.model.L2AccessLevel;
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2Object;
@@ -340 +342 @@
         {
                 return false;
+        }
+        
+        // Overrided in L2PcInstance
+        public L2AccessLevel getAccessLevel()
+        {
+                return null;
         }
         

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Formulas.java

@@ -2215 +2215 @@
         public static final boolean calcLethalHit(L2Character activeChar, L2Character target, L2Skill skill)
         {
-                if (!target.isRaid() && !(target instanceof L2DoorInstance) && !((target instanceof L2Npc) && (((L2Npc) target).getNpcId() == 35062)))
-                {
-                        // activeChar.sendMessage(Double.toString(chance));
-                        // activeChar.sendMessage(Double.toString(calcLethal(activeChar, target, skill.getLethalChance2(),skill.getMagicLevel())));
-                        // activeChar.sendMessage(Double.toString(calcLethal(activeChar, target, skill.getLethalChance1(),skill.getMagicLevel())));
-                        
+                if (!target.isRaid() && !target.isInvul() && !(target.isDoor()) && !((target.isNpc()) && (((L2Npc) target).getNpcId() == 35062)))
+                {
                         // 2nd lethal effect activate (cp,hp to 1 or if target is npc then hp to 1)
                         if ((skill.getLethalChance2() > 0) && (Rnd.get(1000) < calcLethal(activeChar, target, skill.getLethalChance2(), skill.getMagicLevel())))
                         {
-                                if (target instanceof L2Npc)
+                                if (target.isNpc())
                                 {
                                         target.reduceCurrentHp(target.getCurrentHp() - 1, activeChar, skill);
                                 }
-                                else if (target instanceof L2PcInstance) // If is a active player set his HP and CP to 1
+                                else if (target.isPlayer()) // If is a active player set his HP and CP to 1
                                 {
                                         L2PcInstance player = (L2PcInstance) target;
                                         if (!player.isInvul())
                                         {
-                                                if (!((activeChar instanceof L2PcInstance) && (((L2PcInstance) activeChar).isGM() && !((L2PcInstance) activeChar).getAccessLevel().canGiveDamage())))
+                                                if (!(activeChar.isPlayer() && (activeChar.isGM() && !activeChar.getAccessLevel().canGiveDamage())))
                                                 {
                                                         player.setCurrentHp(1);
@@ -2245 +2241 @@
                         else if ((skill.getLethalChance1() > 0) && (Rnd.get(1000) < calcLethal(activeChar, target, skill.getLethalChance1(), skill.getMagicLevel())))
                         {
-                                if (target instanceof L2PcInstance)
-                                {
-                                        L2PcInstance player = (L2PcInstance) target;
-                                        if (!player.isInvul())
+                                if (target.isMonster())
+                                {
+                                        target.reduceCurrentHp(target.getCurrentHp() / 2, activeChar, skill);
+                                        activeChar.sendPacket(SystemMessageId.HALF_KILL);
+                                }
+                                else if (target.isPlayer())
+                                {
+                                        L2PcInstance player = target.getActingPlayer();
+                                        if (!((activeChar.isPlayer()) && (activeChar.isGM() && !activeChar.getAccessLevel().canGiveDamage())))
                                         {
-                                                if (!((activeChar instanceof L2PcInstance) && (((L2PcInstance) activeChar).isGM() && !((L2PcInstance) activeChar).getAccessLevel().canGiveDamage())))
-                                                {
-                                                        player.setCurrentCp(1); // Set CP to 1
-                                                        player.sendPacket(SystemMessageId.CP_DISAPPEARS_WHEN_HIT_WITH_A_HALF_KILL_SKILL);
-                                                        activeChar.sendPacket(SystemMessageId.CP_SIPHON);
-                                                }
+                                                player.setCurrentCp(1); // Set CP to 1
+                                                player.sendPacket(SystemMessageId.CP_DISAPPEARS_WHEN_HIT_WITH_A_HALF_KILL_SKILL);
+                                                activeChar.sendPacket(SystemMessageId.HALF_KILL);
                                         }
                                 }
-                                // TODO: remove half kill since SYSMsg got changed.
-                                /*
-                                 * else if (target instanceof L2Npc) // If is a monster remove first damage and after 50% of current hp target.reduceCurrentHp(target.getCurrentHp() / 2, activeChar, skill);
-                                 */
-                                
                         }
                         else

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/network/SystemMessageId.java

@@ -13543 +13543 @@
         /**
          * ID: 2336<br>
-         * Message: CP Siphon!
-         */
-        public static final SystemMessageId CP_SIPHON;
+         * Message: Half-Kill!
+         */
+        public static final SystemMessageId HALF_KILL;
         
         /**
@@ -17144 +17144 @@
                 YOU_CANNOT_RECEIVE_THE_VITAMIN_ITEM = new SystemMessageId(2333);
                 THERE_ARE_NO_MORE_VITAMIN_ITEMS_TO_BE_FOUND = new SystemMessageId(2335);
-                CP_SIPHON = new SystemMessageId(2336);
+                HALF_KILL = new SystemMessageId(2336);
                 CP_DISAPPEARS_WHEN_HIT_WITH_A_HALF_KILL_SKILL = new SystemMessageId(2337);
                 YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_BATTLE = new SystemMessageId(2348);