From fe9d119101618662c1616970ced02695b56dc4d8 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 10 Apr 2018 15:27:46 +0000 Subject: [PATCH] Minor fix for Compelling effect. Contributed by Ofelin. --- .../data/scripts/handlers/effecthandlers/Compelling.java | 7 +++++++ .../com/l2jmobius/gameserver/model/stats/Formulas.java | 1 + .../data/scripts/handlers/effecthandlers/Compelling.java | 7 +++++++ .../com/l2jmobius/gameserver/model/stats/Formulas.java | 1 + .../data/scripts/handlers/effecthandlers/Compelling.java | 7 +++++++ .../com/l2jmobius/gameserver/model/stats/Formulas.java | 1 + .../data/scripts/handlers/effecthandlers/Compelling.java | 7 +++++++ .../com/l2jmobius/gameserver/model/stats/Formulas.java | 1 + .../data/scripts/handlers/effecthandlers/Compelling.java | 7 +++++++ .../com/l2jmobius/gameserver/model/stats/Formulas.java | 1 + .../data/scripts/handlers/effecthandlers/Compelling.java | 7 +++++++ .../com/l2jmobius/gameserver/model/stats/Formulas.java | 1 + 12 files changed, 48 insertions(+) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 6fbc54f32e..7fe98241bc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; +import com.l2jmobius.gameserver.model.stats.Formulas; /** * @author Mobius @@ -32,6 +33,12 @@ public final class Compelling extends AbstractEffect { } + @Override + public boolean calcSuccess(L2Character effector, L2Character effected, Skill skill) + { + return Formulas.calcProbability(100, effector, effected, skill); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 83718a32cf..1318a1097b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1134,6 +1134,7 @@ public final class Formulas * DeleteHateOfMe,
* TransferHate,
* Confuse
+ * Compelling,
* Knockback
* Pull
* @param baseChance chance from effect parameter diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 979ac78d9c..ac00832dcf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; +import com.l2jmobius.gameserver.model.stats.Formulas; /** * @author Mobius @@ -32,6 +33,12 @@ public final class Compelling extends AbstractEffect { } + @Override + public boolean calcSuccess(L2Character effector, L2Character effected, Skill skill) + { + return Formulas.calcProbability(100, effector, effected, skill); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 83718a32cf..1318a1097b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1134,6 +1134,7 @@ public final class Formulas * DeleteHateOfMe,
* TransferHate,
* Confuse
+ * Compelling,
* Knockback
* Pull
* @param baseChance chance from effect parameter diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 6fbc54f32e..7fe98241bc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; +import com.l2jmobius.gameserver.model.stats.Formulas; /** * @author Mobius @@ -32,6 +33,12 @@ public final class Compelling extends AbstractEffect { } + @Override + public boolean calcSuccess(L2Character effector, L2Character effected, Skill skill) + { + return Formulas.calcProbability(100, effector, effected, skill); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 83718a32cf..1318a1097b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1134,6 +1134,7 @@ public final class Formulas * DeleteHateOfMe,
* TransferHate,
* Confuse
+ * Compelling,
* Knockback
* Pull
* @param baseChance chance from effect parameter diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 6fbc54f32e..7fe98241bc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; +import com.l2jmobius.gameserver.model.stats.Formulas; /** * @author Mobius @@ -32,6 +33,12 @@ public final class Compelling extends AbstractEffect { } + @Override + public boolean calcSuccess(L2Character effector, L2Character effected, Skill skill) + { + return Formulas.calcProbability(100, effector, effected, skill); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 7bdfe14377..1da8165215 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1134,6 +1134,7 @@ public final class Formulas * DeleteHateOfMe,
* TransferHate,
* Confuse
+ * Compelling,
* Knockback
* Pull
* @param baseChance chance from effect parameter diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 6fbc54f32e..7fe98241bc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; +import com.l2jmobius.gameserver.model.stats.Formulas; /** * @author Mobius @@ -32,6 +33,12 @@ public final class Compelling extends AbstractEffect { } + @Override + public boolean calcSuccess(L2Character effector, L2Character effected, Skill skill) + { + return Formulas.calcProbability(100, effector, effected, skill); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java index f0bf7a6a82..354f0e51a2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1134,6 +1134,7 @@ public final class Formulas * DeleteHateOfMe,
* TransferHate,
* Confuse
+ * Compelling,
* Knockback
* Pull
* @param baseChance chance from effect parameter diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 6fbc54f32e..7fe98241bc 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; +import com.l2jmobius.gameserver.model.stats.Formulas; /** * @author Mobius @@ -32,6 +33,12 @@ public final class Compelling extends AbstractEffect { } + @Override + public boolean calcSuccess(L2Character effector, L2Character effected, Skill skill) + { + return Formulas.calcProbability(100, effector, effected, skill); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java index f0bf7a6a82..354f0e51a2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1134,6 +1134,7 @@ public final class Formulas * DeleteHateOfMe,
* TransferHate,
* Confuse
+ * Compelling,
* Knockback
* Pull
* @param baseChance chance from effect parameter