Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/ai/group_template/SummonMinions.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/ai/group_template/SummonMinions.java (modified) (10 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/ai/group_template/SummonMinions.java

@@ -15 +15 @@
 package ai.group_template;
 
-import gnu.trove.TIntHashSet;
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.set.hash.TIntHashSet;
 import javolution.util.FastList;
 import javolution.util.FastMap;
@@ -31 +31 @@
 {
         private static int HasSpawned;
-        private static TIntHashSet myTrackingSet = new TIntHashSet(); //Used to track instances of npcs
-        private FastMap<Integer, FastList<L2PcInstance>> _attackersList = new FastMap<Integer, FastList<L2PcInstance>>().shared();
+        private static TIntHashSet myTrackingSet = new TIntHashSet(); // Used to track instances of npcs
+        private final FastMap<Integer, FastList<L2PcInstance>> _attackersList = new FastMap<Integer, FastList<L2PcInstance>>().shared();
         private static final TIntObjectHashMap<int[]> MINIONS = new TIntObjectHashMap<int[]>();
         
         static
         {
+                //@formatter:off
                 MINIONS.put(20767,new int[]{20768,20769,20770}); //Timak Orc Troop
                 //MINIONS.put(22030,new Integer[]{22045,22047,22048}); //Ragna Orc Shaman
@@ -55 +56 @@
                 MINIONS.put(22266,new int[]{18366,18366}); //Pythia
                 MINIONS.put(22774,new int[]{22768,22768}); // Tanta Lizardman Summoner
+                //@formatter:on
         }
         
@@ -60 +62 @@
         {
                 super(questId, name, descr);
-                int[] temp =
-                {
-                                20767,  21524, 21531, 21539, 22257, 22258, 22259, 22260, 22261, 22262, 22263, 22264, 22265, 22266, 22774
-                };
-                this.registerMobs(temp, QuestEventType.ON_ATTACK, QuestEventType.ON_KILL);
+                registerMobs(MINIONS.keys(), QuestEventType.ON_ATTACK, QuestEventType.ON_KILL);
         }
         
@@ -74 +72 @@
                 if (MINIONS.containsKey(npcId))
                 {
-                        if (!myTrackingSet.contains(npcObjId)) //this allows to handle multiple instances of npc
+                        if (!myTrackingSet.contains(npcObjId)) // this allows to handle multiple instances of npc
                         {
                                 synchronized (myTrackingSet)
@@ -87 +85 @@
                                 switch (npcId)
                                 {
-                                        case 22030: //mobs that summon minions only on certain hp
+                                        case 22030: // mobs that summon minions only on certain hp
                                         case 22032:
                                         case 22038:
@@ -94 +92 @@
                                                 {
                                                         HasSpawned = 0;
-                                                        if (Rnd.get(100) < 33) //mobs that summon minions only on certain chance
+                                                        if (Rnd.get(100) < 33) // mobs that summon minions only on certain chance
                                                         {
                                                                 int[] minions = MINIONS.get(npcId);
@@ -130 +128 @@
                                                                         FastList<L2PcInstance> player = new FastList<L2PcInstance>();
                                                                         player.add(member);
-                                                                        _attackersList.put(npcObjId,player);
+                                                                        _attackersList.put(npcObjId, player);
                                                                 }
                                                                 else if (!_attackersList.get(npcObjId).contains(member))
@@ -142 +140 @@
                                                                 FastList<L2PcInstance> player = new FastList<L2PcInstance>();
                                                                 player.add(attacker);
-                                                                _attackersList.put(npcObjId,player);
+                                                                _attackersList.put(npcObjId, player);
                                                         }
                                                         else if (!_attackersList.get(npcObjId).contains(attacker))
                                                                 _attackersList.get(npcObjId).add(attacker);
                                                 }
-                                                if ((attacker.getParty() != null && attacker.getParty().getMemberCount() > 2)||_attackersList.get(npcObjId).size() > 2) //Just to make sure..
+                                                if ((attacker.getParty() != null && attacker.getParty().getMemberCount() > 2) || _attackersList.get(npcObjId).size() > 2) // Just to make sure..
                                                 {
                                                         HasSpawned = 0;
@@ -160 +158 @@
                                                 break;
                                         }
-                                        default: //mobs without special conditions
+                                        default: // mobs without special conditions
                                         {
                                                 HasSpawned = 0;