lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed TriggerSkillByDamage effect handler.

Browse Source 
Contributed by nasseka.
This commit is contained in:
MobiusDevelopment
2022-08-17 06:32:12 +00:00
parent 32d64f1037
commit 79a629c9ca
37 changed files with 199 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -371,11 +371,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -400,7 +400,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -371,11 +371,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -400,7 +400,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -371,11 +371,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -400,7 +400,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -371,11 +371,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -400,7 +400,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -371,11 +371,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -400,7 +400,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -371,11 +371,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -400,7 +400,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -371,11 +371,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -400,7 +400,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -371,11 +371,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -400,7 +400,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -468,11 +468,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -497,7 +497,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -468,11 +468,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -497,7 +497,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -468,11 +468,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -497,7 +497,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

4
L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/01900-01999.xml vendored
View File

@@ -468,11 +468,11 @@
<excludedFromCheck>true</excludedFromCheck> <excludedFromCheck>true</excludedFromCheck>
<effects> <effects>
<effect name="TriggerSkillByDamage"> <effect name="TriggerSkillByDamage">
<!-- Undying Will -->
<attackerType>Creature</attackerType> <attackerType>Creature</attackerType>
<chance>100</chance> <chance>100</chance>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<minDamage>1</minDamage> <minDamage>1</minDamage>
<hpPercent>30</hpPercent>
<skillId>1918</skillId> <!-- Undying Will --> <skillId>1918</skillId> <!-- Undying Will -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
</effect> </effect>
@@ -497,7 +497,7 @@
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="RemainHpPer"> <condition name="RemainHpPer">
<amount>20</amount> <amount>30</amount>
<percentType>LESS</percentType> <percentType>LESS</percentType>
<affectType>CASTER</affectType> <affectType>CASTER</affectType>
</condition> </condition>

22
L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override

22
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent))
{ {
return; return;
} }
@@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
Skill triggerSkill = _skill.getSkill();
WorldObject target = null; WorldObject target = null;
try try
{ {
target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect
return; return;
} }
final Skill triggerSkill; if (_skillLevelScaleTo > 0)
if (_skillLevelScaleTo <= 0)
{ {
triggerSkill = _skill.getSkill(); final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
}
else
{
final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
if (buffInfo != null) if (buffInfo != null)
{ {
triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
}
else
{
triggerSkill = _skill.getSkill();
} }
} }
SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill);
} }
@Override @Override