Changeset 2259

Timestamp:

07/10/08 16:46:35 (3 months ago)

Author:

DrHouse

Message:

Fixes for EffectFear?:

• Skill and effected checks are done on onStart() now, only once and not for every "onActionTime"
  
• Direction will not change depending on relative effector position once effect is in use
  
• Minor clean up
  
• Also fixes #2698
  

Files:

• trunk/L2_GameServer/java/net/sf/l2j/gameserver/skills/effects/EffectFear.java (modified) (3 diffs)

trunk/L2_GameServer/java/net/sf/l2j/gameserver/skills/effects/EffectFear.java

@@ -34 +34 @@
-{
-        public static final int FEAR_RANGE = 500;
+        
+        private int _dX = -1;
+        private int _dY = -1;
-
-        public EffectFear(Env env, EffectTemplate template)
@@ -50 +53 @@
-        public void onStart()
-        {
+                // Fear skills cannot be used l2pcinstance to l2pcinstance. Heroic Dread, Curse: Fear, Fear, Horror, Sword Symphony, Word of Fear and Mass Curse Fear are the exceptions.
+                if(getEffected() instanceof L2PcInstance && getEffector() instanceof L2PcInstance                               
+                                && getSkill().getId() != 1376 
+                                && getSkill().getId() != 1169 
+                                && getSkill().getId() != 65 
+                                && getSkill().getId() != 1092 
+                                && getSkill().getId() != 98 
+                                && getSkill().getId() != 1272 
+                                && getSkill().getId() != 1381) 
+                        return;
+                
+                if(getEffected() instanceof L2FolkInstance
+                                || getEffected() instanceof L2SiegeGuardInstance
+                                || getEffected() instanceof L2SiegeFlagInstance
+                                || getEffected() instanceof L2SiegeSummonInstance) 
+                        return;
+                
-                if (!getEffected().isAfraid())
-                {
+                        if (getEffected().getX() > getEffector().getX())
+                                _dX = 1;
+                        if (getEffected().getY() > getEffector().getY())
+                                _dY = 1;
+                        
-                        getEffected().startFear();
-                        onActionTime();
@@ -67 +92 @@
-        public boolean onActionTime()
-        {
-                // Fear skills cannot be used l2pcinstance to l2pcinstance. Heroic Dread, Curse: Fear, Fear, Horror, Sword Symphony, Word of Fear and Mass Curse Fear are the exceptions.
-                if(getEffected() instanceof L2PcInstance && getEffector() instanceof L2PcInstance && getSkill().getId() != 1376 && getSkill().getId() != 1169 && getSkill().getId() != 65 && getSkill().getId() != 1092 && getSkill().getId() != 98 && getSkill().getId() != 1272 && getSkill().getId() != 1381) return false;
-                if(getEffected() instanceof L2FolkInstance) return false;
-                if(getEffected() instanceof L2SiegeGuardInstance) return false;
-                // Fear skills cannot be used on Headquarters Flag.
-                if(getEffected() instanceof L2SiegeFlagInstance) return false;
-
-                if(getEffected() instanceof L2SiegeSummonInstance) 
-                        return false;
-
-                int posX = getEffected().getX();
-                int posY = getEffected().getY();
-                int posZ = getEffected().getZ();
-                
-
-
-
-
-
-
-
-
+
+
+
-                getEffected().setRunning();
-                getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO,new L2CharPosition(posX,posY,posZ,0));