Forráskód Böngészése

BETA: Fixed `TriggerSkillByDamage` effect it should not work for damage taken over time.

Reported by: facheme
Reviewed by: St3et
Nos 11 éve
szülő
commit
320147f569
18 módosított fájl, 24 hozzáadás és 24 törlés
  1. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Backstab.java
  2. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java
  3. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
  4. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
  5. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java
  6. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java
  7. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java
  8. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
  9. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java
  10. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java
  11. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java
  12. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java
  13. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
  14. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
  15. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java
  16. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
  17. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java
  18. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Backstab.java

@@ -79,7 +79,7 @@ public final class Backstab extends AbstractEffect
 		}
 		
 		target.reduceCurrentHp(damage, activeChar, info.getSkill());
-		target.notifyDamageReceived(damage, activeChar, info.getSkill(), true);
+		target.notifyDamageReceived(damage, activeChar, info.getSkill(), true, false);
 		
 		// Manage attack or cast break of the target (calculating rate, sending message...)
 		if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java

@@ -72,7 +72,7 @@ public final class CpDamPercent extends AbstractEffect
 				if (info.getEffected() != info.getEffector())
 				{
 					info.getEffector().sendDamageMessage(info.getEffected(), damage, false, false, false);
-					info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false);
+					info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, false);
 				}
 			}
 			// Check if damage should be reflected

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java

@@ -74,7 +74,7 @@ public final class DamOverTime extends AbstractEffect
 		}
 		
 		info.getEffected().reduceCurrentHpByDOT(damage, info.getEffector(), info.getSkill());
-		info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false);
+		info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true);
 		return info.getSkill().isToggle();
 	}
 }

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java

@@ -75,7 +75,7 @@ public final class DamOverTimePercent extends AbstractEffect
 			}
 		}
 		info.getEffected().reduceCurrentHpByDOT(damage, info.getEffector(), info.getSkill());
-		info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false);
+		info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true);
 		
 		return info.getSkill().isToggle();
 	}

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java

@@ -88,12 +88,12 @@ public final class DeathLink extends AbstractEffect
 			if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
 			{
 				activeChar.reduceCurrentHp(damage, target, info.getSkill());
-				activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit);
+				activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false);
 			}
 			else
 			{
 				target.reduceCurrentHp(damage, activeChar, info.getSkill());
-				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit);
+				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
 				activeChar.sendDamageMessage(target, damage, mcrit, false, false);
 			}
 		}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -158,7 +158,7 @@ public final class EnergyAttack extends AbstractEffect
 		{
 			attacker.sendDamageMessage(target, (int) damage, false, critical, false);
 			target.reduceCurrentHp(damage, attacker, skill);
-			target.notifyDamageReceived(damage, attacker, skill, critical);
+			target.notifyDamageReceived(damage, attacker, skill, critical, false);
 			
 			// Check if damage should be reflected
 			Formulas.calcDamageReflected(attacker, target, skill, critical);

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java

@@ -81,7 +81,7 @@ public final class FatalBlow extends AbstractEffect
 		}
 		
 		target.reduceCurrentHp(damage, activeChar, info.getSkill());
-		target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit);
+		target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit, false);
 		
 		// Manage attack or cast break of the target (calculating rate, sending message...)
 		if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java

@@ -99,7 +99,7 @@ public final class HpDrain extends AbstractEffect
 			}
 			activeChar.sendDamageMessage(target, damage, mcrit, false, false);
 			target.reduceCurrentHp(damage, activeChar, info.getSkill());
-			target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit);
+			target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
 		}
 	}
 }

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java

@@ -83,7 +83,7 @@ public final class Lethal extends AbstractEffect
 			// for Players CP and HP is set to 1.
 			if (target.isPlayer())
 			{
-				target.notifyDamageReceived(target.getCurrentHp() - 1, info.getEffector(), info.getSkill(), true);
+				target.notifyDamageReceived(target.getCurrentHp() - 1, info.getEffector(), info.getSkill(), true, false);
 				target.setCurrentCp(1);
 				target.setCurrentHp(1);
 				target.sendPacket(SystemMessageId.LETHAL_STRIKE);
@@ -91,7 +91,7 @@ public final class Lethal extends AbstractEffect
 			// for Monsters HP is set to 1.
 			else if (target.isMonster() || target.isSummon())
 			{
-				target.notifyDamageReceived(target.getCurrentHp() - 1, info.getEffector(), info.getSkill(), true);
+				target.notifyDamageReceived(target.getCurrentHp() - 1, info.getEffector(), info.getSkill(), true, false);
 				target.setCurrentHp(1);
 			}
 			activeChar.sendPacket(SystemMessageId.LETHAL_STRIKE_SUCCESSFUL);
@@ -109,7 +109,7 @@ public final class Lethal extends AbstractEffect
 			// for Monsters HP is set to 50%.
 			else if (target.isMonster() || target.isSummon())
 			{
-				target.notifyDamageReceived(target.getCurrentHp() * 0.5, info.getEffector(), info.getSkill(), true);
+				target.notifyDamageReceived(target.getCurrentHp() * 0.5, info.getEffector(), info.getSkill(), true, false);
 				target.setCurrentHp(target.getCurrentHp() * 0.5);
 			}
 			activeChar.sendPacket(SystemMessageId.HALF_KILL);

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java

@@ -88,12 +88,12 @@ public final class MagicalAttack extends AbstractEffect
 			if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
 			{
 				activeChar.reduceCurrentHp(damage, target, info.getSkill());
-				activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit);
+				activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false);
 			}
 			else
 			{
 				target.reduceCurrentHp(damage, activeChar, info.getSkill());
-				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit);
+				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
 				activeChar.sendDamageMessage(target, damage, mcrit, false, false);
 			}
 		}

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java

@@ -100,12 +100,12 @@ public final class MagicalSoulAttack extends AbstractEffect
 			if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
 			{
 				activeChar.reduceCurrentHp(damage, target, info.getSkill());
-				activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit);
+				activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false);
 			}
 			else
 			{
 				target.reduceCurrentHp(damage, activeChar, info.getSkill());
-				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit);
+				target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
 				activeChar.sendDamageMessage(target, damage, mcrit, false, false);
 			}
 		}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java

@@ -104,7 +104,7 @@ public final class PhysicalAttack extends AbstractEffect
 		{
 			activeChar.sendDamageMessage(target, damage, false, crit, false);
 			target.reduceCurrentHp(damage, activeChar, info.getSkill());
-			target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit);
+			target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit, false);
 			
 			// Check if damage should be reflected
 			Formulas.calcDamageReflected(activeChar, target, info.getSkill(), crit);

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java

@@ -94,7 +94,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		{
 			activeChar.sendDamageMessage(target, damage, false, crit, false);
 			target.reduceCurrentHp(damage, activeChar, info.getSkill());
-			target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit);
+			target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit, false);
 			
 			// Check if damage should be reflected.
 			Formulas.calcDamageReflected(activeChar, target, info.getSkill(), crit);

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java

@@ -110,7 +110,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
 		{
 			activeChar.sendDamageMessage(target, damage, false, crit, false);
 			target.reduceCurrentHp(damage, activeChar, info.getSkill());
-			target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit);
+			target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit, false);
 			
 			// Check if damage should be reflected
 			Formulas.calcDamageReflected(activeChar, target, info.getSkill(), crit);

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java

@@ -90,7 +90,7 @@ public final class SoulBlow extends AbstractEffect
 		}
 		
 		target.reduceCurrentHp(damage, activeChar, info.getSkill());
-		target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit);
+		target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit, false);
 		
 		// Manage attack or cast break of the target (calculating rate, sending message...)
 		if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java

@@ -56,7 +56,7 @@ public final class StaticDamage extends AbstractEffect
 		}
 		
 		info.getEffected().reduceCurrentHp(getValue(), info.getEffector(), info.getSkill());
-		info.getEffected().notifyDamageReceived(getValue(), info.getEffector(), info.getSkill(), false);
+		info.getEffected().notifyDamageReceived(getValue(), info.getEffector(), info.getSkill(), false, false);
 		
 		if (info.getEffector().isPlayer())
 		{

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java

@@ -60,9 +60,9 @@ public class TriggerSkillByDamage extends AbstractEffect implements IDamageRecei
 	}
 	
 	@Override
-	public void onDamageReceivedEvent(L2Character attacker, L2Character target, double damage, L2Skill skill, boolean crit)
+	public void onDamageReceivedEvent(L2Character attacker, L2Character target, double damage, L2Skill skill, boolean crit, boolean damageOverTime)
 	{
-		if ((_chance == 0) || (_skill.getSkillLvl() == 0))
+		if (damageOverTime || (_chance == 0) || (_skill.getSkillLvl() == 0))
 		{
 			return;
 		}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BallistaBomb.java

@@ -54,7 +54,7 @@ public class BallistaBomb implements ISkillHandler
 			{
 				target.setIsInvul(false);
 				target.reduceCurrentHp(target.getMaxHp() + 1, activeChar, skill);
-				target.notifyDamageReceived(target.getMaxHp() + 1, activeChar, skill, false);
+				target.notifyDamageReceived(target.getMaxHp() + 1, activeChar, skill, false, false);
 			}
 		}
 	}