Changeset 5121

Timestamp:

Jan 5, 2012 8:41:29 PM (4 months ago)

Author:

Zoey76

Message:

BETA: L2SkillSpawn rework:

• Added support for summoner reference, based on VlLight? work.
• Now L2SkillSpawn won't have null spawns...
• Partially reverted [4890] changes on L2SkillSpawn...
• Minor rework on L2TotemInstance.
• Unhardcoded all NPC instances.

Location:

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

Files:

• model/actor/L2Npc.java (modified) (2 diffs)
• model/actor/instance/L2TotemInstance.java (modified) (6 diffs)
• skills/l2skills/L2SkillSpawn.java (modified) (3 diffs)

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

@@ -137 +137 @@
         public boolean _spsrecharged = true;
         private int _displayEffect = 0;
+        
+        /**
+         * The character that summons this NPC.
+         */
+        private L2Character _summoner = null;
         
         private final L2NpcAIData _staticAIData = getTemplate().getAIDataStatic();
@@ -1682 +1687 @@
                 return 0;
         }
+        
+        /**
+         * @return the character that summoned this NPC.
+         */
+        public L2Character getSummoner()
+        {
+                return _summoner;
+        }
+        
+        /**
+         * @param summoner the summoner of this NPC.
+         */
+        public void setSummoner(L2Character summoner)
+        {
+                _summoner = summoner;
+        }
 }

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TotemInstance.java

@@ -15 +15 @@
 package com.l2jserver.gameserver.model.actor.instance;
 
-import java.util.Collection;
 import java.util.concurrent.ScheduledFuture;
 
@@ -29 +28 @@
 /**
  * @author UnAfraid
- *
  */
 public class L2TotemInstance extends L2Npc
 {
         private ScheduledFuture<?> _aiTask;
-        private final L2Skill _skill;
+        
+        private L2Skill _skill;
         
         private class TotemAI implements Runnable
@@ -50 +49 @@
                         if (_skill == null)
                         {
-                                _caster._aiTask.cancel(false);
-                                _caster._aiTask = null;
+                                if (_caster._aiTask != null)
+                                {
+                                        _caster._aiTask.cancel(false);
+                                        _caster._aiTask = null;
+                                }
                                 return;
                         }
                         
-                        Collection<L2PcInstance> plrs = getKnownList().getKnownPlayersInRadius(_skill.getSkillRadius());
-                        for (L2PcInstance player : plrs)
+                        for (L2PcInstance player : getKnownList().getKnownPlayersInRadius(_skill.getSkillRadius()))
                         {
                                 if (player.getFirstEffect(_skill.getId()) == null)
@@ -64 +65 @@
                         }
                 }
+        }
+        
+        public L2TotemInstance(int objectId, L2NpcTemplate template)
+        {
+                super(objectId, template);
+                setInstanceType(InstanceType.L2TotemInstance);
         }
         
@@ -78 +85 @@
         {
                 if (_aiTask != null)
+                {
                         _aiTask.cancel(true);
+                }
                 super.deleteMe();
         }
@@ -99 +108 @@
                 player.sendPacket(ActionFailed.STATIC_PACKET);
         }
+        
+        public void setAITask()
+        {
+                if (_aiTask == null)
+                {
+                        _aiTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new TotemAI(this), 3000, 3000);
+                }
+        }
+        
+        /**
+         * @param skillId the _skill to set
+         */
+        public void setSkill(int skillId)
+        {
+                _skill = SkillTable.getInstance().getInfo(skillId, 1);
+        }
 }

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSpawn.java

@@ -15 +15 @@
 package com.l2jserver.gameserver.skills.l2skills;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import com.l2jserver.gameserver.datatables.NpcTable;
-import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
+import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.instance.L2BirthdayCakeInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2TotemInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2XmassTreeInstance;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.util.Rnd;
 
+/**
+ * @author Zoey76
+ */
 public class L2SkillSpawn extends L2Skill
 {
+        private static final Logger _log = Logger.getLogger(L2SkillSpawn.class.getName());
+        
         private final int _npcId;
         private final int _despawnDelay;
@@ -50 +55 @@
         public void useSkill(L2Character caster, L2Object[] targets)
         {
-                int x, y;
-                
                 if (caster.isAlikeDead())
+                {
                         return;
+                }
                 
                 if (_npcId == 0)
@@ -68 +73 @@
                 }
                 
-                final int id = IdFactory.getInstance().getNextId();
-                final L2Npc npc;
-                if (template.isType("L2XmassTree"))
+                L2Spawn spawn;
+                try
                 {
-                        npc = new L2XmassTreeInstance(id, template);
+                        spawn = new L2Spawn(template);
                 }
-                else if (template.isType("L2BirthdayCake"))
+                catch (Exception e)
                 {
-                        npc = new L2BirthdayCakeInstance(id, template, caster.getObjectId());
-                }
-                else if (template.isType("L2Totem"))
-                {
-                        npc = new L2TotemInstance(id, template, _skillToCast);
-                }
-                else if (template.isType("L2WeddingCake"))
-                {
-                         // TODO: npc = new L2WeddingCakeInstance(id, template);
-                        npc = new L2NpcInstance(id, template);
-                }
-                else
-                {
-                        npc = new L2NpcInstance(id, template);
+                        _log.log(Level.WARNING, "Exception in L2SkillSpawn: " + e.getMessage(), e);
+                        return;
                 }
                 
+                int x = caster.getX();
+                int y = caster.getY();
+                if (_randomOffset)
+                {
+                        x += (Rnd.nextBoolean() ? Rnd.get(20, 50) : Rnd.get(-50, -20));
+                        y += (Rnd.nextBoolean() ? Rnd.get(20, 50) : Rnd.get(-50, -20));
+                }
+                
+                spawn.setLocx(x);
+                spawn.setLocy(y);
+                spawn.setLocz(caster.getZ() + 20);
+                spawn.setHeading(caster.getHeading());
+                spawn.stopRespawn();
+                
+                final L2Npc npc = spawn.doSpawn(_summonSpawn);
                 npc.setName(template.getName());
                 npc.setTitle(caster.getName());
-                npc.setHeading(-1);
-                npc.setShowSummonAnimation(_summonSpawn);
+                npc.setSummoner(caster);
+                if (_despawnDelay > 0)
+                {
+                        npc.scheduleDespawn(_despawnDelay);
+                }
+                npc.setIsRunning(false); // Broadcast info
                 
-                if (_randomOffset)
+                if ((npc instanceof L2TotemInstance) && (_skillToCast > 0))
                 {
-                        x = caster.getX() + (Rnd.nextBoolean() ? Rnd.get(20, 50) : Rnd.get(-50, -20));
-                        y = caster.getY() + (Rnd.nextBoolean() ? Rnd.get(20, 50) : Rnd.get(-50, -20));
+                        ((L2TotemInstance) npc).setSkill(_skillToCast);
+                        ((L2TotemInstance) npc).setAITask();
                 }
-                else
-                {
-                        x = caster.getX();
-                        y = caster.getY();
-                }
-                
-                npc.spawnMe(x, y, caster.getZ() + 20);
-                if (_despawnDelay > 0)
-                        npc.scheduleDespawn(_despawnDelay);
         }
 }