diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java index 711bc3edb6..5320821a76 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -116,7 +116,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -252,6 +252,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -317,7 +318,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java similarity index 77% rename from L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java rename to L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java index d3e8393e87..a2078cc39c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -23,10 +23,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; * Equivalent of DefenceMagicCriticalDamage for physical skills. * @author Mobius */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect { - public DefenceSkillCriticalDamage(StatSet params) + public DefencePhysicalSkillCriticalDamage(StatSet params) { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java similarity index 77% rename from L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java rename to L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java index d1bdbe6c30..1b32e9419a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCriticalDamage extends AbstractStatEffect +public class PhysicalSkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatSet params) + public PhysicalSkillCriticalDamage(StatSet params) { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml index 597013cf28..233bf271b0 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml @@ -3503,7 +3503,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/08900-08999.xml index 32a4ebb02f..7c06324ae4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/08900-08999.xml @@ -29,7 +29,7 @@ 30 PER - + 30 PER @@ -79,7 +79,7 @@ 50 PER - + 50 PER diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/13100-13199.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/13100-13199.xml index e635b4f14a..4c47cf93f4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/13100-13199.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/13100-13199.xml @@ -725,7 +725,7 @@ 30 PER - + 15 PER @@ -766,7 +766,7 @@ 30 PER - + 15 PER @@ -807,7 +807,7 @@ 30 PER - + 15 PER @@ -848,7 +848,7 @@ 30 PER - + 15 PER @@ -889,7 +889,7 @@ 30 PER - + 15 PER @@ -930,7 +930,7 @@ 30 PER - + 15 PER @@ -971,7 +971,7 @@ 30 PER - + 15 PER @@ -1012,7 +1012,7 @@ 30 PER - + 15 PER @@ -1164,7 +1164,7 @@ 30 PER - + 15 PER @@ -1205,7 +1205,7 @@ 30 PER - + 15 PER @@ -1246,7 +1246,7 @@ 30 PER - + 15 PER diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/13500-13599.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/13500-13599.xml index a2b589fd51..e28e6b9349 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/13500-13599.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/13500-13599.xml @@ -2913,7 +2913,7 @@ icon.skill4416_dwarf P - + 1 PER diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/17900-17999.xml index d2afdbda06..8dae902bc2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/17900-17999.xml @@ -1215,7 +1215,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml index b14fd3e501..9a9b8f3392 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml @@ -595,7 +595,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml index 4d084d34c9..a94c624209 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/19200-19299.xml @@ -147,7 +147,7 @@ - + 25 PER @@ -714,7 +714,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml index 0632b2c35c..3f8ed35a30 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml @@ -1274,7 +1274,7 @@ - + 10 10 @@ -1574,7 +1574,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt index 84a62b591c..1b0216db76 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt @@ -86,7 +86,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -222,6 +222,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -286,7 +287,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java index cfab51ee8d..181c883a0e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java index 90488cb5b8..0590ca4793 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -122,8 +122,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -140,8 +140,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java index 711bc3edb6..5320821a76 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -116,7 +116,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -252,6 +252,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -317,7 +318,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java similarity index 77% rename from L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java rename to L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java index d3e8393e87..a2078cc39c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -23,10 +23,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; * Equivalent of DefenceMagicCriticalDamage for physical skills. * @author Mobius */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect { - public DefenceSkillCriticalDamage(StatSet params) + public DefencePhysicalSkillCriticalDamage(StatSet params) { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java similarity index 77% rename from L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java rename to L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java index d1bdbe6c30..1b32e9419a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCriticalDamage extends AbstractStatEffect +public class PhysicalSkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatSet params) + public PhysicalSkillCriticalDamage(StatSet params) { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/00300-00399.xml index 6044ee46b7..c2f7b53dd3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/00300-00399.xml @@ -3503,7 +3503,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/08900-08999.xml index 1089bd75c1..2257eeb57f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/08900-08999.xml @@ -29,7 +29,7 @@ 30 PER - + 30 PER @@ -79,7 +79,7 @@ 50 PER - + 50 PER diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13100-13199.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13100-13199.xml index a3a5236fdd..0b8125ed58 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13100-13199.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13100-13199.xml @@ -725,7 +725,7 @@ 30 PER - + 15 PER @@ -766,7 +766,7 @@ 30 PER - + 15 PER @@ -807,7 +807,7 @@ 30 PER - + 15 PER @@ -848,7 +848,7 @@ 30 PER - + 15 PER @@ -889,7 +889,7 @@ 30 PER - + 15 PER @@ -930,7 +930,7 @@ 30 PER - + 15 PER @@ -971,7 +971,7 @@ 30 PER - + 15 PER @@ -1012,7 +1012,7 @@ 30 PER - + 15 PER @@ -1164,7 +1164,7 @@ 30 PER - + 15 PER @@ -1205,7 +1205,7 @@ 30 PER - + 15 PER @@ -1246,7 +1246,7 @@ 30 PER - + 15 PER diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13500-13599.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13500-13599.xml index a94128eec4..855babe681 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13500-13599.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13500-13599.xml @@ -2913,7 +2913,7 @@ icon.skill4416_dwarf P - + 1 PER diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13800-13899.xml index faca4c9026..748d4a5938 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13800-13899.xml @@ -627,7 +627,7 @@ icon.etc_talisman_i02 P - + 7 PER @@ -1570,7 +1570,7 @@ icon.ensoul_big_p P - + {5+index} @@ -1886,7 +1886,7 @@ PER - + 3 4 @@ -2045,7 +2045,7 @@ DIFF - + 3 4 @@ -2720,7 +2720,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13900-13999.xml index f5853caa5e..015796f6c9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/17900-17999.xml index bb4686d299..322a4a03c1 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/17900-17999.xml @@ -1221,7 +1221,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/19100-19199.xml index abbeaa4159..a015152c0b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/19100-19199.xml @@ -595,7 +595,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/19200-19299.xml index 280d7efe13..a9bbb1f508 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/19200-19299.xml @@ -149,7 +149,7 @@ - + 25 PER @@ -719,7 +719,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/27600-27699.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/27600-27699.xml index 280c75d8e5..b0f48040ce 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/27600-27699.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/27600-27699.xml @@ -2654,7 +2654,7 @@ 5 PER - + 10 PER @@ -2728,7 +2728,7 @@ 6 PER - + 11 PER @@ -2802,7 +2802,7 @@ 6 PER - + 11 PER @@ -2876,7 +2876,7 @@ 7 PER - + 12 PER @@ -2950,7 +2950,7 @@ 7 PER - + 12 PER @@ -3146,7 +3146,7 @@ 8 PER - + 5 PER @@ -3220,7 +3220,7 @@ 9 PER - + 6 PER @@ -3294,7 +3294,7 @@ 9 PER - + 6 PER @@ -3368,7 +3368,7 @@ 10 PER - + 7 PER @@ -3442,7 +3442,7 @@ 10 PER - + 7 PER diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30500-30599.xml index 7dbb13c536..a2ffe69bf4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30500-30599.xml @@ -1413,7 +1413,7 @@ - + 10 10 @@ -1727,7 +1727,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt index 84a62b591c..1b0216db76 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt @@ -86,7 +86,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -222,6 +222,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -286,7 +287,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java index cfab51ee8d..181c883a0e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java index 90488cb5b8..0590ca4793 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -122,8 +122,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -140,8 +140,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java index 711bc3edb6..5320821a76 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -116,7 +116,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -252,6 +252,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -317,7 +318,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java similarity index 77% rename from L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java rename to L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java index d3e8393e87..a2078cc39c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -23,10 +23,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; * Equivalent of DefenceMagicCriticalDamage for physical skills. * @author Mobius */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect { - public DefenceSkillCriticalDamage(StatSet params) + public DefencePhysicalSkillCriticalDamage(StatSet params) { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java similarity index 77% rename from L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java rename to L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java index d1bdbe6c30..1b32e9419a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCriticalDamage extends AbstractStatEffect +public class PhysicalSkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatSet params) + public PhysicalSkillCriticalDamage(StatSet params) { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/00300-00399.xml index 6044ee46b7..c2f7b53dd3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/00300-00399.xml @@ -3503,7 +3503,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/08900-08999.xml index 7054ef1b99..3886e67a19 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/08900-08999.xml @@ -29,7 +29,7 @@ 30 PER - + 30 PER @@ -79,7 +79,7 @@ 50 PER - + 50 PER diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/10900-10999.xml index a8373622e9..bc991c04bb 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/10900-10999.xml @@ -415,7 +415,7 @@ 15 PER - + 15 PER @@ -456,7 +456,7 @@ 15 PER - + 25 PER diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13100-13199.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13100-13199.xml index 1bcffd03fc..b73d4e3911 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13100-13199.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13100-13199.xml @@ -685,7 +685,7 @@ 30 PER - + 15 PER @@ -726,7 +726,7 @@ 30 PER - + 15 PER @@ -767,7 +767,7 @@ 30 PER - + 15 PER @@ -808,7 +808,7 @@ 30 PER - + 15 PER @@ -849,7 +849,7 @@ 30 PER - + 15 PER @@ -890,7 +890,7 @@ 30 PER - + 15 PER @@ -931,7 +931,7 @@ 30 PER - + 15 PER @@ -972,7 +972,7 @@ 30 PER - + 15 PER @@ -1124,7 +1124,7 @@ 30 PER - + 15 PER @@ -1165,7 +1165,7 @@ 30 PER - + 15 PER @@ -1206,7 +1206,7 @@ 30 PER - + 15 PER diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13500-13599.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13500-13599.xml index 2741c86026..c5107ed752 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13500-13599.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13500-13599.xml @@ -2913,7 +2913,7 @@ icon.skill4416_dwarf P - + 1 PER diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13800-13899.xml index bf78be9eb3..c6d62609c4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13800-13899.xml @@ -627,7 +627,7 @@ icon.etc_talisman_i02 P - + 7 PER @@ -1570,7 +1570,7 @@ icon.ensoul_big_p P - + {5+index} @@ -1886,7 +1886,7 @@ PER - + 3 4 @@ -2045,7 +2045,7 @@ DIFF - + 3 4 @@ -2720,7 +2720,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13900-13999.xml index e6ccff30bd..fd74bb2c46 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER @@ -849,7 +849,7 @@ 16 PER - + 11 PER @@ -1308,7 +1308,7 @@ 5 PER - + 25 PER diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/17900-17999.xml index 71a275be26..dbe2bc7438 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/17900-17999.xml @@ -1233,7 +1233,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/18700-18799.xml index 1f2eb1a421..5b25e0c10c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/18700-18799.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/18700-18799.xml @@ -413,7 +413,7 @@ PER - + 1 2 diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/19100-19199.xml index 20f9a632b4..f7bd98044a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/19100-19199.xml @@ -595,7 +595,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/19200-19299.xml index 95c57c1d35..8c332befad 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/19200-19299.xml @@ -149,7 +149,7 @@ - + 25 PER @@ -719,7 +719,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/27600-27699.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/27600-27699.xml index 5ddfaffc33..80b457bcb3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/27600-27699.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/27600-27699.xml @@ -3232,7 +3232,7 @@ 5 PER - + 10 PER @@ -3304,7 +3304,7 @@ 6 PER - + 11 PER @@ -3376,7 +3376,7 @@ 6 PER - + 11 PER @@ -3448,7 +3448,7 @@ 7 PER - + 12 PER @@ -3520,7 +3520,7 @@ 7 PER - + 12 PER @@ -3834,7 +3834,7 @@ 8 PER - + 5 PER @@ -3906,7 +3906,7 @@ 9 PER - + 6 PER @@ -3978,7 +3978,7 @@ 9 PER - + 6 PER @@ -4050,7 +4050,7 @@ 10 PER - + 7 PER @@ -4122,7 +4122,7 @@ 10 PER - + 7 PER diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/27700-27799.xml index e02dc6ec51..ddf8a99212 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/27700-27799.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/27700-27799.xml @@ -110,7 +110,7 @@ INT - + 18 20 diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30500-30599.xml index 7f1d9c0a21..df636e747c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30500-30599.xml @@ -1429,7 +1429,7 @@ - + 10 10 @@ -1743,7 +1743,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt index 84a62b591c..1b0216db76 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt @@ -86,7 +86,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -222,6 +222,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -286,7 +287,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java index cfab51ee8d..181c883a0e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java index 90488cb5b8..0590ca4793 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -122,8 +122,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -140,8 +140,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java index e66cf73dcd..be0c12577d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -120,7 +120,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -256,6 +256,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -322,7 +323,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java similarity index 77% rename from L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java rename to L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java index d3e8393e87..a2078cc39c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -23,10 +23,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; * Equivalent of DefenceMagicCriticalDamage for physical skills. * @author Mobius */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect { - public DefenceSkillCriticalDamage(StatSet params) + public DefencePhysicalSkillCriticalDamage(StatSet params) { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java similarity index 77% rename from L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java rename to L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java index d1bdbe6c30..1b32e9419a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCriticalDamage extends AbstractStatEffect +public class PhysicalSkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatSet params) + public PhysicalSkillCriticalDamage(StatSet params) { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/30400-30499.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/30400-30499.xml index dbc1d619ef..95b0a7acea 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/30400-30499.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/30400-30499.xml @@ -740,7 +740,7 @@ PER - + 3 4 @@ -2318,7 +2318,7 @@ DIFF - + 3 4 @@ -2993,7 +2993,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/13900-13999.xml index 7040ee7758..7d7e0a8d7c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER @@ -849,7 +849,7 @@ 16 PER - + 11 PER @@ -1308,7 +1308,7 @@ 5 PER - + 25 PER diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/17900-17999.xml index 27262c5a32..ca83ea3fc8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/17900-17999.xml @@ -1233,7 +1233,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/18700-18799.xml index b430b50833..1c6839e252 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/18700-18799.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/18700-18799.xml @@ -452,7 +452,7 @@ PER - + 1 2 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml index 4e691a28e9..f48f73099a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml @@ -595,7 +595,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml index 6a981bdc0a..5f53f4b977 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml @@ -149,7 +149,7 @@ - + 25 PER @@ -709,7 +709,7 @@ 15 PER - + 15 PER @@ -1726,7 +1726,7 @@ icon.skill10655 P - + 2 4 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/27700-27799.xml index 29dc54cc01..08a9acd6e3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/27700-27799.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/27700-27799.xml @@ -110,7 +110,7 @@ INT - + 18 20 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/27900-27999.xml index 4503144461..318ce171a6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/27900-27999.xml @@ -288,7 +288,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1338,7 +1338,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml index 0101286bef..3f858bdd92 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml @@ -1429,7 +1429,7 @@ - + 10 10 @@ -1743,7 +1743,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml index ba2fb3fbf3..7181b67a29 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/35100-35199.xml @@ -153,7 +153,7 @@ icon.bm_pattack_circlet_03 P - + 1 3 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt index cff19a027b..46ed9fa3a9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt @@ -90,7 +90,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -226,6 +226,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -291,7 +292,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java index cfab51ee8d..181c883a0e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java index 4f213dcbd7..4c1ce3a78e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -122,8 +122,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -140,8 +140,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java index 0a57cfcea6..9c983cb098 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -122,7 +122,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -260,6 +260,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -327,7 +328,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/30400-30499.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/30400-30499.xml index dbc1d619ef..95b0a7acea 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/30400-30499.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/30400-30499.xml @@ -740,7 +740,7 @@ PER - + 3 4 @@ -2318,7 +2318,7 @@ DIFF - + 3 4 @@ -2993,7 +2993,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/13900-13999.xml index f53a5158c5..bcc9b284db 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER @@ -849,7 +849,7 @@ 16 PER - + 11 PER @@ -1308,7 +1308,7 @@ 5 PER - + 25 PER diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/17900-17999.xml index 5c9c8b9ffe..5addd454d4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/17900-17999.xml @@ -1233,7 +1233,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/18700-18799.xml index 391126dab1..6c10fff4ab 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/18700-18799.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/18700-18799.xml @@ -452,7 +452,7 @@ PER - + 1 2 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/19100-19199.xml index d2a2f96268..cec3301acf 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/19100-19199.xml @@ -595,7 +595,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/19200-19299.xml index 7573c1751b..38cd696d38 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/19200-19299.xml @@ -149,7 +149,7 @@ - + 25 PER @@ -724,7 +724,7 @@ 15 PER - + 15 PER @@ -1122,7 +1122,7 @@ 15 PER - + 15 PER @@ -1765,7 +1765,7 @@ icon.skill10655 P - + 2 4 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/27700-27799.xml index 6daef6e443..7b50c02b35 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/27700-27799.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/27700-27799.xml @@ -110,7 +110,7 @@ INT - + 18 20 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/27900-27999.xml index 339b2a49ef..4a0a4553ab 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/27900-27999.xml @@ -288,7 +288,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1338,7 +1338,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/28000-28099.xml index 3e12829e34..f986ed8341 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/28000-28099.xml @@ -1268,7 +1268,7 @@ BranchIcon.icon.g_bm_aries_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30500-30599.xml index 42226f6bfa..1b21e9b330 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30500-30599.xml @@ -1429,7 +1429,7 @@ - + 10 10 @@ -1769,7 +1769,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/35000-35099.xml index 56a0a32e6a..e3ee129773 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/35000-35099.xml @@ -589,7 +589,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/35100-35199.xml index 19c0f1bb71..fcf6919e17 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/35100-35199.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/35100-35199.xml @@ -203,7 +203,7 @@ icon.bm_pattack_circlet_03 P - + 1 3 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt index c0f4bef3f0..9736a52918 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt @@ -92,7 +92,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -230,6 +230,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -296,7 +297,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java index cfab51ee8d..181c883a0e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java index 5ecf361d73..5901d2028b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -124,8 +124,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -142,8 +142,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java index e74809f754..a8dc4db19c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -123,7 +123,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -261,6 +261,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -328,7 +329,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/30400-30499.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/30400-30499.xml index dbc1d619ef..95b0a7acea 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/30400-30499.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/30400-30499.xml @@ -740,7 +740,7 @@ PER - + 3 4 @@ -2318,7 +2318,7 @@ DIFF - + 3 4 @@ -2993,7 +2993,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/13900-13999.xml index a950346aac..de64f65986 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER @@ -849,7 +849,7 @@ 16 PER - + 11 PER @@ -1308,7 +1308,7 @@ 5 PER - + 25 PER diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/17900-17999.xml index 6ecda2120c..26f9ebfaf4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/17900-17999.xml @@ -1233,7 +1233,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/18700-18799.xml index 49392ec47e..f6244e064d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/18700-18799.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/18700-18799.xml @@ -460,7 +460,7 @@ PER - + 1 2 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml index e3f95fa729..839da81467 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml @@ -595,7 +595,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml index c7ca6ba088..56d8fdc4ee 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml @@ -149,7 +149,7 @@ - + 25 PER @@ -724,7 +724,7 @@ 15 PER - + 15 PER @@ -1122,7 +1122,7 @@ 15 PER - + 15 PER @@ -1765,7 +1765,7 @@ icon.skill10655 P - + 2 4 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/27700-27799.xml index 7609b7da74..dae0b2677d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/27700-27799.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/27700-27799.xml @@ -110,7 +110,7 @@ INT - + 18 20 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/27900-27999.xml index 08dd7a9f75..70804ea54e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/27900-27999.xml @@ -288,7 +288,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1338,7 +1338,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml index a1ef91f66c..1dc8d6d8d7 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml @@ -1268,7 +1268,7 @@ BranchIcon.icon.g_bm_aries_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml index fcd949a268..60dfd4ec00 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml @@ -1429,7 +1429,7 @@ - + 10 10 @@ -1769,7 +1769,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35000-35099.xml index ec8d49e26a..0aae702f5c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35000-35099.xml @@ -589,7 +589,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml index 83f9585cc0..3384a0dff3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35100-35199.xml @@ -203,7 +203,7 @@ icon.bm_pattack_circlet_03 P - + 1 3 @@ -2280,7 +2280,7 @@ 10 PER - + 10 PER @@ -2371,7 +2371,7 @@ 10 PER - + 10 PER @@ -2462,7 +2462,7 @@ 10 PER - + 10 PER @@ -2553,7 +2553,7 @@ 10 PER - + 10 PER @@ -2644,7 +2644,7 @@ 10 PER - + 10 PER @@ -2733,7 +2733,7 @@ 10 PER - + 10 PER @@ -2824,7 +2824,7 @@ 10 PER - + 10 PER @@ -2913,7 +2913,7 @@ 10 PER - + 10 PER @@ -3004,7 +3004,7 @@ 10 PER - + 10 PER diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35200-35299.xml index f3da101729..40370808ab 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/35200-35299.xml @@ -51,7 +51,7 @@ 10 PER - + 10 PER @@ -125,7 +125,7 @@ 10 PER - + 10 PER @@ -199,7 +199,7 @@ 10 PER - + 10 PER @@ -273,7 +273,7 @@ 10 PER - + 10 PER @@ -347,7 +347,7 @@ 10 PER - + 10 PER @@ -1020,7 +1020,7 @@ PER - + 0 0 @@ -1576,7 +1576,7 @@ icon.bm_ensoul_stone_shilen P - + 1 2 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt index 37c0f58010..8838a8419e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt @@ -93,7 +93,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -231,6 +231,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -297,7 +298,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java index cfab51ee8d..181c883a0e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java index 982e74c9d2..99cb840244 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -124,8 +124,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -142,8 +142,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java index e74809f754..a8dc4db19c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -123,7 +123,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -261,6 +261,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -328,7 +329,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/30400-30499.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/30400-30499.xml index dbc1d619ef..95b0a7acea 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/30400-30499.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/30400-30499.xml @@ -740,7 +740,7 @@ PER - + 3 4 @@ -2318,7 +2318,7 @@ DIFF - + 3 4 @@ -2993,7 +2993,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/13900-13999.xml index baf3a15409..a47eadf0e7 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER @@ -849,7 +849,7 @@ 16 PER - + 11 PER @@ -1308,7 +1308,7 @@ 5 PER - + 25 PER diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/17900-17999.xml index 311ce3cf94..3c691b3d0c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/17900-17999.xml @@ -1252,7 +1252,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/18700-18799.xml index 0ca695a58a..a6810f4584 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/18700-18799.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/18700-18799.xml @@ -460,7 +460,7 @@ PER - + 1 2 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml index e23e7c38d4..7e2a85f8cc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml @@ -595,7 +595,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml index 2ebbca81b8..552f7a9468 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml @@ -149,7 +149,7 @@ - + 25 PER @@ -724,7 +724,7 @@ 15 PER - + 15 PER @@ -1122,7 +1122,7 @@ 15 PER - + 15 PER @@ -1765,7 +1765,7 @@ icon.skill10655 P - + 2 4 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/27700-27799.xml index d0a0f98dea..cafb5ec1d8 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/27700-27799.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/27700-27799.xml @@ -110,7 +110,7 @@ INT - + 18 20 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/27900-27999.xml index 93eda5a177..d98590e957 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/27900-27999.xml @@ -288,7 +288,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1338,7 +1338,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml index 2e9a256c96..afff2334a5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml @@ -1268,7 +1268,7 @@ BranchIcon.icon.g_bm_aries_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml index 42e88bdff3..384f0c1394 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml @@ -1485,7 +1485,7 @@ - + 10 10 @@ -1832,7 +1832,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35000-35099.xml index 5f9401a53f..e3869d54e5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35000-35099.xml @@ -694,7 +694,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml index 6e9f517a91..316e148062 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml @@ -203,7 +203,7 @@ icon.bm_pattack_circlet_03 P - + 1 3 @@ -2280,7 +2280,7 @@ 10 PER - + 10 PER @@ -2371,7 +2371,7 @@ 10 PER - + 10 PER @@ -2462,7 +2462,7 @@ 10 PER - + 10 PER @@ -2553,7 +2553,7 @@ 10 PER - + 10 PER @@ -2644,7 +2644,7 @@ 10 PER - + 10 PER @@ -2733,7 +2733,7 @@ 10 PER - + 10 PER @@ -2824,7 +2824,7 @@ 10 PER - + 10 PER @@ -2913,7 +2913,7 @@ 10 PER - + 10 PER @@ -3004,7 +3004,7 @@ 10 PER - + 10 PER diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35200-35299.xml index 8272b4f0b4..448864b417 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35200-35299.xml @@ -51,7 +51,7 @@ 10 PER - + 10 PER @@ -125,7 +125,7 @@ 10 PER - + 10 PER @@ -199,7 +199,7 @@ 10 PER - + 10 PER @@ -273,7 +273,7 @@ 10 PER - + 10 PER @@ -347,7 +347,7 @@ 10 PER - + 10 PER @@ -1020,7 +1020,7 @@ PER - + 0 0 @@ -1576,7 +1576,7 @@ icon.bm_ensoul_stone_shilen P - + 1 2 @@ -3145,7 +3145,7 @@ 15 PER - + 15 PER @@ -3487,7 +3487,7 @@ 5 110 - + 3 PER @@ -3512,7 +3512,7 @@ 5 110 - + 3 PER @@ -3529,7 +3529,7 @@ 5 110 - + 3 PER @@ -3546,7 +3546,7 @@ 5 110 - + 3 PER @@ -3621,7 +3621,7 @@ 5 110 - + 3 PER @@ -3638,7 +3638,7 @@ 5 110 - + 3 PER @@ -3701,7 +3701,7 @@ 3 PER - + 3 PER @@ -3730,7 +3730,7 @@ 5 110 - + 3 PER @@ -3747,7 +3747,7 @@ 5 110 - + 3 PER @@ -3764,7 +3764,7 @@ 5 110 - + 3 PER @@ -3851,7 +3851,7 @@ PER - + 5 PER @@ -4255,7 +4255,7 @@ 4 DIFF - + 2 PER diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35300-35399.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35300-35399.xml index 603770f445..3f40da1c24 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35300-35399.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/35300-35399.xml @@ -635,7 +635,7 @@ 5 110 - + 2 4 @@ -948,7 +948,7 @@ 5 110 - + 17 20 @@ -1980,7 +1980,7 @@ DARK - + 0 5 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt index 37c0f58010..8838a8419e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt @@ -93,7 +93,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -231,6 +231,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -297,7 +298,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java index cfab51ee8d..181c883a0e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java index 982e74c9d2..99cb840244 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -124,8 +124,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -142,8 +142,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java index f1739bd482..d9acfca909 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -123,7 +123,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -261,6 +261,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -328,7 +329,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/30400-30499.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/30400-30499.xml index dbc1d619ef..95b0a7acea 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/30400-30499.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/30400-30499.xml @@ -740,7 +740,7 @@ PER - + 3 4 @@ -2318,7 +2318,7 @@ DIFF - + 3 4 @@ -2993,7 +2993,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/13900-13999.xml index 9040d17ebd..70e98c4c2d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER @@ -849,7 +849,7 @@ 16 PER - + 11 PER @@ -1308,7 +1308,7 @@ 5 PER - + 25 PER diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/17900-17999.xml index a3ec64ffc2..d7641c8717 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/17900-17999.xml @@ -1252,7 +1252,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/18700-18799.xml index 4fbfb53ee4..a74aaaa309 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/18700-18799.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/18700-18799.xml @@ -460,7 +460,7 @@ PER - + 1 2 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml index 43750b1994..68b7d873de 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml @@ -595,7 +595,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml index 152dcfcd43..43fa486b8d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml @@ -149,7 +149,7 @@ - + 25 PER @@ -733,7 +733,7 @@ 15 PER - + 15 PER @@ -1131,7 +1131,7 @@ 15 PER - + 15 PER @@ -1774,7 +1774,7 @@ icon.skill10655 P - + 2 4 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/27700-27799.xml index ff27782b01..12bef5f833 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/27700-27799.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/27700-27799.xml @@ -110,7 +110,7 @@ INT - + 18 20 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/27900-27999.xml index 4ff6bc152d..9f5ca380c5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/27900-27999.xml @@ -288,7 +288,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1338,7 +1338,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/28000-28099.xml index 4116b40f29..6f1a5e4439 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/28000-28099.xml @@ -1268,7 +1268,7 @@ BranchIcon.icon.g_bm_aries_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml index 783f7f23d3..8d7f52de58 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml @@ -1485,7 +1485,7 @@ - + 10 10 @@ -1832,7 +1832,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35000-35099.xml index 2f07136533..11171ddfe7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35000-35099.xml @@ -694,7 +694,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35100-35199.xml index 6e351cd82d..907842515f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35100-35199.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35100-35199.xml @@ -203,7 +203,7 @@ icon.bm_pattack_circlet_03 P - + 1 3 @@ -2280,7 +2280,7 @@ 10 PER - + 10 PER @@ -2371,7 +2371,7 @@ 10 PER - + 10 PER @@ -2462,7 +2462,7 @@ 10 PER - + 10 PER @@ -2553,7 +2553,7 @@ 10 PER - + 10 PER @@ -2644,7 +2644,7 @@ 10 PER - + 10 PER @@ -2733,7 +2733,7 @@ 10 PER - + 10 PER @@ -2824,7 +2824,7 @@ 10 PER - + 10 PER @@ -2913,7 +2913,7 @@ 10 PER - + 10 PER @@ -3004,7 +3004,7 @@ 10 PER - + 10 PER diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35200-35299.xml index 49a1035c71..a4e1f930c3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35200-35299.xml @@ -51,7 +51,7 @@ 10 PER - + 10 PER @@ -125,7 +125,7 @@ 10 PER - + 10 PER @@ -199,7 +199,7 @@ 10 PER - + 10 PER @@ -273,7 +273,7 @@ 10 PER - + 10 PER @@ -347,7 +347,7 @@ 10 PER - + 10 PER @@ -1020,7 +1020,7 @@ PER - + 0 0 @@ -1576,7 +1576,7 @@ icon.bm_ensoul_stone_shilen P - + 1 2 @@ -3145,7 +3145,7 @@ 15 PER - + 15 PER @@ -3487,7 +3487,7 @@ 5 110 - + 3 PER @@ -3512,7 +3512,7 @@ 5 110 - + 3 PER @@ -3529,7 +3529,7 @@ 5 110 - + 3 PER @@ -3546,7 +3546,7 @@ 5 110 - + 3 PER @@ -3621,7 +3621,7 @@ 5 110 - + 3 PER @@ -3638,7 +3638,7 @@ 5 110 - + 3 PER @@ -3701,7 +3701,7 @@ 3 PER - + 3 PER @@ -3730,7 +3730,7 @@ 5 110 - + 3 PER @@ -3747,7 +3747,7 @@ 5 110 - + 3 PER @@ -3764,7 +3764,7 @@ 5 110 - + 3 PER @@ -3851,7 +3851,7 @@ PER - + 5 PER @@ -4255,7 +4255,7 @@ 4 DIFF - + 2 PER diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35300-35399.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35300-35399.xml index d7c77911d7..26fc72c82f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35300-35399.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35300-35399.xml @@ -635,7 +635,7 @@ 5 110 - + 2 4 @@ -948,7 +948,7 @@ 5 110 - + 17 20 @@ -1980,7 +1980,7 @@ DARK - + 0 5 @@ -2361,7 +2361,7 @@ icon.artifact_d_skill_crt_dmg P - + 0 1 @@ -3108,7 +3108,7 @@ icon.artifact_a_crt_skill_dmg P - + 0 1 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35400-35499.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35400-35499.xml index 178a131e5e..5c818fd4ca 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35400-35499.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35400-35499.xml @@ -1792,7 +1792,7 @@ 1 PER - + 2 PER @@ -1974,7 +1974,7 @@ 1 PER - + 2 PER diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35500-35599.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35500-35599.xml index 28e4af8c70..d781a5e2cf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35500-35599.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/35500-35599.xml @@ -598,7 +598,7 @@ 30 PER - + 30 PER @@ -680,7 +680,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt index 80bad74f65..57045c21cd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt @@ -93,7 +93,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -231,6 +231,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -296,7 +297,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ef57080ace..1ff6dcf644 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java index a30aaff246..be2e56250c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -124,8 +124,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -142,8 +142,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java index 4674f471a4..a7c473ea50 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -124,7 +124,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -262,6 +262,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -330,7 +331,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/30400-30499.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/30400-30499.xml index dbc1d619ef..95b0a7acea 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/30400-30499.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/30400-30499.xml @@ -740,7 +740,7 @@ PER - + 10 11 @@ -2882,7 +2882,7 @@ 30 PER - + 30 PER @@ -2936,7 +2936,7 @@ 10 PER - + 10 PER @@ -3056,7 +3056,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10300-10399.xml index 4a1312df4f..613dc0297c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10300-10399.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10300-10399.xml @@ -366,7 +366,7 @@ DUALBLUNT - + 45 50 @@ -1331,7 +1331,7 @@ BLUNT - + 10 12 @@ -1375,7 +1375,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10700-10799.xml index 5d0c95a7b3..e61f57a5e4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10700-10799.xml @@ -927,7 +927,7 @@ 10 PER - + 10 12 @@ -2751,7 +2751,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10900-10999.xml index 043384b9e0..2c7994d95e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10900-10999.xml @@ -429,7 +429,7 @@ 15 PER - + 15 PER @@ -477,7 +477,7 @@ PER PER - + 25 PER 0 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11500-11599.xml index 6d63583c57..2c95fd2370 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11500-11599.xml @@ -4452,7 +4452,7 @@ DUALBLUNT - + 0 10 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11600-11699.xml index e68c8f8001..46b85e4eaa 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11600-11699.xml @@ -1211,7 +1211,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13100-13199.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13100-13199.xml index 7d77b27018..91840e8105 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13100-13199.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13100-13199.xml @@ -689,7 +689,7 @@ 10 PER - + 10 PER @@ -981,7 +981,7 @@ 10 PER - + 10 PER @@ -1026,7 +1026,7 @@ 10 PER - + 10 PER @@ -1251,7 +1251,7 @@ 10 PER - + 10 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13500-13599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13500-13599.xml index 1b22cde525..f5ab90bead 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13500-13599.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13500-13599.xml @@ -2224,7 +2224,7 @@ -15 PER - + 0 0 0 @@ -3024,7 +3024,7 @@ icon.skill4416_dwarf P - + 1 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13600-13699.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13600-13699.xml index 41f8187231..3b1a36adee 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13600-13699.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13600-13699.xml @@ -1418,7 +1418,7 @@ 20 PER - + 30 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13800-13899.xml index a46bd27860..27e5165f2a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13800-13899.xml @@ -675,7 +675,7 @@ icon.etc_talisman_i02 P - + 7 PER @@ -1843,7 +1843,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2159,7 +2159,7 @@ PER - + 3 4 @@ -2318,7 +2318,7 @@ DIFF - + 3 4 @@ -2993,7 +2993,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13900-13999.xml index 0eaad45405..47a498a583 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER @@ -849,7 +849,7 @@ 16 PER - + 11 PER @@ -1308,7 +1308,7 @@ 5 PER - + 10 PER @@ -2313,7 +2313,7 @@ PER - + 0 10 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/17900-17999.xml index 0ab7785ccc..97ae2dc659 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/17900-17999.xml @@ -1261,7 +1261,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18700-18799.xml index ca9b98f6d7..9eac16a26d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18700-18799.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18700-18799.xml @@ -483,7 +483,7 @@ PER - + 1 2 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/19100-19199.xml index ef2a612c99..a4cada2805 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/19100-19199.xml @@ -636,7 +636,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/19200-19299.xml index e18dbfbcca..1a3d72dfca 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/19200-19299.xml @@ -742,7 +742,7 @@ 15 PER - + 15 PER @@ -1798,7 +1798,7 @@ icon.skill10655 P - + 2 4 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/27700-27799.xml index b7a9298e5a..27cc80a664 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/27700-27799.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/27700-27799.xml @@ -110,7 +110,7 @@ INT - + 18 20 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/27900-27999.xml index 1d86f9ac50..42d4c02029 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/27900-27999.xml @@ -288,7 +288,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1338,7 +1338,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/28000-28099.xml index b45c5440c7..9fd34b7db3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/28000-28099.xml @@ -1268,7 +1268,7 @@ BranchIcon.icon.g_bm_aries_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29300-29399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29300-29399.xml index 73c8320771..e163159bd5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29300-29399.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29300-29399.xml @@ -546,7 +546,7 @@ 1 PER - + 1 PER @@ -655,7 +655,7 @@ 2 PER - + 2 PER @@ -880,7 +880,7 @@ 1 PER - + 1 PER @@ -989,7 +989,7 @@ 2 PER - + 2 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29400-29499.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29400-29499.xml index 2031fff123..29d35bb5cc 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29400-29499.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/29400-29499.xml @@ -355,7 +355,7 @@ 3 PER - + 3 PER @@ -464,7 +464,7 @@ 4 PER - + 4 PER @@ -573,7 +573,7 @@ 5 PER - + 5 PER @@ -682,7 +682,7 @@ 3 PER - + 3 PER @@ -791,7 +791,7 @@ 4 PER - + 4 PER @@ -900,7 +900,7 @@ 5 PER - + 5 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30500-30599.xml index 14e8851fdf..f5629a8a91 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30500-30599.xml @@ -1509,7 +1509,7 @@ - + 10 10 @@ -1860,7 +1860,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30800-30899.xml index 33ca3b4351..d20d26d84a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30800-30899.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30800-30899.xml @@ -953,7 +953,7 @@ 15 PER - + 15 PER @@ -1045,7 +1045,7 @@ - + 15 PER @@ -2182,7 +2182,7 @@ -12 PER - + -12 PER @@ -2434,7 +2434,7 @@ -20 PER - + -20 PER @@ -2712,7 +2712,7 @@ 10 PER - + 10 PER @@ -2822,7 +2822,7 @@ 20 PER - + 20 PER @@ -2848,7 +2848,7 @@ 15 PER - + 15 PER @@ -3072,7 +3072,7 @@ -5 PER - + -5 PER @@ -3284,7 +3284,7 @@ PER - + 0 0 @@ -3318,7 +3318,7 @@ PER - + 0 0 @@ -3344,7 +3344,7 @@ PER - + 0 0 @@ -3370,7 +3370,7 @@ PER - + 0 0 @@ -3404,7 +3404,7 @@ PER - + 0 0 @@ -3480,7 +3480,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/33000-33099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/33000-33099.xml index 95ac622eb0..bf98b47349 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/33000-33099.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/33000-33099.xml @@ -652,7 +652,7 @@ PER - + -1 -2 @@ -1240,7 +1240,7 @@ PER - + -2 -3 @@ -1828,7 +1828,7 @@ PER - + -3 -4 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35000-35099.xml index 37cfd79dbe..25891d77cb 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35000-35099.xml @@ -1305,7 +1305,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35100-35199.xml index 9ac506dfc0..8ecc404983 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35100-35199.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35100-35199.xml @@ -194,7 +194,7 @@ icon.bm_pattack_circlet_03 P - + 1 3 @@ -1709,7 +1709,7 @@ PER - + 0 -15 @@ -2458,7 +2458,7 @@ 10 PER - + 10 PER @@ -2549,7 +2549,7 @@ 10 PER - + 10 PER @@ -2640,7 +2640,7 @@ 10 PER - + 10 PER @@ -2731,7 +2731,7 @@ 10 PER - + 10 PER @@ -2822,7 +2822,7 @@ 10 PER - + 10 PER @@ -2911,7 +2911,7 @@ 10 PER - + 10 PER @@ -3002,7 +3002,7 @@ 10 PER - + 10 PER @@ -3091,7 +3091,7 @@ 10 PER - + 10 PER @@ -3182,7 +3182,7 @@ 10 PER - + 10 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35200-35299.xml index 2b5917c8bd..4d8f5a09be 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35200-35299.xml @@ -51,7 +51,7 @@ 10 PER - + 10 PER @@ -125,7 +125,7 @@ 10 PER - + 10 PER @@ -199,7 +199,7 @@ 10 PER - + 10 PER @@ -273,7 +273,7 @@ 10 PER - + 10 PER @@ -347,7 +347,7 @@ 10 PER - + 10 PER @@ -1043,7 +1043,7 @@ PER - + 0 0 @@ -1618,7 +1618,7 @@ icon.bm_ensoul_stone_shilen P - + 1 2 @@ -3242,7 +3242,7 @@ 15 PER - + 15 PER @@ -3614,7 +3614,7 @@ 5 110 - + 3 PER @@ -3639,7 +3639,7 @@ 5 110 - + 3 PER @@ -3656,7 +3656,7 @@ 5 110 - + 3 PER @@ -3673,7 +3673,7 @@ 5 110 - + 3 PER @@ -3748,7 +3748,7 @@ 5 110 - + 3 PER @@ -3765,7 +3765,7 @@ 5 110 - + 3 PER @@ -3828,7 +3828,7 @@ 3 PER - + 3 PER @@ -3857,7 +3857,7 @@ 5 110 - + 3 PER @@ -3874,7 +3874,7 @@ 5 110 - + 3 PER @@ -3891,7 +3891,7 @@ 5 110 - + 3 PER @@ -3978,7 +3978,7 @@ PER - + 5 PER @@ -4466,7 +4466,7 @@ 4 DIFF - + 2 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35300-35399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35300-35399.xml index 764854a7e4..514aec8ebe 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35300-35399.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35300-35399.xml @@ -635,7 +635,7 @@ 5 110 - + 2 4 @@ -948,7 +948,7 @@ 5 110 - + 17 20 @@ -1980,7 +1980,7 @@ DARK - + 0 5 @@ -2361,7 +2361,7 @@ icon.artifact_d_skill_crt_dmg P - + 0 1 @@ -3127,7 +3127,7 @@ icon.artifact_a_crt_skill_dmg P - + 0 1 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35400-35499.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35400-35499.xml index 9ef5d372c8..2e0c8281e0 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35400-35499.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35400-35499.xml @@ -1860,7 +1860,7 @@ 1 PER - + 2 PER @@ -2051,7 +2051,7 @@ 1 PER - + 2 PER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35500-35599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35500-35599.xml index df8394ddc1..d1500ffaa9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35500-35599.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35500-35599.xml @@ -609,7 +609,7 @@ 30 PER - + 30 PER @@ -691,7 +691,7 @@ 30 PER - + 30 PER @@ -1544,7 +1544,7 @@ P - + 0 0 @@ -2156,7 +2156,7 @@ icon.renewal_mineral_dragon P - + 1 2 @@ -2577,7 +2577,7 @@ icon.renewal_mineral_dragon P - + 1 2 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35600-35699.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35600-35699.xml index 4e61a70c8b..eccd9420fc 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35600-35699.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35600-35699.xml @@ -112,7 +112,7 @@ icon.renewal_mineral_dragon P - + 17 20 @@ -237,7 +237,7 @@ PER - + 1 2 @@ -478,7 +478,7 @@ PER - + 5 10 @@ -1411,7 +1411,7 @@ PER - + 0 0 @@ -1741,7 +1741,7 @@ PER - + 0 0 @@ -2016,7 +2016,7 @@ PER - + 0 0 @@ -2210,7 +2210,7 @@ 2 PER - + 2 PER @@ -2372,7 +2372,7 @@ 5 PER - + 5 PER @@ -2565,7 +2565,7 @@ icon.skill0000 P - + 7 PER @@ -2857,7 +2857,7 @@ 5 PER - + 5 PER @@ -3061,7 +3061,7 @@ BLUNT - + 1 2 @@ -3724,7 +3724,7 @@ icon.elemental_necklace_wind_i00 P - + 1 2 @@ -3813,7 +3813,7 @@ PER - + -1 -2 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35700-35799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35700-35799.xml index 59a71934df..faa4ea171a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35700-35799.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35700-35799.xml @@ -1536,7 +1536,7 @@ icon.accessary_angel_of_earing P - + 1 2 @@ -1625,7 +1625,7 @@ PER - + -1 -2 @@ -1862,7 +1862,7 @@ icon.new_ring_of_hero P - + 1 2 @@ -1951,7 +1951,7 @@ PER - + -1 -2 @@ -2188,7 +2188,7 @@ icon.bm_ring_of_fallen_angel P - + 1 2 @@ -2277,7 +2277,7 @@ PER - + -1 -2 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35800-35899.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35800-35899.xml index c778eb0add..8b5cda520e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35800-35899.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/35800-35899.xml @@ -5,7 +5,7 @@ branchsys2.icon2.g_accessory_event_earring P - + 1 2 @@ -94,7 +94,7 @@ PER - + -1 -2 @@ -331,7 +331,7 @@ icon.dragon_accessary_necklace P - + 1 2 @@ -420,7 +420,7 @@ PER - + -1 -2 @@ -657,7 +657,7 @@ icon.dragon_accessary_earring P - + 1 2 @@ -746,7 +746,7 @@ PER - + -1 -2 @@ -983,7 +983,7 @@ icon.dragon_accessary_ring P - + 1 2 @@ -1072,7 +1072,7 @@ PER - + -1 -2 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt index b756124034..a923cb4a13 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt @@ -94,7 +94,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -232,6 +232,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -298,7 +299,6 @@ ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. SkillBonusRange: Additional cast range for skills. (l2jmobius) -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ef57080ace..1ff6dcf644 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java index 6548fde01a..19b15c8860 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -126,8 +126,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -144,8 +144,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), ACTIVE_BONUS_EXP("activeBonusExp"), // Used to measure active skill bonus exp. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java index 33181f1511..800d1e6743 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -125,7 +125,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -263,6 +263,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -331,7 +332,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/30400-30499.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/30400-30499.xml index dbc1d619ef..95b0a7acea 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/30400-30499.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/30400-30499.xml @@ -740,7 +740,7 @@ PER - + 10 11 @@ -2882,7 +2882,7 @@ 30 PER - + 30 PER @@ -2936,7 +2936,7 @@ 10 PER - + 10 PER @@ -3056,7 +3056,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10300-10399.xml index 4a1312df4f..613dc0297c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10300-10399.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10300-10399.xml @@ -366,7 +366,7 @@ DUALBLUNT - + 45 50 @@ -1331,7 +1331,7 @@ BLUNT - + 10 12 @@ -1375,7 +1375,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10700-10799.xml index 74398dfcef..e46d76f79b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10700-10799.xml @@ -927,7 +927,7 @@ 10 PER - + 10 12 @@ -2751,7 +2751,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10900-10999.xml index 2d9827cc31..8b4be181e2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10900-10999.xml @@ -429,7 +429,7 @@ 15 PER - + 15 PER @@ -477,7 +477,7 @@ PER PER - + 25 PER 0 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11500-11599.xml index ea2360af6e..9845744405 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11500-11599.xml @@ -4452,7 +4452,7 @@ DUALBLUNT - + 0 10 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11600-11699.xml index 0e48880bd9..66dcae41e7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11600-11699.xml @@ -1211,7 +1211,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13100-13199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13100-13199.xml index 9905a754fd..b1d14b8486 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13100-13199.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13100-13199.xml @@ -689,7 +689,7 @@ 10 PER - + 10 PER @@ -981,7 +981,7 @@ 10 PER - + 10 PER @@ -1026,7 +1026,7 @@ 10 PER - + 10 PER @@ -1251,7 +1251,7 @@ 10 PER - + 10 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13500-13599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13500-13599.xml index 54f2b30a06..df99251bb0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13500-13599.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13500-13599.xml @@ -2224,7 +2224,7 @@ -15 PER - + 0 0 0 @@ -3024,7 +3024,7 @@ icon.skill4416_dwarf P - + 1 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13600-13699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13600-13699.xml index 8776fe7c67..5076a63ec6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13600-13699.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13600-13699.xml @@ -1418,7 +1418,7 @@ 20 PER - + 30 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13800-13899.xml index c1779e06b3..f20018637a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13800-13899.xml @@ -675,7 +675,7 @@ icon.etc_talisman_i02 P - + 7 PER @@ -1843,7 +1843,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2159,7 +2159,7 @@ PER - + 3 4 @@ -2318,7 +2318,7 @@ DIFF - + 3 4 @@ -2993,7 +2993,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13900-13999.xml index 5837edfced..e0821d73dd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER @@ -849,7 +849,7 @@ 16 PER - + 11 PER @@ -1308,7 +1308,7 @@ 5 PER - + 10 PER @@ -2313,7 +2313,7 @@ PER - + 0 10 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17900-17999.xml index 8e970c3039..e08007fb6b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17900-17999.xml @@ -1261,7 +1261,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18700-18799.xml index 578f8db927..2e09d0417a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18700-18799.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18700-18799.xml @@ -483,7 +483,7 @@ PER - + 1 2 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19100-19199.xml index 0c833deafa..cc1c3768a7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19100-19199.xml @@ -636,7 +636,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml index ad597ec7b8..3ff352a7da 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml @@ -742,7 +742,7 @@ 15 PER - + 15 PER @@ -1798,7 +1798,7 @@ icon.skill10655 P - + 2 4 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27700-27799.xml index 260f91a45a..db8f1fc6a2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27700-27799.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27700-27799.xml @@ -110,7 +110,7 @@ INT - + 18 20 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27900-27999.xml index 637eda91d6..f907d90aeb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27900-27999.xml @@ -288,7 +288,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1338,7 +1338,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/28000-28099.xml index b10cd5fdd9..b6c8914f7d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/28000-28099.xml @@ -1268,7 +1268,7 @@ BranchIcon.icon.g_bm_aries_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29300-29399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29300-29399.xml index b9e79990f1..db5ee1a2b1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29300-29399.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29300-29399.xml @@ -546,7 +546,7 @@ 1 PER - + 1 PER @@ -655,7 +655,7 @@ 2 PER - + 2 PER @@ -880,7 +880,7 @@ 1 PER - + 1 PER @@ -989,7 +989,7 @@ 2 PER - + 2 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29400-29499.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29400-29499.xml index 7eb01323ee..b3413989d1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29400-29499.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/29400-29499.xml @@ -365,7 +365,7 @@ 3 PER - + 3 PER @@ -474,7 +474,7 @@ 4 PER - + 4 PER @@ -583,7 +583,7 @@ 5 PER - + 5 PER @@ -692,7 +692,7 @@ 3 PER - + 3 PER @@ -801,7 +801,7 @@ 4 PER - + 4 PER @@ -910,7 +910,7 @@ 5 PER - + 5 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml index cd50b27091..34e679decf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml @@ -1509,7 +1509,7 @@ - + 10 10 @@ -1860,7 +1860,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml index 4293d95e21..0d67a2ff15 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml @@ -953,7 +953,7 @@ 15 PER - + 15 PER @@ -1045,7 +1045,7 @@ - + 15 PER @@ -2182,7 +2182,7 @@ -12 PER - + -12 PER @@ -2434,7 +2434,7 @@ -20 PER - + -20 PER @@ -2712,7 +2712,7 @@ 10 PER - + 10 PER @@ -2822,7 +2822,7 @@ 20 PER - + 20 PER @@ -2848,7 +2848,7 @@ 15 PER - + 15 PER @@ -3077,7 +3077,7 @@ -5 PER - + -5 PER @@ -3289,7 +3289,7 @@ PER - + 0 0 @@ -3323,7 +3323,7 @@ PER - + 0 0 @@ -3349,7 +3349,7 @@ PER - + 0 0 @@ -3375,7 +3375,7 @@ PER - + 0 0 @@ -3409,7 +3409,7 @@ PER - + 0 0 @@ -3485,7 +3485,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml index dbfb83367c..0346a3107b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml @@ -652,7 +652,7 @@ PER - + -1 -2 @@ -1240,7 +1240,7 @@ PER - + -2 -3 @@ -1828,7 +1828,7 @@ PER - + -3 -4 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35000-35099.xml index 62e8405355..936d61f3d6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35000-35099.xml @@ -1305,7 +1305,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35100-35199.xml index 3c07bfad46..d414726829 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35100-35199.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35100-35199.xml @@ -194,7 +194,7 @@ icon.bm_pattack_circlet_03 P - + 1 3 @@ -1709,7 +1709,7 @@ PER - + 0 -15 @@ -2458,7 +2458,7 @@ 10 PER - + 10 PER @@ -2549,7 +2549,7 @@ 10 PER - + 10 PER @@ -2640,7 +2640,7 @@ 10 PER - + 10 PER @@ -2731,7 +2731,7 @@ 10 PER - + 10 PER @@ -2822,7 +2822,7 @@ 10 PER - + 10 PER @@ -2911,7 +2911,7 @@ 10 PER - + 10 PER @@ -3002,7 +3002,7 @@ 10 PER - + 10 PER @@ -3091,7 +3091,7 @@ 10 PER - + 10 PER @@ -3182,7 +3182,7 @@ 10 PER - + 10 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35200-35299.xml index 5d45fd35ff..d26a017b75 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35200-35299.xml @@ -51,7 +51,7 @@ 10 PER - + 10 PER @@ -125,7 +125,7 @@ 10 PER - + 10 PER @@ -199,7 +199,7 @@ 10 PER - + 10 PER @@ -273,7 +273,7 @@ 10 PER - + 10 PER @@ -347,7 +347,7 @@ 10 PER - + 10 PER @@ -1258,7 +1258,7 @@ PER - + 0 10 @@ -1492,7 +1492,7 @@ BLUNT - + 1 3 @@ -1940,7 +1940,7 @@ icon.bm_ensoul_stone_shilen P - + 1 2 @@ -3564,7 +3564,7 @@ 15 PER - + 15 PER @@ -3936,7 +3936,7 @@ 5 110 - + 3 PER @@ -3961,7 +3961,7 @@ 5 110 - + 3 PER @@ -3978,7 +3978,7 @@ 5 110 - + 3 PER @@ -3995,7 +3995,7 @@ 5 110 - + 3 PER @@ -4070,7 +4070,7 @@ 5 110 - + 3 PER @@ -4087,7 +4087,7 @@ 5 110 - + 3 PER @@ -4150,7 +4150,7 @@ 3 PER - + 3 PER @@ -4179,7 +4179,7 @@ 5 110 - + 3 PER @@ -4196,7 +4196,7 @@ 5 110 - + 3 PER @@ -4213,7 +4213,7 @@ 5 110 - + 3 PER @@ -4300,7 +4300,7 @@ PER - + 5 PER @@ -4788,7 +4788,7 @@ 4 DIFF - + 2 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35300-35399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35300-35399.xml index f8281ec7ce..cf50090465 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35300-35399.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35300-35399.xml @@ -635,7 +635,7 @@ 5 110 - + 2 4 @@ -948,7 +948,7 @@ 5 110 - + 17 20 @@ -1996,7 +1996,7 @@ DARK - + 0 5 @@ -2393,7 +2393,7 @@ icon.artifact_d_skill_crt_dmg P - + 0 1 @@ -3159,7 +3159,7 @@ icon.artifact_a_crt_skill_dmg P - + 0 1 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35400-35499.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35400-35499.xml index 9ef5d372c8..2e0c8281e0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35400-35499.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35400-35499.xml @@ -1860,7 +1860,7 @@ 1 PER - + 2 PER @@ -2051,7 +2051,7 @@ 1 PER - + 2 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35500-35599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35500-35599.xml index 0710b01ca9..8442674269 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35500-35599.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35500-35599.xml @@ -609,7 +609,7 @@ 30 PER - + 30 PER @@ -691,7 +691,7 @@ 30 PER - + 30 PER @@ -1544,7 +1544,7 @@ P - + 0 0 @@ -2156,7 +2156,7 @@ icon.renewal_mineral_dragon P - + 1 2 @@ -2577,7 +2577,7 @@ icon.renewal_mineral_dragon P - + 1 2 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35600-35699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35600-35699.xml index 0537a3ca61..20e4fec4ff 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35600-35699.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35600-35699.xml @@ -112,7 +112,7 @@ icon.renewal_mineral_dragon P - + 17 20 @@ -237,7 +237,7 @@ PER - + 1 2 @@ -510,7 +510,7 @@ PER - + 5 10 @@ -1469,7 +1469,7 @@ PER - + 0 0 @@ -1799,7 +1799,7 @@ PER - + 0 0 @@ -2074,7 +2074,7 @@ PER - + 0 0 @@ -2268,7 +2268,7 @@ 2 PER - + 2 PER @@ -2430,7 +2430,7 @@ 5 PER - + 5 PER @@ -2623,7 +2623,7 @@ icon.skill0000 P - + 7 PER @@ -2915,7 +2915,7 @@ 5 PER - + 5 PER @@ -3119,7 +3119,7 @@ BLUNT - + 1 2 @@ -3782,7 +3782,7 @@ icon.elemental_necklace_wind_i00 P - + 1 2 @@ -3871,7 +3871,7 @@ PER - + -1 -2 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35700-35799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35700-35799.xml index dcb6537ddc..7d4e7cb132 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35700-35799.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35700-35799.xml @@ -1536,7 +1536,7 @@ icon.accessary_angel_of_earing P - + 1 2 @@ -1625,7 +1625,7 @@ PER - + -1 -2 @@ -1862,7 +1862,7 @@ icon.new_ring_of_hero P - + 1 2 @@ -1951,7 +1951,7 @@ PER - + -1 -2 @@ -2188,7 +2188,7 @@ icon.bm_ring_of_fallen_angel P - + 1 2 @@ -2277,7 +2277,7 @@ PER - + -1 -2 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35800-35899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35800-35899.xml index c3a06176bb..986c2f18de 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35800-35899.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35800-35899.xml @@ -5,7 +5,7 @@ branchsys2.icon2.g_accessory_event_earring P - + 1 2 @@ -94,7 +94,7 @@ PER - + -1 -2 @@ -331,7 +331,7 @@ icon.dragon_accessary_necklace P - + 1 2 @@ -420,7 +420,7 @@ PER - + -1 -2 @@ -657,7 +657,7 @@ icon.dragon_accessary_earring P - + 1 2 @@ -746,7 +746,7 @@ PER - + -1 -2 @@ -983,7 +983,7 @@ icon.dragon_accessary_ring P - + 1 2 @@ -1072,7 +1072,7 @@ PER - + -1 -2 @@ -1465,7 +1465,7 @@ P 5 - + 0.5 PER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35900-35999.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35900-35999.xml index 1de6d96677..d2e89ab00b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35900-35999.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35900-35999.xml @@ -1136,7 +1136,7 @@ P 5 - + 3 PER @@ -1222,7 +1222,7 @@ 3031 100 - + 1 2 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt index 69e926be2f..e94c6d7b7e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt @@ -94,7 +94,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -232,6 +232,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -298,7 +299,6 @@ ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. SkillBonusRange: Additional cast range for skills. (l2jmobius) -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ef57080ace..1ff6dcf644 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java index 6548fde01a..19b15c8860 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -126,8 +126,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -144,8 +144,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), ACTIVE_BONUS_EXP("activeBonusExp"), // Used to measure active skill bonus exp. diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java index 30707a0463..bcb6d37701 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -125,7 +125,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -264,6 +264,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -333,7 +334,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/augmentation/options/30400-30499.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/augmentation/options/30400-30499.xml index dbc1d619ef..95b0a7acea 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/augmentation/options/30400-30499.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/augmentation/options/30400-30499.xml @@ -740,7 +740,7 @@ PER - + 10 11 @@ -2882,7 +2882,7 @@ 30 PER - + 30 PER @@ -2936,7 +2936,7 @@ 10 PER - + 10 PER @@ -3056,7 +3056,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10300-10399.xml index 491726d990..beea102a08 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10300-10399.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10300-10399.xml @@ -366,7 +366,7 @@ DUALBLUNT - + 45 50 @@ -1331,7 +1331,7 @@ BLUNT - + 10 12 @@ -1375,7 +1375,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10700-10799.xml index a2d07dff0f..6fba8355dd 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10700-10799.xml @@ -927,7 +927,7 @@ 10 PER - + 10 12 @@ -2751,7 +2751,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10900-10999.xml index 2d9827cc31..8b4be181e2 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/10900-10999.xml @@ -429,7 +429,7 @@ 15 PER - + 15 PER @@ -477,7 +477,7 @@ PER PER - + 25 PER 0 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/11500-11599.xml index dadc5fb7f2..c07f43cf3c 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/11500-11599.xml @@ -4452,7 +4452,7 @@ DUALBLUNT - + 0 10 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/11600-11699.xml index 0e48880bd9..66dcae41e7 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/11600-11699.xml @@ -1211,7 +1211,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13100-13199.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13100-13199.xml index 13ff1fccad..9c6bf80ace 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13100-13199.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13100-13199.xml @@ -689,7 +689,7 @@ 10 PER - + 10 PER @@ -981,7 +981,7 @@ 10 PER - + 10 PER @@ -1026,7 +1026,7 @@ 10 PER - + 10 PER @@ -1251,7 +1251,7 @@ 10 PER - + 10 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13500-13599.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13500-13599.xml index 8be5cd7551..fe8bb7a4fe 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13500-13599.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13500-13599.xml @@ -2224,7 +2224,7 @@ -15 PER - + 0 0 0 @@ -3024,7 +3024,7 @@ icon.skill4416_dwarf P - + 1 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13600-13699.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13600-13699.xml index 8776fe7c67..5076a63ec6 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13600-13699.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13600-13699.xml @@ -1418,7 +1418,7 @@ 20 PER - + 30 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13800-13899.xml index dfa15cf90d..db6346dc76 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13800-13899.xml @@ -675,7 +675,7 @@ icon.etc_talisman_i02 P - + 7 PER @@ -1843,7 +1843,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2159,7 +2159,7 @@ PER - + 3 4 @@ -2318,7 +2318,7 @@ DIFF - + 3 4 @@ -2993,7 +2993,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13900-13999.xml index 6c1b4e35a3..bc8dcd6a34 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER @@ -849,7 +849,7 @@ 16 PER - + 11 PER @@ -1308,7 +1308,7 @@ 5 PER - + 10 PER @@ -2313,7 +2313,7 @@ PER - + 0 10 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/17900-17999.xml index 820b0659ce..86782c056f 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/17900-17999.xml @@ -1261,7 +1261,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/18000-18099.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/18000-18099.xml index 8c045d4389..906846ecae 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/18000-18099.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/18000-18099.xml @@ -739,7 +739,7 @@ PER - + 0 1 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/18700-18799.xml index 01461158d1..9e01da3771 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/18700-18799.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/18700-18799.xml @@ -483,7 +483,7 @@ PER - + 1 2 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/19100-19199.xml index 6375dd520a..0e189d8c0b 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/19100-19199.xml @@ -636,7 +636,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/19200-19299.xml index e87f34ea33..a1767bd56c 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/19200-19299.xml @@ -742,7 +742,7 @@ 15 PER - + 15 PER @@ -1798,7 +1798,7 @@ icon.skill10655 P - + 2 4 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/27700-27799.xml index c6eedb1e52..2bb8eaabe5 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/27700-27799.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/27700-27799.xml @@ -110,7 +110,7 @@ INT - + 18 20 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/27900-27999.xml index 637eda91d6..f907d90aeb 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/27900-27999.xml @@ -288,7 +288,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1338,7 +1338,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/28000-28099.xml index 5580e4a1c1..828f984dbe 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/28000-28099.xml @@ -1268,7 +1268,7 @@ BranchIcon.icon.g_bm_aries_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/29300-29399.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/29300-29399.xml index b9e79990f1..db5ee1a2b1 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/29300-29399.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/29300-29399.xml @@ -546,7 +546,7 @@ 1 PER - + 1 PER @@ -655,7 +655,7 @@ 2 PER - + 2 PER @@ -880,7 +880,7 @@ 1 PER - + 1 PER @@ -989,7 +989,7 @@ 2 PER - + 2 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/29400-29499.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/29400-29499.xml index b93598c394..c89c8782ef 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/29400-29499.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/29400-29499.xml @@ -365,7 +365,7 @@ 3 PER - + 3 PER @@ -474,7 +474,7 @@ 4 PER - + 4 PER @@ -583,7 +583,7 @@ 5 PER - + 5 PER @@ -692,7 +692,7 @@ 3 PER - + 3 PER @@ -801,7 +801,7 @@ 4 PER - + 4 PER @@ -910,7 +910,7 @@ 5 PER - + 5 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30500-30599.xml index cd50b27091..34e679decf 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30500-30599.xml @@ -1509,7 +1509,7 @@ - + 10 10 @@ -1860,7 +1860,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30800-30899.xml index 4293d95e21..0d67a2ff15 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30800-30899.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30800-30899.xml @@ -953,7 +953,7 @@ 15 PER - + 15 PER @@ -1045,7 +1045,7 @@ - + 15 PER @@ -2182,7 +2182,7 @@ -12 PER - + -12 PER @@ -2434,7 +2434,7 @@ -20 PER - + -20 PER @@ -2712,7 +2712,7 @@ 10 PER - + 10 PER @@ -2822,7 +2822,7 @@ 20 PER - + 20 PER @@ -2848,7 +2848,7 @@ 15 PER - + 15 PER @@ -3077,7 +3077,7 @@ -5 PER - + -5 PER @@ -3289,7 +3289,7 @@ PER - + 0 0 @@ -3323,7 +3323,7 @@ PER - + 0 0 @@ -3349,7 +3349,7 @@ PER - + 0 0 @@ -3375,7 +3375,7 @@ PER - + 0 0 @@ -3409,7 +3409,7 @@ PER - + 0 0 @@ -3485,7 +3485,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30900-30999.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30900-30999.xml index d53520ce5f..6ecd2f4557 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30900-30999.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/30900-30999.xml @@ -835,7 +835,7 @@ PER - + 10 12 @@ -895,7 +895,7 @@ -50 PER - + -50 PER @@ -935,7 +935,7 @@ 20 PER - + 30 PER @@ -1000,7 +1000,7 @@ PER - + 7 9 @@ -2428,7 +2428,7 @@ 15 PER - + 30 PER @@ -2764,7 +2764,7 @@ PER - + 20 25 @@ -2840,7 +2840,7 @@ 30848 1 - + 15 PER @@ -2866,7 +2866,7 @@ - + 15 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33000-33099.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33000-33099.xml index 2818cfd855..1f6e899c42 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33000-33099.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/33000-33099.xml @@ -652,7 +652,7 @@ PER - + -1 -2 @@ -1240,7 +1240,7 @@ PER - + -2 -3 @@ -1828,7 +1828,7 @@ PER - + -3 -4 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35000-35099.xml index b8a87bc825..bfc51fccea 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35000-35099.xml @@ -1305,7 +1305,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35100-35199.xml index 88f3eee01d..cdfdb74e8c 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35100-35199.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35100-35199.xml @@ -194,7 +194,7 @@ icon.bm_pattack_circlet_03 P - + 1 3 @@ -1709,7 +1709,7 @@ PER - + 0 -15 @@ -2458,7 +2458,7 @@ 10 PER - + 10 PER @@ -2549,7 +2549,7 @@ 10 PER - + 10 PER @@ -2640,7 +2640,7 @@ 10 PER - + 10 PER @@ -2731,7 +2731,7 @@ 10 PER - + 10 PER @@ -2822,7 +2822,7 @@ 10 PER - + 10 PER @@ -2911,7 +2911,7 @@ 10 PER - + 10 PER @@ -3002,7 +3002,7 @@ 10 PER - + 10 PER @@ -3091,7 +3091,7 @@ 10 PER - + 10 PER @@ -3182,7 +3182,7 @@ 10 PER - + 10 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35200-35299.xml index a40a119a0f..dedcfbed2d 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35200-35299.xml @@ -51,7 +51,7 @@ 10 PER - + 10 PER @@ -125,7 +125,7 @@ 10 PER - + 10 PER @@ -199,7 +199,7 @@ 10 PER - + 10 PER @@ -273,7 +273,7 @@ 10 PER - + 10 PER @@ -347,7 +347,7 @@ 10 PER - + 10 PER @@ -1258,7 +1258,7 @@ PER - + 0 10 @@ -1492,7 +1492,7 @@ BLUNT - + 1 3 @@ -1940,7 +1940,7 @@ icon.bm_ensoul_stone_shilen P - + 1 2 @@ -3564,7 +3564,7 @@ 15 PER - + 15 PER @@ -3936,7 +3936,7 @@ 5 110 - + 3 PER @@ -3961,7 +3961,7 @@ 5 110 - + 3 PER @@ -3978,7 +3978,7 @@ 5 110 - + 3 PER @@ -3995,7 +3995,7 @@ 5 110 - + 3 PER @@ -4070,7 +4070,7 @@ 5 110 - + 3 PER @@ -4087,7 +4087,7 @@ 5 110 - + 3 PER @@ -4150,7 +4150,7 @@ 3 PER - + 3 PER @@ -4179,7 +4179,7 @@ 5 110 - + 3 PER @@ -4196,7 +4196,7 @@ 5 110 - + 3 PER @@ -4213,7 +4213,7 @@ 5 110 - + 3 PER @@ -4300,7 +4300,7 @@ PER - + 5 PER @@ -4788,7 +4788,7 @@ 4 DIFF - + 2 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35300-35399.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35300-35399.xml index 7180afae42..0058d2da96 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35300-35399.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35300-35399.xml @@ -635,7 +635,7 @@ 5 110 - + 2 4 @@ -948,7 +948,7 @@ 5 110 - + 17 20 @@ -1996,7 +1996,7 @@ DARK - + 0 5 @@ -2393,7 +2393,7 @@ icon.artifact_d_skill_crt_dmg P - + 0 1 @@ -3159,7 +3159,7 @@ icon.artifact_a_crt_skill_dmg P - + 0 1 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35400-35499.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35400-35499.xml index 9ef5d372c8..2e0c8281e0 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35400-35499.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35400-35499.xml @@ -1860,7 +1860,7 @@ 1 PER - + 2 PER @@ -2051,7 +2051,7 @@ 1 PER - + 2 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35500-35599.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35500-35599.xml index 0710b01ca9..8442674269 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35500-35599.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35500-35599.xml @@ -609,7 +609,7 @@ 30 PER - + 30 PER @@ -691,7 +691,7 @@ 30 PER - + 30 PER @@ -1544,7 +1544,7 @@ P - + 0 0 @@ -2156,7 +2156,7 @@ icon.renewal_mineral_dragon P - + 1 2 @@ -2577,7 +2577,7 @@ icon.renewal_mineral_dragon P - + 1 2 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35600-35699.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35600-35699.xml index 0537a3ca61..20e4fec4ff 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35600-35699.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35600-35699.xml @@ -112,7 +112,7 @@ icon.renewal_mineral_dragon P - + 17 20 @@ -237,7 +237,7 @@ PER - + 1 2 @@ -510,7 +510,7 @@ PER - + 5 10 @@ -1469,7 +1469,7 @@ PER - + 0 0 @@ -1799,7 +1799,7 @@ PER - + 0 0 @@ -2074,7 +2074,7 @@ PER - + 0 0 @@ -2268,7 +2268,7 @@ 2 PER - + 2 PER @@ -2430,7 +2430,7 @@ 5 PER - + 5 PER @@ -2623,7 +2623,7 @@ icon.skill0000 P - + 7 PER @@ -2915,7 +2915,7 @@ 5 PER - + 5 PER @@ -3119,7 +3119,7 @@ BLUNT - + 1 2 @@ -3782,7 +3782,7 @@ icon.elemental_necklace_wind_i00 P - + 1 2 @@ -3871,7 +3871,7 @@ PER - + -1 -2 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35700-35799.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35700-35799.xml index dcb6537ddc..7d4e7cb132 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35700-35799.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35700-35799.xml @@ -1536,7 +1536,7 @@ icon.accessary_angel_of_earing P - + 1 2 @@ -1625,7 +1625,7 @@ PER - + -1 -2 @@ -1862,7 +1862,7 @@ icon.new_ring_of_hero P - + 1 2 @@ -1951,7 +1951,7 @@ PER - + -1 -2 @@ -2188,7 +2188,7 @@ icon.bm_ring_of_fallen_angel P - + 1 2 @@ -2277,7 +2277,7 @@ PER - + -1 -2 diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35800-35899.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35800-35899.xml index c3a06176bb..986c2f18de 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35800-35899.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35800-35899.xml @@ -5,7 +5,7 @@ branchsys2.icon2.g_accessory_event_earring P - + 1 2 @@ -94,7 +94,7 @@ PER - + -1 -2 @@ -331,7 +331,7 @@ icon.dragon_accessary_necklace P - + 1 2 @@ -420,7 +420,7 @@ PER - + -1 -2 @@ -657,7 +657,7 @@ icon.dragon_accessary_earring P - + 1 2 @@ -746,7 +746,7 @@ PER - + -1 -2 @@ -983,7 +983,7 @@ icon.dragon_accessary_ring P - + 1 2 @@ -1072,7 +1072,7 @@ PER - + -1 -2 @@ -1465,7 +1465,7 @@ P 5 - + 0.5 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35900-35999.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35900-35999.xml index ba8f2ff8e2..3c5c6f34b7 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35900-35999.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/35900-35999.xml @@ -1277,7 +1277,7 @@ P 5 - + 3 PER @@ -1363,7 +1363,7 @@ 3031 100 - + 1 2 @@ -1897,7 +1897,7 @@ 5 PER - + 5 PER @@ -1954,7 +1954,7 @@ 2 PER - + 2 PER @@ -1973,7 +1973,7 @@ 1 PER - + 1 PER @@ -2019,7 +2019,7 @@ icon.skill0000 P - + -3.5 PER @@ -2094,7 +2094,7 @@ 3 PER - + 1 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/36000-36099.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/36000-36099.xml index 6ad9cf078c..2bd6a2362f 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/36000-36099.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/36000-36099.xml @@ -181,7 +181,7 @@ -1.5 PER - + -1.5 PER @@ -453,7 +453,7 @@ -10 PER - + -10 PER @@ -500,7 +500,7 @@ 3 PER - + 3 PER @@ -523,7 +523,7 @@ -3 PER - + -3 PER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/documentation.txt index 0c3c909dce..cded43c734 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/documentation.txt @@ -94,7 +94,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -233,6 +233,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -300,7 +301,6 @@ ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. SkillBonusRange: Additional cast range for skills. (l2jmobius) -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 98a2c73b9b..c693f0de15 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java index 6548fde01a..19b15c8860 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -126,8 +126,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -144,8 +144,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), ACTIVE_BONUS_EXP("activeBonusExp"), // Used to measure active skill bonus exp. diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java index 287fced219..0d6ae71f8d 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -127,7 +127,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -266,6 +266,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -335,7 +336,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/augmentation/options/30400-30499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/augmentation/options/30400-30499.xml index dbc1d619ef..95b0a7acea 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/augmentation/options/30400-30499.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/augmentation/options/30400-30499.xml @@ -740,7 +740,7 @@ PER - + 10 11 @@ -2882,7 +2882,7 @@ 30 PER - + 30 PER @@ -2936,7 +2936,7 @@ 10 PER - + 10 PER @@ -3056,7 +3056,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10300-10399.xml index 491726d990..beea102a08 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10300-10399.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10300-10399.xml @@ -366,7 +366,7 @@ DUALBLUNT - + 45 50 @@ -1331,7 +1331,7 @@ BLUNT - + 10 12 @@ -1375,7 +1375,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10700-10799.xml index c2ea0efeef..3368bad69a 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10700-10799.xml @@ -927,7 +927,7 @@ 10 PER - + 10 12 @@ -2751,7 +2751,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10900-10999.xml index 2d9827cc31..8b4be181e2 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/10900-10999.xml @@ -429,7 +429,7 @@ 15 PER - + 15 PER @@ -477,7 +477,7 @@ PER PER - + 25 PER 0 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/11500-11599.xml index 1fc8127bdc..e5014bf680 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/11500-11599.xml @@ -4452,7 +4452,7 @@ DUALBLUNT - + 0 10 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/11600-11699.xml index eb3354c2ec..1fa3838e0a 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/11600-11699.xml @@ -1211,7 +1211,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13100-13199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13100-13199.xml index 13ff1fccad..9c6bf80ace 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13100-13199.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13100-13199.xml @@ -689,7 +689,7 @@ 10 PER - + 10 PER @@ -981,7 +981,7 @@ 10 PER - + 10 PER @@ -1026,7 +1026,7 @@ 10 PER - + 10 PER @@ -1251,7 +1251,7 @@ 10 PER - + 10 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13500-13599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13500-13599.xml index d18b858d37..302c629965 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13500-13599.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13500-13599.xml @@ -2224,7 +2224,7 @@ -15 PER - + 0 0 0 @@ -3024,7 +3024,7 @@ icon.skill4416_dwarf P - + 1 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13600-13699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13600-13699.xml index 8776fe7c67..5076a63ec6 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13600-13699.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13600-13699.xml @@ -1418,7 +1418,7 @@ 20 PER - + 30 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13800-13899.xml index d43f3ddeed..66df163c86 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13800-13899.xml @@ -675,7 +675,7 @@ icon.etc_talisman_i02 P - + 7 PER @@ -1843,7 +1843,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2159,7 +2159,7 @@ PER - + 3 4 @@ -2318,7 +2318,7 @@ DIFF - + 3 4 @@ -2993,7 +2993,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13900-13999.xml index 9b152cccea..1df80a0c3f 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER @@ -849,7 +849,7 @@ 16 PER - + 11 PER @@ -1308,7 +1308,7 @@ 5 PER - + 10 PER @@ -2313,7 +2313,7 @@ PER - + 0 10 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/17900-17999.xml index 820b0659ce..86782c056f 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/17900-17999.xml @@ -1261,7 +1261,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/18000-18099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/18000-18099.xml index 2a79a35277..1a6320c097 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/18000-18099.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/18000-18099.xml @@ -739,7 +739,7 @@ PER - + 0 1 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/18700-18799.xml index 662e6bd78a..c0ca2b23b1 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/18700-18799.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/18700-18799.xml @@ -483,7 +483,7 @@ PER - + 1 2 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/19100-19199.xml index 4f97d580d6..51ae3ff4c4 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/19100-19199.xml @@ -636,7 +636,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/19200-19299.xml index 06b1944406..cf65f2c8c3 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/19200-19299.xml @@ -170,7 +170,7 @@ 25 PER - + 25 PER @@ -1748,7 +1748,7 @@ icon.skill10655 P - + 2 4 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/27700-27799.xml index c6eedb1e52..2bb8eaabe5 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/27700-27799.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/27700-27799.xml @@ -110,7 +110,7 @@ INT - + 18 20 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/27900-27999.xml index 637eda91d6..f907d90aeb 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/27900-27999.xml @@ -288,7 +288,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1338,7 +1338,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/28000-28099.xml index 04378b820a..fdec228c6c 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/28000-28099.xml @@ -1268,7 +1268,7 @@ BranchIcon.icon.g_bm_aries_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/29300-29399.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/29300-29399.xml index b9e79990f1..db5ee1a2b1 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/29300-29399.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/29300-29399.xml @@ -546,7 +546,7 @@ 1 PER - + 1 PER @@ -655,7 +655,7 @@ 2 PER - + 2 PER @@ -880,7 +880,7 @@ 1 PER - + 1 PER @@ -989,7 +989,7 @@ 2 PER - + 2 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/29400-29499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/29400-29499.xml index 341e953ce2..7201ff2098 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/29400-29499.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/29400-29499.xml @@ -365,7 +365,7 @@ 3 PER - + 3 PER @@ -474,7 +474,7 @@ 4 PER - + 4 PER @@ -583,7 +583,7 @@ 5 PER - + 5 PER @@ -692,7 +692,7 @@ 3 PER - + 3 PER @@ -801,7 +801,7 @@ 4 PER - + 4 PER @@ -910,7 +910,7 @@ 5 PER - + 5 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30500-30599.xml index cd50b27091..34e679decf 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30500-30599.xml @@ -1509,7 +1509,7 @@ - + 10 10 @@ -1860,7 +1860,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30800-30899.xml index 06578e65b3..fe52d04874 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30800-30899.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30800-30899.xml @@ -953,7 +953,7 @@ 15 PER - + 15 PER @@ -1045,7 +1045,7 @@ - + 15 PER @@ -2182,7 +2182,7 @@ -12 PER - + -12 PER @@ -2434,7 +2434,7 @@ -20 PER - + -20 PER @@ -2712,7 +2712,7 @@ 10 PER - + 10 PER @@ -2822,7 +2822,7 @@ 20 PER - + 20 PER @@ -2848,7 +2848,7 @@ 15 PER - + 15 PER @@ -3077,7 +3077,7 @@ -5 PER - + -5 PER @@ -3289,7 +3289,7 @@ PER - + 0 0 @@ -3323,7 +3323,7 @@ PER - + 0 0 @@ -3349,7 +3349,7 @@ PER - + 0 0 @@ -3375,7 +3375,7 @@ PER - + 0 0 @@ -3409,7 +3409,7 @@ PER - + 0 0 @@ -3485,7 +3485,7 @@ PER - + 0 0 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30900-30999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30900-30999.xml index 0f9230cfc7..075b4f04b9 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30900-30999.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/30900-30999.xml @@ -865,7 +865,7 @@ PER - + 10 12 @@ -925,7 +925,7 @@ -50 PER - + -50 PER @@ -965,7 +965,7 @@ 20 PER - + 30 PER @@ -1030,7 +1030,7 @@ PER - + 7 9 @@ -2471,7 +2471,7 @@ 15 PER - + 30 PER @@ -2807,7 +2807,7 @@ PER - + 20 25 @@ -2883,7 +2883,7 @@ 30848 1 - + 15 PER @@ -2909,7 +2909,7 @@ - + 15 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/33000-33099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/33000-33099.xml index 93843acef3..0f1a98aeb9 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/33000-33099.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/33000-33099.xml @@ -652,7 +652,7 @@ PER - + -1 -2 @@ -1240,7 +1240,7 @@ PER - + -2 -3 @@ -1828,7 +1828,7 @@ PER - + -3 -4 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35000-35099.xml index 4c62b392f9..e6abfcfe99 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35000-35099.xml @@ -1305,7 +1305,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35100-35199.xml index ffe3914c33..f2914e5ec6 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35100-35199.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35100-35199.xml @@ -194,7 +194,7 @@ icon.bm_pattack_circlet_03 P - + 1 3 @@ -1709,7 +1709,7 @@ PER - + 0 -15 @@ -2458,7 +2458,7 @@ 10 PER - + 10 PER @@ -2549,7 +2549,7 @@ 10 PER - + 10 PER @@ -2640,7 +2640,7 @@ 10 PER - + 10 PER @@ -2731,7 +2731,7 @@ 10 PER - + 10 PER @@ -2822,7 +2822,7 @@ 10 PER - + 10 PER @@ -2911,7 +2911,7 @@ 10 PER - + 10 PER @@ -3002,7 +3002,7 @@ 10 PER - + 10 PER @@ -3091,7 +3091,7 @@ 10 PER - + 10 PER @@ -3182,7 +3182,7 @@ 10 PER - + 10 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35200-35299.xml index 493a259a4b..f08bc18944 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35200-35299.xml @@ -51,7 +51,7 @@ 10 PER - + 10 PER @@ -125,7 +125,7 @@ 10 PER - + 10 PER @@ -199,7 +199,7 @@ 10 PER - + 10 PER @@ -273,7 +273,7 @@ 10 PER - + 10 PER @@ -347,7 +347,7 @@ 10 PER - + 10 PER @@ -1258,7 +1258,7 @@ PER - + 0 10 @@ -1492,7 +1492,7 @@ BLUNT - + 1 3 @@ -1940,7 +1940,7 @@ icon.bm_ensoul_stone_shilen P - + 1 2 @@ -3564,7 +3564,7 @@ 15 PER - + 15 PER @@ -3936,7 +3936,7 @@ 5 110 - + 3 PER @@ -3961,7 +3961,7 @@ 5 110 - + 3 PER @@ -3978,7 +3978,7 @@ 5 110 - + 3 PER @@ -3995,7 +3995,7 @@ 5 110 - + 3 PER @@ -4070,7 +4070,7 @@ 5 110 - + 3 PER @@ -4087,7 +4087,7 @@ 5 110 - + 3 PER @@ -4150,7 +4150,7 @@ 3 PER - + 3 PER @@ -4179,7 +4179,7 @@ 5 110 - + 3 PER @@ -4196,7 +4196,7 @@ 5 110 - + 3 PER @@ -4213,7 +4213,7 @@ 5 110 - + 3 PER @@ -4300,7 +4300,7 @@ PER - + 5 PER @@ -4788,7 +4788,7 @@ 4 DIFF - + 2 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35300-35399.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35300-35399.xml index 7180afae42..0058d2da96 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35300-35399.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35300-35399.xml @@ -635,7 +635,7 @@ 5 110 - + 2 4 @@ -948,7 +948,7 @@ 5 110 - + 17 20 @@ -1996,7 +1996,7 @@ DARK - + 0 5 @@ -2393,7 +2393,7 @@ icon.artifact_d_skill_crt_dmg P - + 0 1 @@ -3159,7 +3159,7 @@ icon.artifact_a_crt_skill_dmg P - + 0 1 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35400-35499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35400-35499.xml index 9ef5d372c8..2e0c8281e0 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35400-35499.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35400-35499.xml @@ -1860,7 +1860,7 @@ 1 PER - + 2 PER @@ -2051,7 +2051,7 @@ 1 PER - + 2 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35500-35599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35500-35599.xml index c028d34c40..8f45757d37 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35500-35599.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35500-35599.xml @@ -609,7 +609,7 @@ 30 PER - + 30 PER @@ -691,7 +691,7 @@ 30 PER - + 30 PER @@ -1544,7 +1544,7 @@ P - + 0 0 @@ -2156,7 +2156,7 @@ icon.renewal_mineral_dragon P - + 1 2 @@ -2577,7 +2577,7 @@ icon.renewal_mineral_dragon P - + 1 2 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35600-35699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35600-35699.xml index aff45c9aaf..7391891199 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35600-35699.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35600-35699.xml @@ -112,7 +112,7 @@ icon.renewal_mineral_dragon P - + 17 20 @@ -237,7 +237,7 @@ PER - + 1 2 @@ -510,7 +510,7 @@ PER - + 5 10 @@ -1469,7 +1469,7 @@ PER - + 0 0 @@ -1799,7 +1799,7 @@ PER - + 0 0 @@ -2074,7 +2074,7 @@ PER - + 0 0 @@ -2268,7 +2268,7 @@ 2 PER - + 2 PER @@ -2430,7 +2430,7 @@ 5 PER - + 5 PER @@ -2623,7 +2623,7 @@ icon.skill0000 P - + 7 PER @@ -2915,7 +2915,7 @@ 5 PER - + 5 PER @@ -3119,7 +3119,7 @@ BLUNT - + 1 2 @@ -3782,7 +3782,7 @@ icon.elemental_necklace_wind_i00 P - + 1 2 @@ -3871,7 +3871,7 @@ PER - + -1 -2 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35700-35799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35700-35799.xml index c3eb7192d9..a2c55256c8 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35700-35799.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35700-35799.xml @@ -1536,7 +1536,7 @@ icon.accessary_angel_of_earing P - + 1 2 @@ -1625,7 +1625,7 @@ PER - + -1 -2 @@ -1862,7 +1862,7 @@ icon.new_ring_of_hero P - + 1 2 @@ -1951,7 +1951,7 @@ PER - + -1 -2 @@ -2188,7 +2188,7 @@ icon.bm_ring_of_fallen_angel P - + 1 2 @@ -2277,7 +2277,7 @@ PER - + -1 -2 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35800-35899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35800-35899.xml index ab1b36fd9b..399907b0d0 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35800-35899.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35800-35899.xml @@ -5,7 +5,7 @@ branchsys2.icon2.g_accessory_event_earring P - + 1 2 @@ -94,7 +94,7 @@ PER - + -1 -2 @@ -331,7 +331,7 @@ icon.dragon_accessary_necklace P - + 1 2 @@ -420,7 +420,7 @@ PER - + -1 -2 @@ -657,7 +657,7 @@ icon.dragon_accessary_earring P - + 1 2 @@ -746,7 +746,7 @@ PER - + -1 -2 @@ -983,7 +983,7 @@ icon.dragon_accessary_ring P - + 1 2 @@ -1072,7 +1072,7 @@ PER - + -1 -2 @@ -1465,7 +1465,7 @@ P 5 - + 0.5 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35900-35999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35900-35999.xml index ba8f2ff8e2..3c5c6f34b7 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35900-35999.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/35900-35999.xml @@ -1277,7 +1277,7 @@ P 5 - + 3 PER @@ -1363,7 +1363,7 @@ 3031 100 - + 1 2 @@ -1897,7 +1897,7 @@ 5 PER - + 5 PER @@ -1954,7 +1954,7 @@ 2 PER - + 2 PER @@ -1973,7 +1973,7 @@ 1 PER - + 1 PER @@ -2019,7 +2019,7 @@ icon.skill0000 P - + -3.5 PER @@ -2094,7 +2094,7 @@ 3 PER - + 1 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/36000-36099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/36000-36099.xml index b539f1ea0d..962f96d6bd 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/36000-36099.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/36000-36099.xml @@ -181,7 +181,7 @@ -1.5 PER - + -1.5 PER @@ -453,7 +453,7 @@ -10 PER - + -10 PER @@ -500,7 +500,7 @@ 3 PER - + 3 PER @@ -523,7 +523,7 @@ -3 PER - + -3 PER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/36100-36199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/36100-36199.xml index ba93459470..019cc2bb86 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/36100-36199.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/36100-36199.xml @@ -714,7 +714,7 @@ PER - + 0 3 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/documentation.txt index 86f7566a7f..6c0449b768 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/documentation.txt @@ -96,7 +96,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -235,6 +235,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -302,7 +303,6 @@ ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. SkillBonusRange: Additional cast range for skills. (l2jmobius) -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 9a97fe4265..001ca9c3d2 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -361,8 +361,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -404,8 +404,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java index 5fc48f1df1..d6cb474255 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -126,8 +126,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -142,8 +142,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), AREA_OF_EFFECT_DAMAGE_MODIFIER("aoeDamageMofifier"), AREA_OF_EFFECT_DAMAGE_DEFENCE("aoeDamageDefence"), BLOW_RATE("blowRate"), diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java index be0e238282..4f3441078a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -115,7 +115,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -249,6 +249,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -313,7 +314,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt index 54cb6367f9..257facc5a3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt @@ -85,7 +85,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -219,6 +219,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -282,7 +283,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 289e5f69a5..9b93150394 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java index 4840d70a6d..3e274d92e4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -121,8 +121,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -139,8 +139,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java index be0e238282..4f3441078a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -115,7 +115,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -249,6 +249,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -313,7 +314,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55400-55499.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55400-55499.xml index 7886ba2f6b..c5dc90e369 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55400-55499.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55400-55499.xml @@ -31,7 +31,7 @@ 5 1 - + 7 PER diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55700-55799.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55700-55799.xml index 1e8452a189..b3de4c2486 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55700-55799.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55700-55799.xml @@ -1031,7 +1031,7 @@ PER - + 0 0 @@ -2379,7 +2379,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55800-55899.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55800-55899.xml index b8cc6bc5fb..9713a2cd6f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55800-55899.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/55800-55899.xml @@ -484,7 +484,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt index 54cb6367f9..257facc5a3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt @@ -85,7 +85,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -219,6 +219,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -282,7 +283,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 289e5f69a5..9b93150394 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java index 4840d70a6d..3e274d92e4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -121,8 +121,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -139,8 +139,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java index 742589267d..0cfdfe7d56 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -117,7 +117,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -251,6 +251,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -315,7 +316,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55400-55499.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55400-55499.xml index 005b902077..0b507871c4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55400-55499.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55400-55499.xml @@ -31,7 +31,7 @@ 5 1 - + 7 PER diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55700-55799.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55700-55799.xml index e35d6ce72a..c94961b867 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55700-55799.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55700-55799.xml @@ -1055,7 +1055,7 @@ PER - + 0 0 @@ -2403,7 +2403,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55800-55899.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55800-55899.xml index 9947f8493c..4639be0ab0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55800-55899.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/55800-55899.xml @@ -484,7 +484,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt index 1d8f809b5b..a492864650 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt @@ -87,7 +87,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -221,6 +221,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -284,7 +285,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 289e5f69a5..9b93150394 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java index ec1c7a9e1a..bbc0244b37 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -123,8 +123,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -141,8 +141,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java index 389f36fd81..784c03164c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -118,7 +118,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -254,6 +254,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -318,7 +319,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55400-55499.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55400-55499.xml index 9d258f9da8..36597231c9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55400-55499.xml +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55400-55499.xml @@ -31,7 +31,7 @@ 5 1 - + 7 PER diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55700-55799.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55700-55799.xml index fd68b575b4..f7e47a8fbb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55700-55799.xml +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55700-55799.xml @@ -1055,7 +1055,7 @@ PER - + 0 0 @@ -2403,7 +2403,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55800-55899.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55800-55899.xml index 8ab9e6b5b5..e1c460baf2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55800-55899.xml +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/55800-55899.xml @@ -484,7 +484,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt index d957346ce2..641e68892f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/documentation.txt @@ -88,7 +88,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -224,6 +224,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -287,7 +288,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 1e9588bdd4..a3964bdb52 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -356,8 +356,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -399,8 +399,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java index 827e3aa363..153c963b70 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -136,8 +136,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -154,8 +154,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java index 389f36fd81..784c03164c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -118,7 +118,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -254,6 +254,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -318,7 +319,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55400-55499.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55400-55499.xml index fcf17d40f7..f63049b5c4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55400-55499.xml +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55400-55499.xml @@ -31,7 +31,7 @@ 5 1 - + 7 PER diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55700-55799.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55700-55799.xml index ecbc9ca7f7..a89e600219 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55700-55799.xml +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55700-55799.xml @@ -1055,7 +1055,7 @@ PER - + 0 0 @@ -2403,7 +2403,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55800-55899.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55800-55899.xml index 53a1ed0f7f..0f03df9c63 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55800-55899.xml +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/55800-55899.xml @@ -484,7 +484,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt index d957346ce2..641e68892f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt @@ -88,7 +88,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -224,6 +224,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -287,7 +288,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 1e9588bdd4..a3964bdb52 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -356,8 +356,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -399,8 +399,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java index 827e3aa363..153c963b70 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -136,8 +136,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -154,8 +154,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java index edd9f3f88e..8840b4d6ad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -118,7 +118,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -256,6 +256,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -320,7 +321,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/50200-50299.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/50200-50299.xml index 3862d5fd45..0c938269bc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/50200-50299.xml +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/50200-50299.xml @@ -278,7 +278,7 @@ DIFF INT - + 4 7 @@ -353,7 +353,7 @@ PER - + 2 5 diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55400-55499.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55400-55499.xml index e39929d4fe..05a032b4e3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55400-55499.xml +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55400-55499.xml @@ -31,7 +31,7 @@ 5 1 - + 7 PER diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55700-55799.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55700-55799.xml index ecbc9ca7f7..a89e600219 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55700-55799.xml +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55700-55799.xml @@ -1055,7 +1055,7 @@ PER - + 0 0 @@ -2403,7 +2403,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55800-55899.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55800-55899.xml index f9882310d0..782b4f7417 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55800-55899.xml +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55800-55899.xml @@ -484,7 +484,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt index 4c50bbfb76..bbea9d3307 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt @@ -88,7 +88,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -226,6 +226,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -289,7 +290,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 1e9588bdd4..a3964bdb52 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -356,8 +356,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -399,8 +399,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java index 653201d53e..16e7b0985a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -137,8 +137,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -156,8 +156,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java index 711bc3edb6..5320821a76 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -116,7 +116,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -252,6 +252,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -317,7 +318,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/augmentation/options/30400-30499.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/augmentation/options/30400-30499.xml index dbc1d619ef..95b0a7acea 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/augmentation/options/30400-30499.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/augmentation/options/30400-30499.xml @@ -740,7 +740,7 @@ PER - + 3 4 @@ -2318,7 +2318,7 @@ DIFF - + 3 4 @@ -2993,7 +2993,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13900-13999.xml index 7040ee7758..7d7e0a8d7c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13900-13999.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13900-13999.xml @@ -227,7 +227,7 @@ 7 PER - + 10 PER @@ -266,7 +266,7 @@ 7 PER - + 10 PER @@ -305,7 +305,7 @@ 7 PER - + 10 PER @@ -344,7 +344,7 @@ 7 PER - + 10 PER @@ -383,7 +383,7 @@ 7 PER - + 10 PER @@ -422,7 +422,7 @@ 7 PER - + 10 PER @@ -461,7 +461,7 @@ 7 PER - + 10 PER @@ -500,7 +500,7 @@ 7 PER - + 10 PER @@ -660,7 +660,7 @@ 7 PER - + 10 PER @@ -699,7 +699,7 @@ 7 PER - + 10 PER @@ -738,7 +738,7 @@ 7 PER - + 10 PER @@ -849,7 +849,7 @@ 16 PER - + 11 PER @@ -1308,7 +1308,7 @@ 5 PER - + 25 PER diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/17900-17999.xml index 27262c5a32..ca83ea3fc8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/17900-17999.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/17900-17999.xml @@ -1233,7 +1233,7 @@ P 5 - + 10 PER diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/18700-18799.xml index b430b50833..1c6839e252 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/18700-18799.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/18700-18799.xml @@ -452,7 +452,7 @@ PER - + 1 2 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19100-19199.xml index 4e691a28e9..f48f73099a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19100-19199.xml @@ -595,7 +595,7 @@ icon.skill10655 P - + 5 10 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19200-19299.xml index 46ad08a5be..03d1e97068 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19200-19299.xml @@ -148,7 +148,7 @@ - + 25 PER @@ -707,7 +707,7 @@ 15 PER - + 15 PER @@ -1724,7 +1724,7 @@ icon.skill10655 P - + 2 4 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/27700-27799.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/27700-27799.xml index 29dc54cc01..08a9acd6e3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/27700-27799.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/27700-27799.xml @@ -110,7 +110,7 @@ INT - + 18 20 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/27900-27999.xml index 4503144461..318ce171a6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/27900-27999.xml @@ -288,7 +288,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1338,7 +1338,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30500-30599.xml index 0101286bef..3f858bdd92 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30500-30599.xml @@ -1429,7 +1429,7 @@ - + 10 10 @@ -1743,7 +1743,7 @@ 20 PER - + 20 PER diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/35100-35199.xml index ba2fb3fbf3..7181b67a29 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/35100-35199.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/35100-35199.xml @@ -153,7 +153,7 @@ icon.bm_pattack_circlet_03 P - + 1 3 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt index 69a94b6bc4..d3df67c29c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt @@ -86,7 +86,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -222,6 +222,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -285,7 +286,6 @@ ShieldDefence: Shield P. Def stat. ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ef57080ace..1ff6dcf644 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -355,8 +355,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -398,8 +398,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java index 90488cb5b8..0590ca4793 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -122,8 +122,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -140,8 +140,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), BONUS_EXP("bonusExp"), diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java index 50711faa47..f9f0c877ce 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -119,7 +119,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -261,6 +261,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -327,7 +328,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/augmentation/options/34100-34199.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/augmentation/options/34100-34199.xml index 9ad6c67fda..123c685577 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/augmentation/options/34100-34199.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/augmentation/options/34100-34199.xml @@ -720,7 +720,7 @@ PER - + 5 5 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml index 9d4b75f268..ca8cd9ac94 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml @@ -1871,7 +1871,7 @@ PER - + 11 22 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml index d3ea38345e..6edbcdab31 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml @@ -113,7 +113,7 @@ PER - + 3 8 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45100-45199.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45100-45199.xml index 4960576c16..489930cf87 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45100-45199.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45100-45199.xml @@ -3860,7 +3860,7 @@ DIFF - + 0 200 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45300-45399.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45300-45399.xml index 7055d0aa2a..15d090ba67 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45300-45399.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45300-45399.xml @@ -5872,7 +5872,7 @@ DIFF - + 50 80 @@ -5912,7 +5912,7 @@ 100 DIFF - + 50 DIFF diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45400-45499.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45400-45499.xml index 7a3dd79c9d..db91f60fa5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45400-45499.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45400-45499.xml @@ -241,7 +241,7 @@ 50 PER - + 50 PER diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50200-50299.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50200-50299.xml index 998ce5b541..20c3bdae5a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50200-50299.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50200-50299.xml @@ -278,7 +278,7 @@ 300 - + 4 7 @@ -353,7 +353,7 @@ PER - + 2 5 @@ -1373,7 +1373,7 @@ 8 PER - + 50 DIFF @@ -1741,7 +1741,7 @@ 4 DIFF - + 50 DIFF @@ -2416,7 +2416,7 @@ DIFF - + 30 60 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50300-50399.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50300-50399.xml index 53a25e18bf..c3ff3c872a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50300-50399.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50300-50399.xml @@ -1037,7 +1037,7 @@ PER - + 0 1 @@ -1213,7 +1213,7 @@ PER - + 0 1 @@ -2072,7 +2072,7 @@ PER - + 1 3 @@ -2282,7 +2282,7 @@ DIFF - + 50 100 @@ -3943,7 +3943,7 @@ -1 0 - + 5 15 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml index a62c24e7f4..5055fccf19 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml @@ -47,7 +47,7 @@ 5 1 - + 50 DIFF @@ -60,7 +60,7 @@ 5 1 - + 50 DIFF @@ -157,7 +157,7 @@ 80 DIFF - + 80 DIFF @@ -258,7 +258,7 @@ 150 DIFF - + 150 DIFF @@ -313,7 +313,7 @@ 200 DIFF - + 200 DIFF @@ -962,7 +962,7 @@ DIFF - + 50 100 @@ -2797,7 +2797,7 @@ DIFF - + 20 50 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54000-54099.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54000-54099.xml index b3a25717ee..43c79ee057 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54000-54099.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54000-54099.xml @@ -1293,7 +1293,7 @@ PER - + 5 10 @@ -1464,7 +1464,7 @@ 10 PER - + 10 PER @@ -1591,7 +1591,7 @@ PER - + 10 11 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54100-54199.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54100-54199.xml index c49f74d06e..1a9a5afc5c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54100-54199.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54100-54199.xml @@ -103,7 +103,7 @@ 5 PER - + 200 DIFF diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54200-54299.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54200-54299.xml index 0b092953e9..328279c709 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54200-54299.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/54200-54299.xml @@ -182,7 +182,7 @@ 40 PER - + 40 PER diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55400-55499.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55400-55499.xml index f9bfc57501..3779831e42 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55400-55499.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55400-55499.xml @@ -31,7 +31,7 @@ 5 1 - + 7 PER diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55700-55799.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55700-55799.xml index ecbc9ca7f7..a89e600219 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55700-55799.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55700-55799.xml @@ -1055,7 +1055,7 @@ PER - + 0 0 @@ -2403,7 +2403,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55800-55899.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55800-55899.xml index f9882310d0..782b4f7417 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55800-55899.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55800-55899.xml @@ -484,7 +484,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80100-80199.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80100-80199.xml index 35e48fdda7..11bd390d9a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80100-80199.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80100-80199.xml @@ -674,7 +674,7 @@ icon.skill3080 P - + 100 DIFF @@ -684,7 +684,7 @@ icon.skill3080 P - + 100 DIFF @@ -694,7 +694,7 @@ icon.skill3080 P - + 100 DIFF @@ -704,7 +704,7 @@ icon.skill3080 P - + 100 DIFF @@ -714,7 +714,7 @@ icon.skill3080 P - + 100 DIFF @@ -738,7 +738,7 @@ icon.skill3080 P - + 100 DIFF @@ -748,7 +748,7 @@ icon.skill3080 P - + 100 DIFF @@ -758,7 +758,7 @@ icon.skill3080 P - + 100 DIFF @@ -768,7 +768,7 @@ icon.skill3080 P - + 100 DIFF @@ -778,7 +778,7 @@ icon.skill3080 P - + 100 DIFF @@ -788,7 +788,7 @@ icon.skill3080 P - + 100 DIFF @@ -798,7 +798,7 @@ icon.skill3080 P - + 100 DIFF @@ -808,7 +808,7 @@ icon.skill3080 P - + 100 DIFF @@ -818,7 +818,7 @@ icon.skill3080 P - + 100 DIFF @@ -828,7 +828,7 @@ icon.skill3080 P - + 100 DIFF @@ -838,7 +838,7 @@ icon.skill3080 P - + 100 DIFF @@ -848,7 +848,7 @@ icon.skill3080 P - + 100 DIFF @@ -858,7 +858,7 @@ icon.skill3080 P - + 100 DIFF @@ -868,7 +868,7 @@ icon.skill3080 P - + 100 DIFF @@ -878,7 +878,7 @@ icon.skill3080 P - + 100 DIFF @@ -888,7 +888,7 @@ icon.skill3080 P - + 100 DIFF @@ -898,7 +898,7 @@ icon.skill3080 P - + 100 DIFF @@ -908,7 +908,7 @@ icon.skill3080 P - + 100 DIFF @@ -918,7 +918,7 @@ icon.skill3080 P - + 100 DIFF @@ -928,7 +928,7 @@ icon.skill3080 P - + 100 DIFF @@ -938,7 +938,7 @@ icon.skill3080 P - + 100 DIFF @@ -948,7 +948,7 @@ icon.skill3080 P - + 100 DIFF @@ -958,7 +958,7 @@ icon.skill3080 P - + 100 DIFF @@ -968,7 +968,7 @@ icon.skill3080 P - + 100 DIFF @@ -978,7 +978,7 @@ icon.skill3080 P - + 100 DIFF @@ -988,7 +988,7 @@ icon.skill3080 P - + 100 DIFF @@ -998,7 +998,7 @@ icon.skill3080 P - + 100 DIFF @@ -1008,7 +1008,7 @@ icon.skill3080 P - + 100 DIFF @@ -1018,7 +1018,7 @@ icon.skill3080 P - + 100 DIFF @@ -1028,7 +1028,7 @@ icon.skill3080 P - + 100 DIFF @@ -1038,7 +1038,7 @@ icon.skill3080 P - + 100 DIFF @@ -1048,7 +1048,7 @@ icon.skill3080 P - + 100 DIFF @@ -1058,7 +1058,7 @@ icon.skill3080 P - + 100 DIFF @@ -1068,7 +1068,7 @@ icon.skill3080 P - + 100 DIFF diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80400-80499.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80400-80499.xml index 7614e2fc9b..fbbf2e06bd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80400-80499.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80400-80499.xml @@ -745,7 +745,7 @@ icon.skill0000 P - + -2 PER @@ -763,7 +763,7 @@ icon.skill0000 P - + -2 PER @@ -781,7 +781,7 @@ icon.skill0000 P - + -2 PER @@ -799,7 +799,7 @@ icon.skill0000 P - + -2 PER @@ -817,7 +817,7 @@ icon.skill0000 P - + -2 PER @@ -835,7 +835,7 @@ icon.skill0000 P - + -2 PER @@ -853,7 +853,7 @@ icon.skill0000 P - + -2 PER @@ -871,7 +871,7 @@ icon.skill0000 P - + -2 PER @@ -889,7 +889,7 @@ icon.skill0000 P - + -2 PER @@ -907,7 +907,7 @@ icon.skill0000 P - + -2 PER @@ -925,7 +925,7 @@ icon.skill0000 P - + -2 PER @@ -943,7 +943,7 @@ icon.skill0000 P - + -2 PER @@ -961,7 +961,7 @@ icon.skill0000 P - + -2 PER @@ -979,7 +979,7 @@ icon.skill0000 P - + -2 PER @@ -997,7 +997,7 @@ icon.skill0000 P - + -2 PER @@ -1015,7 +1015,7 @@ icon.skill0000 P - + -2 PER @@ -1033,7 +1033,7 @@ icon.skill0000 P - + -2 PER @@ -1051,7 +1051,7 @@ icon.skill0000 P - + -2 PER @@ -1069,7 +1069,7 @@ icon.skill0000 P - + -2 PER @@ -1087,7 +1087,7 @@ icon.skill0000 P - + -2 PER @@ -1105,7 +1105,7 @@ icon.skill0000 P - + -2 PER @@ -1123,7 +1123,7 @@ icon.skill0000 P - + -2 PER @@ -1141,7 +1141,7 @@ icon.skill0000 P - + -2 PER @@ -1159,7 +1159,7 @@ icon.skill0000 P - + -2 PER @@ -1177,7 +1177,7 @@ icon.skill0000 P - + -2 PER @@ -1195,7 +1195,7 @@ icon.skill0000 P - + -2 PER @@ -1213,7 +1213,7 @@ icon.skill0000 P - + -2 PER @@ -1231,7 +1231,7 @@ icon.skill0000 P - + -2 PER @@ -1249,7 +1249,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80500-80599.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80500-80599.xml index b3cbc8f6c4..ccf6e2a446 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80500-80599.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80500-80599.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -22,7 +22,7 @@ icon.skill0000 P - + -2 PER @@ -40,7 +40,7 @@ icon.skill0000 P - + -2 PER @@ -58,7 +58,7 @@ icon.skill0000 P - + -2 PER @@ -76,7 +76,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -112,7 +112,7 @@ icon.skill0000 P - + -2 PER @@ -130,7 +130,7 @@ icon.skill0000 P - + -2 PER @@ -148,7 +148,7 @@ icon.skill0000 P - + -2 PER @@ -166,7 +166,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80600-80699.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80600-80699.xml index aebdb12a9d..05683715f3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80600-80699.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80600-80699.xml @@ -114,7 +114,7 @@ icon.skill0000 P - + 10 DIFF @@ -124,7 +124,7 @@ icon.skill0000 P - + 10 DIFF @@ -134,7 +134,7 @@ icon.skill0000 P - + 10 DIFF @@ -144,7 +144,7 @@ icon.skill0000 P - + 10 DIFF @@ -154,7 +154,7 @@ icon.skill0000 P - + 10 DIFF @@ -164,7 +164,7 @@ icon.skill0000 P - + 10 DIFF @@ -174,7 +174,7 @@ icon.skill0000 P - + 10 DIFF @@ -184,7 +184,7 @@ icon.skill0000 P - + 10 DIFF @@ -194,7 +194,7 @@ icon.skill0000 P - + 10 DIFF @@ -204,7 +204,7 @@ icon.skill0000 P - + 10 DIFF @@ -214,7 +214,7 @@ icon.skill0000 P - + 10 DIFF @@ -224,7 +224,7 @@ icon.skill0000 P - + 10 DIFF @@ -234,7 +234,7 @@ icon.skill0000 P - + 10 DIFF @@ -244,7 +244,7 @@ icon.skill0000 P - + 10 DIFF @@ -254,7 +254,7 @@ icon.skill0000 P - + 10 DIFF @@ -264,7 +264,7 @@ icon.skill0000 P - + 10 DIFF @@ -274,7 +274,7 @@ icon.skill0000 P - + 10 DIFF @@ -284,7 +284,7 @@ icon.skill0000 P - + 10 DIFF @@ -294,7 +294,7 @@ icon.skill0000 P - + 10 DIFF @@ -304,7 +304,7 @@ icon.skill0000 P - + 10 DIFF diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80900-80999.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80900-80999.xml index 1f3e3db40e..c8a270a4ae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80900-80999.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/80900-80999.xml @@ -714,7 +714,7 @@ icon.skill0000 P - + -2 PER @@ -724,7 +724,7 @@ icon.skill0000 P - + -2 PER @@ -734,7 +734,7 @@ icon.skill0000 P - + -2 PER @@ -744,7 +744,7 @@ icon.skill0000 P - + -2 PER @@ -754,7 +754,7 @@ icon.skill0000 P - + -2 PER @@ -764,7 +764,7 @@ icon.skill0000 P - + -2 PER @@ -774,7 +774,7 @@ icon.skill0000 P - + -2 PER @@ -784,7 +784,7 @@ icon.skill0000 P - + -2 PER @@ -794,7 +794,7 @@ icon.skill0000 P - + -2 PER @@ -804,7 +804,7 @@ icon.skill0000 P - + -2 PER @@ -814,7 +814,7 @@ icon.skill0000 P - + -2 PER @@ -824,7 +824,7 @@ icon.skill0000 P - + -2 PER @@ -834,7 +834,7 @@ icon.skill0000 P - + -2 PER @@ -844,7 +844,7 @@ icon.skill0000 P - + -2 PER @@ -854,7 +854,7 @@ icon.skill0000 P - + -2 PER @@ -864,7 +864,7 @@ icon.skill0000 P - + -2 PER @@ -874,7 +874,7 @@ icon.skill0000 P - + -2 PER @@ -884,7 +884,7 @@ icon.skill0000 P - + -2 PER @@ -894,7 +894,7 @@ icon.skill0000 P - + -2 PER @@ -904,7 +904,7 @@ icon.skill0000 P - + -2 PER @@ -914,7 +914,7 @@ icon.skill0000 P - + -2 PER @@ -924,7 +924,7 @@ icon.skill0000 P - + -2 PER @@ -934,7 +934,7 @@ icon.skill0000 P - + -2 PER @@ -944,7 +944,7 @@ icon.skill0000 P - + -2 PER @@ -954,7 +954,7 @@ icon.skill0000 P - + -2 PER @@ -964,7 +964,7 @@ icon.skill0000 P - + -2 PER @@ -974,7 +974,7 @@ icon.skill0000 P - + -2 PER @@ -984,7 +984,7 @@ icon.skill0000 P - + -2 PER @@ -994,7 +994,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/81000-81099.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/81000-81099.xml index 19224a767c..efca55e12a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/81000-81099.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/81000-81099.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -14,7 +14,7 @@ icon.skill0000 P - + -2 PER @@ -24,7 +24,7 @@ icon.skill0000 P - + -2 PER @@ -34,7 +34,7 @@ icon.skill0000 P - + -2 PER @@ -44,7 +44,7 @@ icon.skill0000 P - + -2 PER @@ -54,7 +54,7 @@ icon.skill0000 P - + -2 PER @@ -64,7 +64,7 @@ icon.skill0000 P - + -2 PER @@ -74,7 +74,7 @@ icon.skill0000 P - + -2 PER @@ -84,7 +84,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -104,7 +104,7 @@ icon.skill0000 P - + -2 PER @@ -114,7 +114,7 @@ icon.skill0000 P - + -2 PER @@ -124,7 +124,7 @@ icon.skill0000 P - + -2 PER @@ -134,7 +134,7 @@ icon.skill0000 P - + -2 PER @@ -144,7 +144,7 @@ icon.skill0000 P - + -2 PER @@ -154,7 +154,7 @@ icon.skill0000 P - + -2 PER @@ -164,7 +164,7 @@ icon.skill0000 P - + -2 PER @@ -174,7 +174,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER @@ -194,7 +194,7 @@ icon.skill0000 P - + -2 PER @@ -204,7 +204,7 @@ icon.skill0000 P - + -2 PER @@ -214,7 +214,7 @@ icon.skill0000 P - + -2 PER @@ -224,7 +224,7 @@ icon.skill0000 P - + -2 PER @@ -234,7 +234,7 @@ icon.skill0000 P - + -2 PER @@ -244,7 +244,7 @@ icon.skill0000 P - + -2 PER @@ -254,7 +254,7 @@ icon.skill0000 P - + -2 PER @@ -264,7 +264,7 @@ icon.skill0000 P - + -2 PER @@ -274,7 +274,7 @@ icon.skill0000 P - + -2 PER @@ -284,7 +284,7 @@ icon.skill0000 P - + -2 PER @@ -294,7 +294,7 @@ icon.skill0000 P - + -2 PER @@ -304,7 +304,7 @@ icon.skill0000 P - + -2 PER @@ -914,7 +914,7 @@ icon.skill0000 P - + -2 PER @@ -924,7 +924,7 @@ icon.skill0000 P - + -2 PER @@ -934,7 +934,7 @@ icon.skill0000 P - + -2 PER @@ -944,7 +944,7 @@ icon.skill0000 P - + -2 PER @@ -954,7 +954,7 @@ icon.skill0000 P - + -2 PER @@ -964,7 +964,7 @@ icon.skill0000 P - + -2 PER @@ -974,7 +974,7 @@ icon.skill0000 P - + -2 PER @@ -984,7 +984,7 @@ icon.skill0000 P - + -2 PER @@ -994,7 +994,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/81100-81199.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/81100-81199.xml index bf05b6e265..ea6df452a4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/81100-81199.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/81100-81199.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -14,7 +14,7 @@ icon.skill0000 P - + -2 PER @@ -24,7 +24,7 @@ icon.skill0000 P - + -2 PER @@ -34,7 +34,7 @@ icon.skill0000 P - + -2 PER @@ -44,7 +44,7 @@ icon.skill0000 P - + -2 PER @@ -54,7 +54,7 @@ icon.skill0000 P - + -2 PER @@ -64,7 +64,7 @@ icon.skill0000 P - + -2 PER @@ -74,7 +74,7 @@ icon.skill0000 P - + -2 PER @@ -84,7 +84,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -104,7 +104,7 @@ icon.skill0000 P - + -2 PER @@ -114,7 +114,7 @@ icon.skill0000 P - + -2 PER @@ -124,7 +124,7 @@ icon.skill0000 P - + -2 PER @@ -134,7 +134,7 @@ icon.skill0000 P - + -2 PER @@ -144,7 +144,7 @@ icon.skill0000 P - + -2 PER @@ -154,7 +154,7 @@ icon.skill0000 P - + -2 PER @@ -164,7 +164,7 @@ icon.skill0000 P - + -2 PER @@ -174,7 +174,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER @@ -194,7 +194,7 @@ icon.skill0000 P - + -2 PER @@ -204,7 +204,7 @@ icon.skill0000 P - + -2 PER @@ -214,7 +214,7 @@ icon.skill0000 P - + -2 PER @@ -224,7 +224,7 @@ icon.skill0000 P - + -2 PER @@ -234,7 +234,7 @@ icon.skill0000 P - + -2 PER @@ -244,7 +244,7 @@ icon.skill0000 P - + -2 PER @@ -254,7 +254,7 @@ icon.skill0000 P - + -2 PER @@ -264,7 +264,7 @@ icon.skill0000 P - + -2 PER @@ -274,7 +274,7 @@ icon.skill0000 P - + -2 PER @@ -284,7 +284,7 @@ icon.skill0000 P - + -2 PER @@ -294,7 +294,7 @@ icon.skill0000 P - + -2 PER @@ -304,7 +304,7 @@ icon.skill0000 P - + -2 PER @@ -314,7 +314,7 @@ icon.skill0000 P - + -2 PER @@ -324,7 +324,7 @@ icon.skill0000 P - + -2 PER @@ -334,7 +334,7 @@ icon.skill0000 P - + -2 PER @@ -344,7 +344,7 @@ icon.skill0000 P - + -2 PER @@ -354,7 +354,7 @@ icon.skill0000 P - + -2 PER @@ -364,7 +364,7 @@ icon.skill0000 P - + -2 PER @@ -374,7 +374,7 @@ icon.skill0000 P - + -2 PER @@ -384,7 +384,7 @@ icon.skill0000 P - + -2 PER @@ -394,7 +394,7 @@ icon.skill0000 P - + -2 PER @@ -404,7 +404,7 @@ icon.skill0000 P - + -2 PER @@ -414,7 +414,7 @@ icon.skill0000 P - + -2 PER @@ -424,7 +424,7 @@ icon.skill0000 P - + -2 PER @@ -434,7 +434,7 @@ icon.skill0000 P - + -2 PER @@ -444,7 +444,7 @@ icon.skill0000 P - + -2 PER @@ -454,7 +454,7 @@ icon.skill0000 P - + -2 PER @@ -464,7 +464,7 @@ icon.skill0000 P - + -2 PER @@ -474,7 +474,7 @@ icon.skill0000 P - + -2 PER @@ -484,7 +484,7 @@ icon.skill0000 P - + -2 PER @@ -494,7 +494,7 @@ icon.skill0000 P - + -2 PER @@ -504,7 +504,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt index 3ac0597d23..2a0cf7a2b5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt @@ -89,7 +89,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -231,6 +231,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -296,7 +297,6 @@ ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. SkillBonusRange: Additional cast range for skills. (l2jmobius) -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 1e9588bdd4..a3964bdb52 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -356,8 +356,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -399,8 +399,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java index 9c46e1299a..29af698bd3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -139,8 +139,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -158,8 +158,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), ACTIVE_BONUS_EXP("activeBonusExp"), // Used to measure active skill bonus exp. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java index 4e03470d8e..ba49b48e11 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -119,7 +119,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -262,6 +262,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -329,7 +330,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/augmentation/options/34100-34199.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/augmentation/options/34100-34199.xml index 9ad6c67fda..123c685577 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/augmentation/options/34100-34199.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/augmentation/options/34100-34199.xml @@ -720,7 +720,7 @@ PER - + 5 5 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00200-00299.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00200-00299.xml index 5950098643..596ace70e1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00200-00299.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00200-00299.xml @@ -5563,7 +5563,7 @@ - + 0 4 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00400-00499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00400-00499.xml index 2aff5cbd0f..a7c9116781 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00400-00499.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00400-00499.xml @@ -1876,7 +1876,7 @@ PER - + 11 22 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39300-39399.xml index b1eaab16c2..7faa88a9c1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39300-39399.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39300-39399.xml @@ -113,7 +113,7 @@ PER - + 3 8 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45100-45199.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45100-45199.xml index 639cc6ba4a..83fbbafd91 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45100-45199.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45100-45199.xml @@ -4003,7 +4003,7 @@ DIFF - + 0 200 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45300-45399.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45300-45399.xml index 46d44daccc..c3ca28a45e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45300-45399.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45300-45399.xml @@ -5927,7 +5927,7 @@ DIFF - + 50 80 @@ -5967,7 +5967,7 @@ 100 DIFF - + 50 DIFF diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml index a26e56a1ff..257dda385d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml @@ -335,7 +335,7 @@ PER - + 0 10 @@ -516,7 +516,7 @@ 50 PER - + 50 PER @@ -733,7 +733,7 @@ SELF SINGLE - + 20 PER diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45500-45599.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45500-45599.xml index 9c0b6076a2..bf71e5af22 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45500-45599.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45500-45599.xml @@ -1221,7 +1221,7 @@ 15 PER - + 15 PER @@ -1263,7 +1263,7 @@ 15 PER - + 15 PER @@ -1305,7 +1305,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50200-50299.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50200-50299.xml index 3751d3856c..094343c8a1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50200-50299.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50200-50299.xml @@ -278,7 +278,7 @@ 300 - + 4 7 @@ -353,7 +353,7 @@ PER - + 2 5 @@ -1373,7 +1373,7 @@ 8 PER - + 50 DIFF @@ -1741,7 +1741,7 @@ 4 DIFF - + 50 DIFF @@ -3587,7 +3587,7 @@ DIFF - + 30 60 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50300-50399.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50300-50399.xml index 974ddc8396..3c349bff82 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50300-50399.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50300-50399.xml @@ -1054,7 +1054,7 @@ PER - + 0 1 @@ -1230,7 +1230,7 @@ PER - + 0 1 @@ -2098,7 +2098,7 @@ PER - + 1 3 @@ -2308,7 +2308,7 @@ DIFF - + 50 100 @@ -3969,7 +3969,7 @@ -1 0 - + 5 15 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50400-50499.xml index 99fbfd02fd..ca5c364cef 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50400-50499.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50400-50499.xml @@ -47,7 +47,7 @@ 5 1 - + 50 DIFF @@ -60,7 +60,7 @@ 5 1 - + 50 DIFF @@ -157,7 +157,7 @@ 80 DIFF - + 80 DIFF @@ -258,7 +258,7 @@ 150 DIFF - + 150 DIFF @@ -313,7 +313,7 @@ 200 DIFF - + 200 DIFF @@ -962,7 +962,7 @@ DIFF - + 50 100 @@ -2797,7 +2797,7 @@ DIFF - + 20 50 @@ -3558,7 +3558,7 @@ PER - + 100 200 @@ -3589,7 +3589,7 @@ icon.bm_core_doll_30d P - + -5 -10 @@ -4939,7 +4939,7 @@ PER - + -10 -12 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50500-50599.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50500-50599.xml index 209a14fb68..6a3b55bd68 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50500-50599.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50500-50599.xml @@ -2565,7 +2565,7 @@ INT - + -1 -2 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54000-54099.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54000-54099.xml index 0fde213c45..ad23105a9e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54000-54099.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54000-54099.xml @@ -1555,7 +1555,7 @@ PER - + 5 10 @@ -1726,7 +1726,7 @@ 10 PER - + 10 PER @@ -1853,7 +1853,7 @@ PER - + 10 11 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54100-54199.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54100-54199.xml index 265718c8df..8c1f7e3247 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54100-54199.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54100-54199.xml @@ -103,7 +103,7 @@ 5 PER - + 200 DIFF diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54200-54299.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54200-54299.xml index 09a8f7d7d0..36699249cc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54200-54299.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/54200-54299.xml @@ -182,7 +182,7 @@ 40 PER - + 40 PER diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55400-55499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55400-55499.xml index ea91227c04..2095dc1f39 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55400-55499.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55400-55499.xml @@ -31,7 +31,7 @@ 5 1 - + 7 PER diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55700-55799.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55700-55799.xml index fc74550d4c..f5c82ce5ab 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55700-55799.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55700-55799.xml @@ -1055,7 +1055,7 @@ PER - + 0 0 @@ -2403,7 +2403,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55800-55899.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55800-55899.xml index 4ab0f51f94..d31646ee5a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55800-55899.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55800-55899.xml @@ -484,7 +484,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80100-80199.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80100-80199.xml index 35e48fdda7..11bd390d9a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80100-80199.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80100-80199.xml @@ -674,7 +674,7 @@ icon.skill3080 P - + 100 DIFF @@ -684,7 +684,7 @@ icon.skill3080 P - + 100 DIFF @@ -694,7 +694,7 @@ icon.skill3080 P - + 100 DIFF @@ -704,7 +704,7 @@ icon.skill3080 P - + 100 DIFF @@ -714,7 +714,7 @@ icon.skill3080 P - + 100 DIFF @@ -738,7 +738,7 @@ icon.skill3080 P - + 100 DIFF @@ -748,7 +748,7 @@ icon.skill3080 P - + 100 DIFF @@ -758,7 +758,7 @@ icon.skill3080 P - + 100 DIFF @@ -768,7 +768,7 @@ icon.skill3080 P - + 100 DIFF @@ -778,7 +778,7 @@ icon.skill3080 P - + 100 DIFF @@ -788,7 +788,7 @@ icon.skill3080 P - + 100 DIFF @@ -798,7 +798,7 @@ icon.skill3080 P - + 100 DIFF @@ -808,7 +808,7 @@ icon.skill3080 P - + 100 DIFF @@ -818,7 +818,7 @@ icon.skill3080 P - + 100 DIFF @@ -828,7 +828,7 @@ icon.skill3080 P - + 100 DIFF @@ -838,7 +838,7 @@ icon.skill3080 P - + 100 DIFF @@ -848,7 +848,7 @@ icon.skill3080 P - + 100 DIFF @@ -858,7 +858,7 @@ icon.skill3080 P - + 100 DIFF @@ -868,7 +868,7 @@ icon.skill3080 P - + 100 DIFF @@ -878,7 +878,7 @@ icon.skill3080 P - + 100 DIFF @@ -888,7 +888,7 @@ icon.skill3080 P - + 100 DIFF @@ -898,7 +898,7 @@ icon.skill3080 P - + 100 DIFF @@ -908,7 +908,7 @@ icon.skill3080 P - + 100 DIFF @@ -918,7 +918,7 @@ icon.skill3080 P - + 100 DIFF @@ -928,7 +928,7 @@ icon.skill3080 P - + 100 DIFF @@ -938,7 +938,7 @@ icon.skill3080 P - + 100 DIFF @@ -948,7 +948,7 @@ icon.skill3080 P - + 100 DIFF @@ -958,7 +958,7 @@ icon.skill3080 P - + 100 DIFF @@ -968,7 +968,7 @@ icon.skill3080 P - + 100 DIFF @@ -978,7 +978,7 @@ icon.skill3080 P - + 100 DIFF @@ -988,7 +988,7 @@ icon.skill3080 P - + 100 DIFF @@ -998,7 +998,7 @@ icon.skill3080 P - + 100 DIFF @@ -1008,7 +1008,7 @@ icon.skill3080 P - + 100 DIFF @@ -1018,7 +1018,7 @@ icon.skill3080 P - + 100 DIFF @@ -1028,7 +1028,7 @@ icon.skill3080 P - + 100 DIFF @@ -1038,7 +1038,7 @@ icon.skill3080 P - + 100 DIFF @@ -1048,7 +1048,7 @@ icon.skill3080 P - + 100 DIFF @@ -1058,7 +1058,7 @@ icon.skill3080 P - + 100 DIFF @@ -1068,7 +1068,7 @@ icon.skill3080 P - + 100 DIFF diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80400-80499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80400-80499.xml index 7614e2fc9b..fbbf2e06bd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80400-80499.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80400-80499.xml @@ -745,7 +745,7 @@ icon.skill0000 P - + -2 PER @@ -763,7 +763,7 @@ icon.skill0000 P - + -2 PER @@ -781,7 +781,7 @@ icon.skill0000 P - + -2 PER @@ -799,7 +799,7 @@ icon.skill0000 P - + -2 PER @@ -817,7 +817,7 @@ icon.skill0000 P - + -2 PER @@ -835,7 +835,7 @@ icon.skill0000 P - + -2 PER @@ -853,7 +853,7 @@ icon.skill0000 P - + -2 PER @@ -871,7 +871,7 @@ icon.skill0000 P - + -2 PER @@ -889,7 +889,7 @@ icon.skill0000 P - + -2 PER @@ -907,7 +907,7 @@ icon.skill0000 P - + -2 PER @@ -925,7 +925,7 @@ icon.skill0000 P - + -2 PER @@ -943,7 +943,7 @@ icon.skill0000 P - + -2 PER @@ -961,7 +961,7 @@ icon.skill0000 P - + -2 PER @@ -979,7 +979,7 @@ icon.skill0000 P - + -2 PER @@ -997,7 +997,7 @@ icon.skill0000 P - + -2 PER @@ -1015,7 +1015,7 @@ icon.skill0000 P - + -2 PER @@ -1033,7 +1033,7 @@ icon.skill0000 P - + -2 PER @@ -1051,7 +1051,7 @@ icon.skill0000 P - + -2 PER @@ -1069,7 +1069,7 @@ icon.skill0000 P - + -2 PER @@ -1087,7 +1087,7 @@ icon.skill0000 P - + -2 PER @@ -1105,7 +1105,7 @@ icon.skill0000 P - + -2 PER @@ -1123,7 +1123,7 @@ icon.skill0000 P - + -2 PER @@ -1141,7 +1141,7 @@ icon.skill0000 P - + -2 PER @@ -1159,7 +1159,7 @@ icon.skill0000 P - + -2 PER @@ -1177,7 +1177,7 @@ icon.skill0000 P - + -2 PER @@ -1195,7 +1195,7 @@ icon.skill0000 P - + -2 PER @@ -1213,7 +1213,7 @@ icon.skill0000 P - + -2 PER @@ -1231,7 +1231,7 @@ icon.skill0000 P - + -2 PER @@ -1249,7 +1249,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80500-80599.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80500-80599.xml index b3cbc8f6c4..ccf6e2a446 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80500-80599.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80500-80599.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -22,7 +22,7 @@ icon.skill0000 P - + -2 PER @@ -40,7 +40,7 @@ icon.skill0000 P - + -2 PER @@ -58,7 +58,7 @@ icon.skill0000 P - + -2 PER @@ -76,7 +76,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -112,7 +112,7 @@ icon.skill0000 P - + -2 PER @@ -130,7 +130,7 @@ icon.skill0000 P - + -2 PER @@ -148,7 +148,7 @@ icon.skill0000 P - + -2 PER @@ -166,7 +166,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80600-80699.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80600-80699.xml index aebdb12a9d..05683715f3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80600-80699.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80600-80699.xml @@ -114,7 +114,7 @@ icon.skill0000 P - + 10 DIFF @@ -124,7 +124,7 @@ icon.skill0000 P - + 10 DIFF @@ -134,7 +134,7 @@ icon.skill0000 P - + 10 DIFF @@ -144,7 +144,7 @@ icon.skill0000 P - + 10 DIFF @@ -154,7 +154,7 @@ icon.skill0000 P - + 10 DIFF @@ -164,7 +164,7 @@ icon.skill0000 P - + 10 DIFF @@ -174,7 +174,7 @@ icon.skill0000 P - + 10 DIFF @@ -184,7 +184,7 @@ icon.skill0000 P - + 10 DIFF @@ -194,7 +194,7 @@ icon.skill0000 P - + 10 DIFF @@ -204,7 +204,7 @@ icon.skill0000 P - + 10 DIFF @@ -214,7 +214,7 @@ icon.skill0000 P - + 10 DIFF @@ -224,7 +224,7 @@ icon.skill0000 P - + 10 DIFF @@ -234,7 +234,7 @@ icon.skill0000 P - + 10 DIFF @@ -244,7 +244,7 @@ icon.skill0000 P - + 10 DIFF @@ -254,7 +254,7 @@ icon.skill0000 P - + 10 DIFF @@ -264,7 +264,7 @@ icon.skill0000 P - + 10 DIFF @@ -274,7 +274,7 @@ icon.skill0000 P - + 10 DIFF @@ -284,7 +284,7 @@ icon.skill0000 P - + 10 DIFF @@ -294,7 +294,7 @@ icon.skill0000 P - + 10 DIFF @@ -304,7 +304,7 @@ icon.skill0000 P - + 10 DIFF diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80900-80999.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80900-80999.xml index 1f3e3db40e..c8a270a4ae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80900-80999.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/80900-80999.xml @@ -714,7 +714,7 @@ icon.skill0000 P - + -2 PER @@ -724,7 +724,7 @@ icon.skill0000 P - + -2 PER @@ -734,7 +734,7 @@ icon.skill0000 P - + -2 PER @@ -744,7 +744,7 @@ icon.skill0000 P - + -2 PER @@ -754,7 +754,7 @@ icon.skill0000 P - + -2 PER @@ -764,7 +764,7 @@ icon.skill0000 P - + -2 PER @@ -774,7 +774,7 @@ icon.skill0000 P - + -2 PER @@ -784,7 +784,7 @@ icon.skill0000 P - + -2 PER @@ -794,7 +794,7 @@ icon.skill0000 P - + -2 PER @@ -804,7 +804,7 @@ icon.skill0000 P - + -2 PER @@ -814,7 +814,7 @@ icon.skill0000 P - + -2 PER @@ -824,7 +824,7 @@ icon.skill0000 P - + -2 PER @@ -834,7 +834,7 @@ icon.skill0000 P - + -2 PER @@ -844,7 +844,7 @@ icon.skill0000 P - + -2 PER @@ -854,7 +854,7 @@ icon.skill0000 P - + -2 PER @@ -864,7 +864,7 @@ icon.skill0000 P - + -2 PER @@ -874,7 +874,7 @@ icon.skill0000 P - + -2 PER @@ -884,7 +884,7 @@ icon.skill0000 P - + -2 PER @@ -894,7 +894,7 @@ icon.skill0000 P - + -2 PER @@ -904,7 +904,7 @@ icon.skill0000 P - + -2 PER @@ -914,7 +914,7 @@ icon.skill0000 P - + -2 PER @@ -924,7 +924,7 @@ icon.skill0000 P - + -2 PER @@ -934,7 +934,7 @@ icon.skill0000 P - + -2 PER @@ -944,7 +944,7 @@ icon.skill0000 P - + -2 PER @@ -954,7 +954,7 @@ icon.skill0000 P - + -2 PER @@ -964,7 +964,7 @@ icon.skill0000 P - + -2 PER @@ -974,7 +974,7 @@ icon.skill0000 P - + -2 PER @@ -984,7 +984,7 @@ icon.skill0000 P - + -2 PER @@ -994,7 +994,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81000-81099.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81000-81099.xml index 19224a767c..efca55e12a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81000-81099.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81000-81099.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -14,7 +14,7 @@ icon.skill0000 P - + -2 PER @@ -24,7 +24,7 @@ icon.skill0000 P - + -2 PER @@ -34,7 +34,7 @@ icon.skill0000 P - + -2 PER @@ -44,7 +44,7 @@ icon.skill0000 P - + -2 PER @@ -54,7 +54,7 @@ icon.skill0000 P - + -2 PER @@ -64,7 +64,7 @@ icon.skill0000 P - + -2 PER @@ -74,7 +74,7 @@ icon.skill0000 P - + -2 PER @@ -84,7 +84,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -104,7 +104,7 @@ icon.skill0000 P - + -2 PER @@ -114,7 +114,7 @@ icon.skill0000 P - + -2 PER @@ -124,7 +124,7 @@ icon.skill0000 P - + -2 PER @@ -134,7 +134,7 @@ icon.skill0000 P - + -2 PER @@ -144,7 +144,7 @@ icon.skill0000 P - + -2 PER @@ -154,7 +154,7 @@ icon.skill0000 P - + -2 PER @@ -164,7 +164,7 @@ icon.skill0000 P - + -2 PER @@ -174,7 +174,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER @@ -194,7 +194,7 @@ icon.skill0000 P - + -2 PER @@ -204,7 +204,7 @@ icon.skill0000 P - + -2 PER @@ -214,7 +214,7 @@ icon.skill0000 P - + -2 PER @@ -224,7 +224,7 @@ icon.skill0000 P - + -2 PER @@ -234,7 +234,7 @@ icon.skill0000 P - + -2 PER @@ -244,7 +244,7 @@ icon.skill0000 P - + -2 PER @@ -254,7 +254,7 @@ icon.skill0000 P - + -2 PER @@ -264,7 +264,7 @@ icon.skill0000 P - + -2 PER @@ -274,7 +274,7 @@ icon.skill0000 P - + -2 PER @@ -284,7 +284,7 @@ icon.skill0000 P - + -2 PER @@ -294,7 +294,7 @@ icon.skill0000 P - + -2 PER @@ -304,7 +304,7 @@ icon.skill0000 P - + -2 PER @@ -914,7 +914,7 @@ icon.skill0000 P - + -2 PER @@ -924,7 +924,7 @@ icon.skill0000 P - + -2 PER @@ -934,7 +934,7 @@ icon.skill0000 P - + -2 PER @@ -944,7 +944,7 @@ icon.skill0000 P - + -2 PER @@ -954,7 +954,7 @@ icon.skill0000 P - + -2 PER @@ -964,7 +964,7 @@ icon.skill0000 P - + -2 PER @@ -974,7 +974,7 @@ icon.skill0000 P - + -2 PER @@ -984,7 +984,7 @@ icon.skill0000 P - + -2 PER @@ -994,7 +994,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81100-81199.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81100-81199.xml index bf05b6e265..ea6df452a4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81100-81199.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81100-81199.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -14,7 +14,7 @@ icon.skill0000 P - + -2 PER @@ -24,7 +24,7 @@ icon.skill0000 P - + -2 PER @@ -34,7 +34,7 @@ icon.skill0000 P - + -2 PER @@ -44,7 +44,7 @@ icon.skill0000 P - + -2 PER @@ -54,7 +54,7 @@ icon.skill0000 P - + -2 PER @@ -64,7 +64,7 @@ icon.skill0000 P - + -2 PER @@ -74,7 +74,7 @@ icon.skill0000 P - + -2 PER @@ -84,7 +84,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -104,7 +104,7 @@ icon.skill0000 P - + -2 PER @@ -114,7 +114,7 @@ icon.skill0000 P - + -2 PER @@ -124,7 +124,7 @@ icon.skill0000 P - + -2 PER @@ -134,7 +134,7 @@ icon.skill0000 P - + -2 PER @@ -144,7 +144,7 @@ icon.skill0000 P - + -2 PER @@ -154,7 +154,7 @@ icon.skill0000 P - + -2 PER @@ -164,7 +164,7 @@ icon.skill0000 P - + -2 PER @@ -174,7 +174,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER @@ -194,7 +194,7 @@ icon.skill0000 P - + -2 PER @@ -204,7 +204,7 @@ icon.skill0000 P - + -2 PER @@ -214,7 +214,7 @@ icon.skill0000 P - + -2 PER @@ -224,7 +224,7 @@ icon.skill0000 P - + -2 PER @@ -234,7 +234,7 @@ icon.skill0000 P - + -2 PER @@ -244,7 +244,7 @@ icon.skill0000 P - + -2 PER @@ -254,7 +254,7 @@ icon.skill0000 P - + -2 PER @@ -264,7 +264,7 @@ icon.skill0000 P - + -2 PER @@ -274,7 +274,7 @@ icon.skill0000 P - + -2 PER @@ -284,7 +284,7 @@ icon.skill0000 P - + -2 PER @@ -294,7 +294,7 @@ icon.skill0000 P - + -2 PER @@ -304,7 +304,7 @@ icon.skill0000 P - + -2 PER @@ -314,7 +314,7 @@ icon.skill0000 P - + -2 PER @@ -324,7 +324,7 @@ icon.skill0000 P - + -2 PER @@ -334,7 +334,7 @@ icon.skill0000 P - + -2 PER @@ -344,7 +344,7 @@ icon.skill0000 P - + -2 PER @@ -354,7 +354,7 @@ icon.skill0000 P - + -2 PER @@ -364,7 +364,7 @@ icon.skill0000 P - + -2 PER @@ -374,7 +374,7 @@ icon.skill0000 P - + -2 PER @@ -384,7 +384,7 @@ icon.skill0000 P - + -2 PER @@ -394,7 +394,7 @@ icon.skill0000 P - + -2 PER @@ -404,7 +404,7 @@ icon.skill0000 P - + -2 PER @@ -414,7 +414,7 @@ icon.skill0000 P - + -2 PER @@ -424,7 +424,7 @@ icon.skill0000 P - + -2 PER @@ -434,7 +434,7 @@ icon.skill0000 P - + -2 PER @@ -444,7 +444,7 @@ icon.skill0000 P - + -2 PER @@ -454,7 +454,7 @@ icon.skill0000 P - + -2 PER @@ -464,7 +464,7 @@ icon.skill0000 P - + -2 PER @@ -474,7 +474,7 @@ icon.skill0000 P - + -2 PER @@ -484,7 +484,7 @@ icon.skill0000 P - + -2 PER @@ -494,7 +494,7 @@ icon.skill0000 P - + -2 PER @@ -504,7 +504,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81800-81899.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81800-81899.xml index 608b894e0a..daf6f38f0b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81800-81899.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/81800-81899.xml @@ -501,7 +501,7 @@ icon.skill0000 P - + -2 PER @@ -511,7 +511,7 @@ icon.skill0000 P - + -2 PER @@ -521,7 +521,7 @@ icon.skill0000 P - + -2 PER @@ -775,7 +775,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/82000-82099.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/82000-82099.xml index b579c83176..48a9d673c0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/82000-82099.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/82000-82099.xml @@ -597,7 +597,7 @@ P - + 0.5 0.7 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt index c29b17c6ee..393569e8d2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt @@ -89,7 +89,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -232,6 +232,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -297,7 +298,6 @@ ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. SkillBonusRange: Additional cast range for skills. (l2jmobius) -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 1e9588bdd4..a3964bdb52 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -356,8 +356,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -399,8 +399,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java index 9c46e1299a..29af698bd3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -139,8 +139,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -158,8 +158,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), ACTIVE_BONUS_EXP("activeBonusExp"), // Used to measure active skill bonus exp. diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java index 84fedc255c..1b1d3567bc 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -119,7 +119,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -264,6 +264,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -332,7 +333,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/augmentation/options/34100-34199.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/augmentation/options/34100-34199.xml index 9ad6c67fda..123c685577 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/augmentation/options/34100-34199.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/augmentation/options/34100-34199.xml @@ -720,7 +720,7 @@ PER - + 5 5 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00200-00299.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00200-00299.xml index 8c54206b83..f6c1e465aa 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00200-00299.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00200-00299.xml @@ -5563,7 +5563,7 @@ - + 0 4 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00400-00499.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00400-00499.xml index e2f80ccf09..e87afcb3f1 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00400-00499.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/00400-00499.xml @@ -1876,7 +1876,7 @@ PER - + 11 22 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/39300-39399.xml index c791c7d34a..e9ad8f881c 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/39300-39399.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/39300-39399.xml @@ -133,7 +133,7 @@ PER - + 3 8 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45100-45199.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45100-45199.xml index 02a6ac1fb2..5d6d798e22 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45100-45199.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45100-45199.xml @@ -4038,7 +4038,7 @@ DIFF - + 0 200 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45300-45399.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45300-45399.xml index 4c637788c6..e1dd12c9a6 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45300-45399.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45300-45399.xml @@ -5927,7 +5927,7 @@ DIFF - + 50 80 @@ -5967,7 +5967,7 @@ 100 DIFF - + 50 DIFF diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45400-45499.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45400-45499.xml index 1aae6f445c..bf949bf8b0 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45400-45499.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45400-45499.xml @@ -335,7 +335,7 @@ PER - + 0 10 @@ -516,7 +516,7 @@ 50 PER - + 50 PER @@ -733,7 +733,7 @@ SELF SINGLE - + 20 PER diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45500-45599.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45500-45599.xml index 4c9b44bbac..582f499d4d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45500-45599.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/45500-45599.xml @@ -1202,7 +1202,7 @@ 15 PER - + 15 PER @@ -1244,7 +1244,7 @@ 15 PER - + 15 PER @@ -1286,7 +1286,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50200-50299.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50200-50299.xml index 3751d3856c..094343c8a1 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50200-50299.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50200-50299.xml @@ -278,7 +278,7 @@ 300 - + 4 7 @@ -353,7 +353,7 @@ PER - + 2 5 @@ -1373,7 +1373,7 @@ 8 PER - + 50 DIFF @@ -1741,7 +1741,7 @@ 4 DIFF - + 50 DIFF @@ -3587,7 +3587,7 @@ DIFF - + 30 60 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50300-50399.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50300-50399.xml index 483ad1c834..d9c27df965 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50300-50399.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50300-50399.xml @@ -1054,7 +1054,7 @@ PER - + 0 1 @@ -1230,7 +1230,7 @@ PER - + 0 1 @@ -2098,7 +2098,7 @@ PER - + 1 3 @@ -2308,7 +2308,7 @@ DIFF - + 50 100 @@ -3969,7 +3969,7 @@ -1 0 - + 5 15 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50400-50499.xml index 699529158c..0afd341f64 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50400-50499.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50400-50499.xml @@ -47,7 +47,7 @@ 5 1 - + 50 DIFF @@ -60,7 +60,7 @@ 5 1 - + 50 DIFF @@ -157,7 +157,7 @@ 80 DIFF - + 80 DIFF @@ -258,7 +258,7 @@ 150 DIFF - + 150 DIFF @@ -313,7 +313,7 @@ 200 DIFF - + 200 DIFF @@ -962,7 +962,7 @@ DIFF - + 50 100 @@ -2797,7 +2797,7 @@ DIFF - + 20 50 @@ -3570,7 +3570,7 @@ DIFF - + 100 200 @@ -3607,7 +3607,7 @@ icon.bm_core_doll_30d P - + -5 -10 @@ -4957,7 +4957,7 @@ PER - + -10 -12 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50500-50599.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50500-50599.xml index 3d009cff5a..116d048751 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50500-50599.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/50500-50599.xml @@ -2565,7 +2565,7 @@ INT - + -1 -2 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54000-54099.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54000-54099.xml index d8cab0bd03..ceaf98a78d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54000-54099.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54000-54099.xml @@ -1555,7 +1555,7 @@ PER - + 5 10 @@ -1726,7 +1726,7 @@ 10 PER - + 10 PER @@ -1853,7 +1853,7 @@ PER - + 10 11 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54100-54199.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54100-54199.xml index 265718c8df..8c1f7e3247 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54100-54199.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54100-54199.xml @@ -103,7 +103,7 @@ 5 PER - + 200 DIFF diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54200-54299.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54200-54299.xml index 244eef6954..7ded6f1583 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54200-54299.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/54200-54299.xml @@ -182,7 +182,7 @@ 40 PER - + 40 PER diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55400-55499.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55400-55499.xml index ea91227c04..2095dc1f39 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55400-55499.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55400-55499.xml @@ -31,7 +31,7 @@ 5 1 - + 7 PER diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55700-55799.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55700-55799.xml index fc74550d4c..f5c82ce5ab 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55700-55799.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55700-55799.xml @@ -1055,7 +1055,7 @@ PER - + 0 0 @@ -2403,7 +2403,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55800-55899.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55800-55899.xml index 4ab0f51f94..d31646ee5a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55800-55899.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/55800-55899.xml @@ -484,7 +484,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80100-80199.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80100-80199.xml index 35e48fdda7..11bd390d9a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80100-80199.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80100-80199.xml @@ -674,7 +674,7 @@ icon.skill3080 P - + 100 DIFF @@ -684,7 +684,7 @@ icon.skill3080 P - + 100 DIFF @@ -694,7 +694,7 @@ icon.skill3080 P - + 100 DIFF @@ -704,7 +704,7 @@ icon.skill3080 P - + 100 DIFF @@ -714,7 +714,7 @@ icon.skill3080 P - + 100 DIFF @@ -738,7 +738,7 @@ icon.skill3080 P - + 100 DIFF @@ -748,7 +748,7 @@ icon.skill3080 P - + 100 DIFF @@ -758,7 +758,7 @@ icon.skill3080 P - + 100 DIFF @@ -768,7 +768,7 @@ icon.skill3080 P - + 100 DIFF @@ -778,7 +778,7 @@ icon.skill3080 P - + 100 DIFF @@ -788,7 +788,7 @@ icon.skill3080 P - + 100 DIFF @@ -798,7 +798,7 @@ icon.skill3080 P - + 100 DIFF @@ -808,7 +808,7 @@ icon.skill3080 P - + 100 DIFF @@ -818,7 +818,7 @@ icon.skill3080 P - + 100 DIFF @@ -828,7 +828,7 @@ icon.skill3080 P - + 100 DIFF @@ -838,7 +838,7 @@ icon.skill3080 P - + 100 DIFF @@ -848,7 +848,7 @@ icon.skill3080 P - + 100 DIFF @@ -858,7 +858,7 @@ icon.skill3080 P - + 100 DIFF @@ -868,7 +868,7 @@ icon.skill3080 P - + 100 DIFF @@ -878,7 +878,7 @@ icon.skill3080 P - + 100 DIFF @@ -888,7 +888,7 @@ icon.skill3080 P - + 100 DIFF @@ -898,7 +898,7 @@ icon.skill3080 P - + 100 DIFF @@ -908,7 +908,7 @@ icon.skill3080 P - + 100 DIFF @@ -918,7 +918,7 @@ icon.skill3080 P - + 100 DIFF @@ -928,7 +928,7 @@ icon.skill3080 P - + 100 DIFF @@ -938,7 +938,7 @@ icon.skill3080 P - + 100 DIFF @@ -948,7 +948,7 @@ icon.skill3080 P - + 100 DIFF @@ -958,7 +958,7 @@ icon.skill3080 P - + 100 DIFF @@ -968,7 +968,7 @@ icon.skill3080 P - + 100 DIFF @@ -978,7 +978,7 @@ icon.skill3080 P - + 100 DIFF @@ -988,7 +988,7 @@ icon.skill3080 P - + 100 DIFF @@ -998,7 +998,7 @@ icon.skill3080 P - + 100 DIFF @@ -1008,7 +1008,7 @@ icon.skill3080 P - + 100 DIFF @@ -1018,7 +1018,7 @@ icon.skill3080 P - + 100 DIFF @@ -1028,7 +1028,7 @@ icon.skill3080 P - + 100 DIFF @@ -1038,7 +1038,7 @@ icon.skill3080 P - + 100 DIFF @@ -1048,7 +1048,7 @@ icon.skill3080 P - + 100 DIFF @@ -1058,7 +1058,7 @@ icon.skill3080 P - + 100 DIFF @@ -1068,7 +1068,7 @@ icon.skill3080 P - + 100 DIFF diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80400-80499.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80400-80499.xml index 7614e2fc9b..fbbf2e06bd 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80400-80499.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80400-80499.xml @@ -745,7 +745,7 @@ icon.skill0000 P - + -2 PER @@ -763,7 +763,7 @@ icon.skill0000 P - + -2 PER @@ -781,7 +781,7 @@ icon.skill0000 P - + -2 PER @@ -799,7 +799,7 @@ icon.skill0000 P - + -2 PER @@ -817,7 +817,7 @@ icon.skill0000 P - + -2 PER @@ -835,7 +835,7 @@ icon.skill0000 P - + -2 PER @@ -853,7 +853,7 @@ icon.skill0000 P - + -2 PER @@ -871,7 +871,7 @@ icon.skill0000 P - + -2 PER @@ -889,7 +889,7 @@ icon.skill0000 P - + -2 PER @@ -907,7 +907,7 @@ icon.skill0000 P - + -2 PER @@ -925,7 +925,7 @@ icon.skill0000 P - + -2 PER @@ -943,7 +943,7 @@ icon.skill0000 P - + -2 PER @@ -961,7 +961,7 @@ icon.skill0000 P - + -2 PER @@ -979,7 +979,7 @@ icon.skill0000 P - + -2 PER @@ -997,7 +997,7 @@ icon.skill0000 P - + -2 PER @@ -1015,7 +1015,7 @@ icon.skill0000 P - + -2 PER @@ -1033,7 +1033,7 @@ icon.skill0000 P - + -2 PER @@ -1051,7 +1051,7 @@ icon.skill0000 P - + -2 PER @@ -1069,7 +1069,7 @@ icon.skill0000 P - + -2 PER @@ -1087,7 +1087,7 @@ icon.skill0000 P - + -2 PER @@ -1105,7 +1105,7 @@ icon.skill0000 P - + -2 PER @@ -1123,7 +1123,7 @@ icon.skill0000 P - + -2 PER @@ -1141,7 +1141,7 @@ icon.skill0000 P - + -2 PER @@ -1159,7 +1159,7 @@ icon.skill0000 P - + -2 PER @@ -1177,7 +1177,7 @@ icon.skill0000 P - + -2 PER @@ -1195,7 +1195,7 @@ icon.skill0000 P - + -2 PER @@ -1213,7 +1213,7 @@ icon.skill0000 P - + -2 PER @@ -1231,7 +1231,7 @@ icon.skill0000 P - + -2 PER @@ -1249,7 +1249,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80500-80599.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80500-80599.xml index b3cbc8f6c4..ccf6e2a446 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80500-80599.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80500-80599.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -22,7 +22,7 @@ icon.skill0000 P - + -2 PER @@ -40,7 +40,7 @@ icon.skill0000 P - + -2 PER @@ -58,7 +58,7 @@ icon.skill0000 P - + -2 PER @@ -76,7 +76,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -112,7 +112,7 @@ icon.skill0000 P - + -2 PER @@ -130,7 +130,7 @@ icon.skill0000 P - + -2 PER @@ -148,7 +148,7 @@ icon.skill0000 P - + -2 PER @@ -166,7 +166,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80600-80699.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80600-80699.xml index aebdb12a9d..05683715f3 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80600-80699.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80600-80699.xml @@ -114,7 +114,7 @@ icon.skill0000 P - + 10 DIFF @@ -124,7 +124,7 @@ icon.skill0000 P - + 10 DIFF @@ -134,7 +134,7 @@ icon.skill0000 P - + 10 DIFF @@ -144,7 +144,7 @@ icon.skill0000 P - + 10 DIFF @@ -154,7 +154,7 @@ icon.skill0000 P - + 10 DIFF @@ -164,7 +164,7 @@ icon.skill0000 P - + 10 DIFF @@ -174,7 +174,7 @@ icon.skill0000 P - + 10 DIFF @@ -184,7 +184,7 @@ icon.skill0000 P - + 10 DIFF @@ -194,7 +194,7 @@ icon.skill0000 P - + 10 DIFF @@ -204,7 +204,7 @@ icon.skill0000 P - + 10 DIFF @@ -214,7 +214,7 @@ icon.skill0000 P - + 10 DIFF @@ -224,7 +224,7 @@ icon.skill0000 P - + 10 DIFF @@ -234,7 +234,7 @@ icon.skill0000 P - + 10 DIFF @@ -244,7 +244,7 @@ icon.skill0000 P - + 10 DIFF @@ -254,7 +254,7 @@ icon.skill0000 P - + 10 DIFF @@ -264,7 +264,7 @@ icon.skill0000 P - + 10 DIFF @@ -274,7 +274,7 @@ icon.skill0000 P - + 10 DIFF @@ -284,7 +284,7 @@ icon.skill0000 P - + 10 DIFF @@ -294,7 +294,7 @@ icon.skill0000 P - + 10 DIFF @@ -304,7 +304,7 @@ icon.skill0000 P - + 10 DIFF diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80900-80999.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80900-80999.xml index 1f3e3db40e..c8a270a4ae 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80900-80999.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/80900-80999.xml @@ -714,7 +714,7 @@ icon.skill0000 P - + -2 PER @@ -724,7 +724,7 @@ icon.skill0000 P - + -2 PER @@ -734,7 +734,7 @@ icon.skill0000 P - + -2 PER @@ -744,7 +744,7 @@ icon.skill0000 P - + -2 PER @@ -754,7 +754,7 @@ icon.skill0000 P - + -2 PER @@ -764,7 +764,7 @@ icon.skill0000 P - + -2 PER @@ -774,7 +774,7 @@ icon.skill0000 P - + -2 PER @@ -784,7 +784,7 @@ icon.skill0000 P - + -2 PER @@ -794,7 +794,7 @@ icon.skill0000 P - + -2 PER @@ -804,7 +804,7 @@ icon.skill0000 P - + -2 PER @@ -814,7 +814,7 @@ icon.skill0000 P - + -2 PER @@ -824,7 +824,7 @@ icon.skill0000 P - + -2 PER @@ -834,7 +834,7 @@ icon.skill0000 P - + -2 PER @@ -844,7 +844,7 @@ icon.skill0000 P - + -2 PER @@ -854,7 +854,7 @@ icon.skill0000 P - + -2 PER @@ -864,7 +864,7 @@ icon.skill0000 P - + -2 PER @@ -874,7 +874,7 @@ icon.skill0000 P - + -2 PER @@ -884,7 +884,7 @@ icon.skill0000 P - + -2 PER @@ -894,7 +894,7 @@ icon.skill0000 P - + -2 PER @@ -904,7 +904,7 @@ icon.skill0000 P - + -2 PER @@ -914,7 +914,7 @@ icon.skill0000 P - + -2 PER @@ -924,7 +924,7 @@ icon.skill0000 P - + -2 PER @@ -934,7 +934,7 @@ icon.skill0000 P - + -2 PER @@ -944,7 +944,7 @@ icon.skill0000 P - + -2 PER @@ -954,7 +954,7 @@ icon.skill0000 P - + -2 PER @@ -964,7 +964,7 @@ icon.skill0000 P - + -2 PER @@ -974,7 +974,7 @@ icon.skill0000 P - + -2 PER @@ -984,7 +984,7 @@ icon.skill0000 P - + -2 PER @@ -994,7 +994,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81000-81099.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81000-81099.xml index 19224a767c..efca55e12a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81000-81099.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81000-81099.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -14,7 +14,7 @@ icon.skill0000 P - + -2 PER @@ -24,7 +24,7 @@ icon.skill0000 P - + -2 PER @@ -34,7 +34,7 @@ icon.skill0000 P - + -2 PER @@ -44,7 +44,7 @@ icon.skill0000 P - + -2 PER @@ -54,7 +54,7 @@ icon.skill0000 P - + -2 PER @@ -64,7 +64,7 @@ icon.skill0000 P - + -2 PER @@ -74,7 +74,7 @@ icon.skill0000 P - + -2 PER @@ -84,7 +84,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -104,7 +104,7 @@ icon.skill0000 P - + -2 PER @@ -114,7 +114,7 @@ icon.skill0000 P - + -2 PER @@ -124,7 +124,7 @@ icon.skill0000 P - + -2 PER @@ -134,7 +134,7 @@ icon.skill0000 P - + -2 PER @@ -144,7 +144,7 @@ icon.skill0000 P - + -2 PER @@ -154,7 +154,7 @@ icon.skill0000 P - + -2 PER @@ -164,7 +164,7 @@ icon.skill0000 P - + -2 PER @@ -174,7 +174,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER @@ -194,7 +194,7 @@ icon.skill0000 P - + -2 PER @@ -204,7 +204,7 @@ icon.skill0000 P - + -2 PER @@ -214,7 +214,7 @@ icon.skill0000 P - + -2 PER @@ -224,7 +224,7 @@ icon.skill0000 P - + -2 PER @@ -234,7 +234,7 @@ icon.skill0000 P - + -2 PER @@ -244,7 +244,7 @@ icon.skill0000 P - + -2 PER @@ -254,7 +254,7 @@ icon.skill0000 P - + -2 PER @@ -264,7 +264,7 @@ icon.skill0000 P - + -2 PER @@ -274,7 +274,7 @@ icon.skill0000 P - + -2 PER @@ -284,7 +284,7 @@ icon.skill0000 P - + -2 PER @@ -294,7 +294,7 @@ icon.skill0000 P - + -2 PER @@ -304,7 +304,7 @@ icon.skill0000 P - + -2 PER @@ -914,7 +914,7 @@ icon.skill0000 P - + -2 PER @@ -924,7 +924,7 @@ icon.skill0000 P - + -2 PER @@ -934,7 +934,7 @@ icon.skill0000 P - + -2 PER @@ -944,7 +944,7 @@ icon.skill0000 P - + -2 PER @@ -954,7 +954,7 @@ icon.skill0000 P - + -2 PER @@ -964,7 +964,7 @@ icon.skill0000 P - + -2 PER @@ -974,7 +974,7 @@ icon.skill0000 P - + -2 PER @@ -984,7 +984,7 @@ icon.skill0000 P - + -2 PER @@ -994,7 +994,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81100-81199.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81100-81199.xml index bf05b6e265..ea6df452a4 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81100-81199.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81100-81199.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -14,7 +14,7 @@ icon.skill0000 P - + -2 PER @@ -24,7 +24,7 @@ icon.skill0000 P - + -2 PER @@ -34,7 +34,7 @@ icon.skill0000 P - + -2 PER @@ -44,7 +44,7 @@ icon.skill0000 P - + -2 PER @@ -54,7 +54,7 @@ icon.skill0000 P - + -2 PER @@ -64,7 +64,7 @@ icon.skill0000 P - + -2 PER @@ -74,7 +74,7 @@ icon.skill0000 P - + -2 PER @@ -84,7 +84,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -104,7 +104,7 @@ icon.skill0000 P - + -2 PER @@ -114,7 +114,7 @@ icon.skill0000 P - + -2 PER @@ -124,7 +124,7 @@ icon.skill0000 P - + -2 PER @@ -134,7 +134,7 @@ icon.skill0000 P - + -2 PER @@ -144,7 +144,7 @@ icon.skill0000 P - + -2 PER @@ -154,7 +154,7 @@ icon.skill0000 P - + -2 PER @@ -164,7 +164,7 @@ icon.skill0000 P - + -2 PER @@ -174,7 +174,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER @@ -194,7 +194,7 @@ icon.skill0000 P - + -2 PER @@ -204,7 +204,7 @@ icon.skill0000 P - + -2 PER @@ -214,7 +214,7 @@ icon.skill0000 P - + -2 PER @@ -224,7 +224,7 @@ icon.skill0000 P - + -2 PER @@ -234,7 +234,7 @@ icon.skill0000 P - + -2 PER @@ -244,7 +244,7 @@ icon.skill0000 P - + -2 PER @@ -254,7 +254,7 @@ icon.skill0000 P - + -2 PER @@ -264,7 +264,7 @@ icon.skill0000 P - + -2 PER @@ -274,7 +274,7 @@ icon.skill0000 P - + -2 PER @@ -284,7 +284,7 @@ icon.skill0000 P - + -2 PER @@ -294,7 +294,7 @@ icon.skill0000 P - + -2 PER @@ -304,7 +304,7 @@ icon.skill0000 P - + -2 PER @@ -314,7 +314,7 @@ icon.skill0000 P - + -2 PER @@ -324,7 +324,7 @@ icon.skill0000 P - + -2 PER @@ -334,7 +334,7 @@ icon.skill0000 P - + -2 PER @@ -344,7 +344,7 @@ icon.skill0000 P - + -2 PER @@ -354,7 +354,7 @@ icon.skill0000 P - + -2 PER @@ -364,7 +364,7 @@ icon.skill0000 P - + -2 PER @@ -374,7 +374,7 @@ icon.skill0000 P - + -2 PER @@ -384,7 +384,7 @@ icon.skill0000 P - + -2 PER @@ -394,7 +394,7 @@ icon.skill0000 P - + -2 PER @@ -404,7 +404,7 @@ icon.skill0000 P - + -2 PER @@ -414,7 +414,7 @@ icon.skill0000 P - + -2 PER @@ -424,7 +424,7 @@ icon.skill0000 P - + -2 PER @@ -434,7 +434,7 @@ icon.skill0000 P - + -2 PER @@ -444,7 +444,7 @@ icon.skill0000 P - + -2 PER @@ -454,7 +454,7 @@ icon.skill0000 P - + -2 PER @@ -464,7 +464,7 @@ icon.skill0000 P - + -2 PER @@ -474,7 +474,7 @@ icon.skill0000 P - + -2 PER @@ -484,7 +484,7 @@ icon.skill0000 P - + -2 PER @@ -494,7 +494,7 @@ icon.skill0000 P - + -2 PER @@ -504,7 +504,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81800-81899.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81800-81899.xml index 608b894e0a..daf6f38f0b 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81800-81899.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/81800-81899.xml @@ -501,7 +501,7 @@ icon.skill0000 P - + -2 PER @@ -511,7 +511,7 @@ icon.skill0000 P - + -2 PER @@ -521,7 +521,7 @@ icon.skill0000 P - + -2 PER @@ -775,7 +775,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/82000-82099.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/82000-82099.xml index 5e08c0819b..ec6ec750a8 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/82000-82099.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/82000-82099.xml @@ -597,7 +597,7 @@ P - + 0.5 0.7 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/83000-83099.xml b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/83000-83099.xml index 6d37a77c27..0b53d37b94 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/83000-83099.xml +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/83000-83099.xml @@ -404,7 +404,7 @@ P 5 - + 0.1 0.2 @@ -584,7 +584,7 @@ DIFF - + 0 0 @@ -615,7 +615,7 @@ P - + 0 0 diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/documentation.txt index 45e380c51e..dcb3425966 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/documentation.txt @@ -89,7 +89,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -233,6 +233,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -299,7 +300,6 @@ ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. SkillBonusRange: Additional cast range for skills. (l2jmobius) -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java index a6c04e672e..489b0181e1 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -356,8 +356,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -399,8 +399,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Stat.java index 6c6b7a260d..ad9cb8c4c1 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -139,8 +139,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -158,8 +158,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), INSTANT_KILL_RESIST("instantKillResist"), EXPSP_RATE("rExp"), ACTIVE_BONUS_EXP("activeBonusExp"), // Used to measure active skill bonus exp. diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/EffectMasterHandler.java index e342190034..02d712c409 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -121,7 +121,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("DefenceCriticalRate", DefenceCriticalRate::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalDamage", DefenceMagicCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceMagicCriticalRate", DefenceMagicCriticalRate::new); - EffectHandler.getInstance().registerHandler("DefenceSkillCriticalDamage", DefenceSkillCriticalDamage::new); + EffectHandler.getInstance().registerHandler("DefencePhysicalSkillCriticalDamage", DefencePhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("DefenceTrait", DefenceTrait::new); EffectHandler.getInstance().registerHandler("DeleteHate", DeleteHate::new); EffectHandler.getInstance().registerHandler("DeleteHateOfMe", DeleteHateOfMe::new); @@ -267,6 +267,7 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("PhysicalEvasion", PhysicalEvasion::new); EffectHandler.getInstance().registerHandler("PhysicalMute", PhysicalMute::new); EffectHandler.getInstance().registerHandler("PhysicalShieldAngleAll", PhysicalShieldAngleAll::new); + EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalDamage", PhysicalSkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("PhysicalSkillCriticalRate", PhysicalSkillCriticalRate::new); EffectHandler.getInstance().registerHandler("PhysicalSkillPower", PhysicalSkillPower::new); EffectHandler.getInstance().registerHandler("PhysicalSoulAttack", PhysicalSoulAttack::new); @@ -335,7 +336,6 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new); - EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..a2078cc39c --- /dev/null +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/DefencePhysicalSkillCriticalDamage.java @@ -0,0 +1,32 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * Equivalent of DefenceMagicCriticalDamage for physical skills. + * @author Mobius + */ +public class DefencePhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public DefencePhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java deleted file mode 100644 index d3e8393e87..0000000000 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/DefenceSkillCriticalDamage.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * Equivalent of DefenceMagicCriticalDamage for physical skills. - * @author Mobius - */ -public class DefenceSkillCriticalDamage extends AbstractStatEffect -{ - public DefenceSkillCriticalDamage(StatSet params) - { - super(params, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java new file mode 100644 index 0000000000..1b32e9419a --- /dev/null +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillCriticalDamage.java @@ -0,0 +1,31 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.effecthandlers; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class PhysicalSkillCriticalDamage extends AbstractStatEffect +{ + public PhysicalSkillCriticalDamage(StatSet params) + { + super(params, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD); + } +} diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java deleted file mode 100644 index d1bdbe6c30..0000000000 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package handlers.effecthandlers; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCriticalDamage extends AbstractStatEffect -{ - public SkillCriticalDamage(StatSet params) - { - super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); - } -} diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/augmentation/options/34100-34199.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/augmentation/options/34100-34199.xml index 9ad6c67fda..123c685577 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/augmentation/options/34100-34199.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/augmentation/options/34100-34199.xml @@ -720,7 +720,7 @@ PER - + 5 5 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml index 8c54206b83..f6c1e465aa 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00200-00299.xml @@ -5563,7 +5563,7 @@ - + 0 4 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00400-00499.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00400-00499.xml index e2f80ccf09..e87afcb3f1 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00400-00499.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/00400-00499.xml @@ -1876,7 +1876,7 @@ PER - + 11 22 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/39300-39399.xml index b8ac299fdb..ec8a713feb 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/39300-39399.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/39300-39399.xml @@ -133,7 +133,7 @@ PER - + 3 8 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45100-45199.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45100-45199.xml index 3bf847d3aa..c73c4b8e52 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45100-45199.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45100-45199.xml @@ -4046,7 +4046,7 @@ DIFF - + 0 200 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45300-45399.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45300-45399.xml index 83d66f833c..4f4ab102fa 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45300-45399.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45300-45399.xml @@ -5927,7 +5927,7 @@ DIFF - + 50 80 @@ -5967,7 +5967,7 @@ 100 DIFF - + 50 DIFF diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45400-45499.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45400-45499.xml index 16e25813d6..d30d56694b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45400-45499.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45400-45499.xml @@ -335,7 +335,7 @@ PER - + 0 10 @@ -516,7 +516,7 @@ 50 PER - + 50 PER @@ -733,7 +733,7 @@ SELF SINGLE - + 20 PER diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45500-45599.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45500-45599.xml index 3f0c0e7b4a..0e99fcd493 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45500-45599.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/45500-45599.xml @@ -1202,7 +1202,7 @@ 15 PER - + 15 PER @@ -1244,7 +1244,7 @@ 15 PER - + 15 PER @@ -1286,7 +1286,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47800-47899.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47800-47899.xml index 17522bd7f4..1f6b75c1ad 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47800-47899.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47800-47899.xml @@ -1059,7 +1059,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/48500-48599.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/48500-48599.xml index eaf3139948..32fc380409 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/48500-48599.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/48500-48599.xml @@ -135,7 +135,7 @@ TARGET SINGLE - + -15 PER @@ -154,7 +154,7 @@ TARGET SINGLE - + -300 DIFF diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50200-50299.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50200-50299.xml index f88b79d6a8..88eac50d09 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50200-50299.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50200-50299.xml @@ -278,7 +278,7 @@ 300 - + 4 7 @@ -353,7 +353,7 @@ PER - + 2 5 @@ -1373,7 +1373,7 @@ 8 PER - + 50 DIFF @@ -1741,7 +1741,7 @@ 4 DIFF - + 50 DIFF @@ -3587,7 +3587,7 @@ DIFF - + 30 60 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50300-50399.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50300-50399.xml index 42b023a808..72d68dfd42 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50300-50399.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50300-50399.xml @@ -1054,7 +1054,7 @@ PER - + 0 1 @@ -1230,7 +1230,7 @@ PER - + 0 1 @@ -2098,7 +2098,7 @@ PER - + 1 3 @@ -2308,7 +2308,7 @@ DIFF - + 50 100 @@ -3969,7 +3969,7 @@ -1 0 - + 5 15 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50400-50499.xml index 699529158c..0afd341f64 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50400-50499.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50400-50499.xml @@ -47,7 +47,7 @@ 5 1 - + 50 DIFF @@ -60,7 +60,7 @@ 5 1 - + 50 DIFF @@ -157,7 +157,7 @@ 80 DIFF - + 80 DIFF @@ -258,7 +258,7 @@ 150 DIFF - + 150 DIFF @@ -313,7 +313,7 @@ 200 DIFF - + 200 DIFF @@ -962,7 +962,7 @@ DIFF - + 50 100 @@ -2797,7 +2797,7 @@ DIFF - + 20 50 @@ -3570,7 +3570,7 @@ DIFF - + 100 200 @@ -3607,7 +3607,7 @@ icon.bm_core_doll_30d P - + -5 -10 @@ -4957,7 +4957,7 @@ PER - + -10 -12 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50500-50599.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50500-50599.xml index af99a7e485..b3e9531e4e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50500-50599.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/50500-50599.xml @@ -2565,7 +2565,7 @@ INT - + -1 -2 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54000-54099.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54000-54099.xml index f27148d6cc..f52ac238ee 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54000-54099.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54000-54099.xml @@ -1555,7 +1555,7 @@ PER - + 5 10 @@ -1726,7 +1726,7 @@ 10 PER - + 10 PER @@ -1853,7 +1853,7 @@ PER - + 10 11 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54100-54199.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54100-54199.xml index 265718c8df..8c1f7e3247 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54100-54199.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54100-54199.xml @@ -103,7 +103,7 @@ 5 PER - + 200 DIFF diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54200-54299.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54200-54299.xml index a59eb8f3f2..f8e14d6c82 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54200-54299.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/54200-54299.xml @@ -182,7 +182,7 @@ 40 PER - + 40 PER diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55400-55499.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55400-55499.xml index ea91227c04..2095dc1f39 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55400-55499.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55400-55499.xml @@ -31,7 +31,7 @@ 5 1 - + 7 PER diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55700-55799.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55700-55799.xml index fc74550d4c..f5c82ce5ab 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55700-55799.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55700-55799.xml @@ -1055,7 +1055,7 @@ PER - + 0 0 @@ -2403,7 +2403,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55800-55899.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55800-55899.xml index 302e3716bd..4e70ed765c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55800-55899.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/55800-55899.xml @@ -484,7 +484,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80100-80199.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80100-80199.xml index 35e48fdda7..11bd390d9a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80100-80199.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80100-80199.xml @@ -674,7 +674,7 @@ icon.skill3080 P - + 100 DIFF @@ -684,7 +684,7 @@ icon.skill3080 P - + 100 DIFF @@ -694,7 +694,7 @@ icon.skill3080 P - + 100 DIFF @@ -704,7 +704,7 @@ icon.skill3080 P - + 100 DIFF @@ -714,7 +714,7 @@ icon.skill3080 P - + 100 DIFF @@ -738,7 +738,7 @@ icon.skill3080 P - + 100 DIFF @@ -748,7 +748,7 @@ icon.skill3080 P - + 100 DIFF @@ -758,7 +758,7 @@ icon.skill3080 P - + 100 DIFF @@ -768,7 +768,7 @@ icon.skill3080 P - + 100 DIFF @@ -778,7 +778,7 @@ icon.skill3080 P - + 100 DIFF @@ -788,7 +788,7 @@ icon.skill3080 P - + 100 DIFF @@ -798,7 +798,7 @@ icon.skill3080 P - + 100 DIFF @@ -808,7 +808,7 @@ icon.skill3080 P - + 100 DIFF @@ -818,7 +818,7 @@ icon.skill3080 P - + 100 DIFF @@ -828,7 +828,7 @@ icon.skill3080 P - + 100 DIFF @@ -838,7 +838,7 @@ icon.skill3080 P - + 100 DIFF @@ -848,7 +848,7 @@ icon.skill3080 P - + 100 DIFF @@ -858,7 +858,7 @@ icon.skill3080 P - + 100 DIFF @@ -868,7 +868,7 @@ icon.skill3080 P - + 100 DIFF @@ -878,7 +878,7 @@ icon.skill3080 P - + 100 DIFF @@ -888,7 +888,7 @@ icon.skill3080 P - + 100 DIFF @@ -898,7 +898,7 @@ icon.skill3080 P - + 100 DIFF @@ -908,7 +908,7 @@ icon.skill3080 P - + 100 DIFF @@ -918,7 +918,7 @@ icon.skill3080 P - + 100 DIFF @@ -928,7 +928,7 @@ icon.skill3080 P - + 100 DIFF @@ -938,7 +938,7 @@ icon.skill3080 P - + 100 DIFF @@ -948,7 +948,7 @@ icon.skill3080 P - + 100 DIFF @@ -958,7 +958,7 @@ icon.skill3080 P - + 100 DIFF @@ -968,7 +968,7 @@ icon.skill3080 P - + 100 DIFF @@ -978,7 +978,7 @@ icon.skill3080 P - + 100 DIFF @@ -988,7 +988,7 @@ icon.skill3080 P - + 100 DIFF @@ -998,7 +998,7 @@ icon.skill3080 P - + 100 DIFF @@ -1008,7 +1008,7 @@ icon.skill3080 P - + 100 DIFF @@ -1018,7 +1018,7 @@ icon.skill3080 P - + 100 DIFF @@ -1028,7 +1028,7 @@ icon.skill3080 P - + 100 DIFF @@ -1038,7 +1038,7 @@ icon.skill3080 P - + 100 DIFF @@ -1048,7 +1048,7 @@ icon.skill3080 P - + 100 DIFF @@ -1058,7 +1058,7 @@ icon.skill3080 P - + 100 DIFF @@ -1068,7 +1068,7 @@ icon.skill3080 P - + 100 DIFF diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80400-80499.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80400-80499.xml index ea9fd1eadf..cda725a0fc 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80400-80499.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80400-80499.xml @@ -745,7 +745,7 @@ icon.skill0000 P - + -2 PER @@ -763,7 +763,7 @@ icon.skill0000 P - + -2 PER @@ -781,7 +781,7 @@ icon.skill0000 P - + -2 PER @@ -799,7 +799,7 @@ icon.skill0000 P - + -2 PER @@ -817,7 +817,7 @@ icon.skill0000 P - + -2 PER @@ -835,7 +835,7 @@ icon.skill0000 P - + -2 PER @@ -853,7 +853,7 @@ icon.skill0000 P - + -2 PER @@ -871,7 +871,7 @@ icon.skill0000 P - + -2 PER @@ -889,7 +889,7 @@ icon.skill0000 P - + -2 PER @@ -907,7 +907,7 @@ icon.skill0000 P - + -2 PER @@ -925,7 +925,7 @@ icon.skill0000 P - + -2 PER @@ -943,7 +943,7 @@ icon.skill0000 P - + -2 PER @@ -961,7 +961,7 @@ icon.skill0000 P - + -2 PER @@ -979,7 +979,7 @@ icon.skill0000 P - + -2 PER @@ -997,7 +997,7 @@ icon.skill0000 P - + -2 PER @@ -1015,7 +1015,7 @@ icon.skill0000 P - + -2 PER @@ -1033,7 +1033,7 @@ icon.skill0000 P - + -2 PER @@ -1051,7 +1051,7 @@ icon.skill0000 P - + -2 PER @@ -1069,7 +1069,7 @@ icon.skill0000 P - + -2 PER @@ -1087,7 +1087,7 @@ icon.skill0000 P - + -2 PER @@ -1105,7 +1105,7 @@ icon.skill0000 P - + -2 PER @@ -1123,7 +1123,7 @@ icon.skill0000 P - + -2 PER @@ -1141,7 +1141,7 @@ icon.skill0000 P - + -2 PER @@ -1159,7 +1159,7 @@ icon.skill0000 P - + -2 PER @@ -1177,7 +1177,7 @@ icon.skill0000 P - + -2 PER @@ -1195,7 +1195,7 @@ icon.skill0000 P - + -2 PER @@ -1213,7 +1213,7 @@ icon.skill0000 P - + -2 PER @@ -1231,7 +1231,7 @@ icon.skill0000 P - + -2 PER @@ -1249,7 +1249,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80500-80599.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80500-80599.xml index ec91480720..92c68c4eb0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80500-80599.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80500-80599.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -22,7 +22,7 @@ icon.skill0000 P - + -2 PER @@ -40,7 +40,7 @@ icon.skill0000 P - + -2 PER @@ -58,7 +58,7 @@ icon.skill0000 P - + -2 PER @@ -76,7 +76,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -112,7 +112,7 @@ icon.skill0000 P - + -2 PER @@ -130,7 +130,7 @@ icon.skill0000 P - + -2 PER @@ -148,7 +148,7 @@ icon.skill0000 P - + -2 PER @@ -166,7 +166,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80600-80699.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80600-80699.xml index aebdb12a9d..05683715f3 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80600-80699.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80600-80699.xml @@ -114,7 +114,7 @@ icon.skill0000 P - + 10 DIFF @@ -124,7 +124,7 @@ icon.skill0000 P - + 10 DIFF @@ -134,7 +134,7 @@ icon.skill0000 P - + 10 DIFF @@ -144,7 +144,7 @@ icon.skill0000 P - + 10 DIFF @@ -154,7 +154,7 @@ icon.skill0000 P - + 10 DIFF @@ -164,7 +164,7 @@ icon.skill0000 P - + 10 DIFF @@ -174,7 +174,7 @@ icon.skill0000 P - + 10 DIFF @@ -184,7 +184,7 @@ icon.skill0000 P - + 10 DIFF @@ -194,7 +194,7 @@ icon.skill0000 P - + 10 DIFF @@ -204,7 +204,7 @@ icon.skill0000 P - + 10 DIFF @@ -214,7 +214,7 @@ icon.skill0000 P - + 10 DIFF @@ -224,7 +224,7 @@ icon.skill0000 P - + 10 DIFF @@ -234,7 +234,7 @@ icon.skill0000 P - + 10 DIFF @@ -244,7 +244,7 @@ icon.skill0000 P - + 10 DIFF @@ -254,7 +254,7 @@ icon.skill0000 P - + 10 DIFF @@ -264,7 +264,7 @@ icon.skill0000 P - + 10 DIFF @@ -274,7 +274,7 @@ icon.skill0000 P - + 10 DIFF @@ -284,7 +284,7 @@ icon.skill0000 P - + 10 DIFF @@ -294,7 +294,7 @@ icon.skill0000 P - + 10 DIFF @@ -304,7 +304,7 @@ icon.skill0000 P - + 10 DIFF diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80900-80999.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80900-80999.xml index 1f3e3db40e..c8a270a4ae 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80900-80999.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/80900-80999.xml @@ -714,7 +714,7 @@ icon.skill0000 P - + -2 PER @@ -724,7 +724,7 @@ icon.skill0000 P - + -2 PER @@ -734,7 +734,7 @@ icon.skill0000 P - + -2 PER @@ -744,7 +744,7 @@ icon.skill0000 P - + -2 PER @@ -754,7 +754,7 @@ icon.skill0000 P - + -2 PER @@ -764,7 +764,7 @@ icon.skill0000 P - + -2 PER @@ -774,7 +774,7 @@ icon.skill0000 P - + -2 PER @@ -784,7 +784,7 @@ icon.skill0000 P - + -2 PER @@ -794,7 +794,7 @@ icon.skill0000 P - + -2 PER @@ -804,7 +804,7 @@ icon.skill0000 P - + -2 PER @@ -814,7 +814,7 @@ icon.skill0000 P - + -2 PER @@ -824,7 +824,7 @@ icon.skill0000 P - + -2 PER @@ -834,7 +834,7 @@ icon.skill0000 P - + -2 PER @@ -844,7 +844,7 @@ icon.skill0000 P - + -2 PER @@ -854,7 +854,7 @@ icon.skill0000 P - + -2 PER @@ -864,7 +864,7 @@ icon.skill0000 P - + -2 PER @@ -874,7 +874,7 @@ icon.skill0000 P - + -2 PER @@ -884,7 +884,7 @@ icon.skill0000 P - + -2 PER @@ -894,7 +894,7 @@ icon.skill0000 P - + -2 PER @@ -904,7 +904,7 @@ icon.skill0000 P - + -2 PER @@ -914,7 +914,7 @@ icon.skill0000 P - + -2 PER @@ -924,7 +924,7 @@ icon.skill0000 P - + -2 PER @@ -934,7 +934,7 @@ icon.skill0000 P - + -2 PER @@ -944,7 +944,7 @@ icon.skill0000 P - + -2 PER @@ -954,7 +954,7 @@ icon.skill0000 P - + -2 PER @@ -964,7 +964,7 @@ icon.skill0000 P - + -2 PER @@ -974,7 +974,7 @@ icon.skill0000 P - + -2 PER @@ -984,7 +984,7 @@ icon.skill0000 P - + -2 PER @@ -994,7 +994,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81000-81099.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81000-81099.xml index 19224a767c..efca55e12a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81000-81099.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81000-81099.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -14,7 +14,7 @@ icon.skill0000 P - + -2 PER @@ -24,7 +24,7 @@ icon.skill0000 P - + -2 PER @@ -34,7 +34,7 @@ icon.skill0000 P - + -2 PER @@ -44,7 +44,7 @@ icon.skill0000 P - + -2 PER @@ -54,7 +54,7 @@ icon.skill0000 P - + -2 PER @@ -64,7 +64,7 @@ icon.skill0000 P - + -2 PER @@ -74,7 +74,7 @@ icon.skill0000 P - + -2 PER @@ -84,7 +84,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -104,7 +104,7 @@ icon.skill0000 P - + -2 PER @@ -114,7 +114,7 @@ icon.skill0000 P - + -2 PER @@ -124,7 +124,7 @@ icon.skill0000 P - + -2 PER @@ -134,7 +134,7 @@ icon.skill0000 P - + -2 PER @@ -144,7 +144,7 @@ icon.skill0000 P - + -2 PER @@ -154,7 +154,7 @@ icon.skill0000 P - + -2 PER @@ -164,7 +164,7 @@ icon.skill0000 P - + -2 PER @@ -174,7 +174,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER @@ -194,7 +194,7 @@ icon.skill0000 P - + -2 PER @@ -204,7 +204,7 @@ icon.skill0000 P - + -2 PER @@ -214,7 +214,7 @@ icon.skill0000 P - + -2 PER @@ -224,7 +224,7 @@ icon.skill0000 P - + -2 PER @@ -234,7 +234,7 @@ icon.skill0000 P - + -2 PER @@ -244,7 +244,7 @@ icon.skill0000 P - + -2 PER @@ -254,7 +254,7 @@ icon.skill0000 P - + -2 PER @@ -264,7 +264,7 @@ icon.skill0000 P - + -2 PER @@ -274,7 +274,7 @@ icon.skill0000 P - + -2 PER @@ -284,7 +284,7 @@ icon.skill0000 P - + -2 PER @@ -294,7 +294,7 @@ icon.skill0000 P - + -2 PER @@ -304,7 +304,7 @@ icon.skill0000 P - + -2 PER @@ -914,7 +914,7 @@ icon.skill0000 P - + -2 PER @@ -924,7 +924,7 @@ icon.skill0000 P - + -2 PER @@ -934,7 +934,7 @@ icon.skill0000 P - + -2 PER @@ -944,7 +944,7 @@ icon.skill0000 P - + -2 PER @@ -954,7 +954,7 @@ icon.skill0000 P - + -2 PER @@ -964,7 +964,7 @@ icon.skill0000 P - + -2 PER @@ -974,7 +974,7 @@ icon.skill0000 P - + -2 PER @@ -984,7 +984,7 @@ icon.skill0000 P - + -2 PER @@ -994,7 +994,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81100-81199.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81100-81199.xml index bf05b6e265..ea6df452a4 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81100-81199.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81100-81199.xml @@ -4,7 +4,7 @@ icon.skill0000 P - + -2 PER @@ -14,7 +14,7 @@ icon.skill0000 P - + -2 PER @@ -24,7 +24,7 @@ icon.skill0000 P - + -2 PER @@ -34,7 +34,7 @@ icon.skill0000 P - + -2 PER @@ -44,7 +44,7 @@ icon.skill0000 P - + -2 PER @@ -54,7 +54,7 @@ icon.skill0000 P - + -2 PER @@ -64,7 +64,7 @@ icon.skill0000 P - + -2 PER @@ -74,7 +74,7 @@ icon.skill0000 P - + -2 PER @@ -84,7 +84,7 @@ icon.skill0000 P - + -2 PER @@ -94,7 +94,7 @@ icon.skill0000 P - + -2 PER @@ -104,7 +104,7 @@ icon.skill0000 P - + -2 PER @@ -114,7 +114,7 @@ icon.skill0000 P - + -2 PER @@ -124,7 +124,7 @@ icon.skill0000 P - + -2 PER @@ -134,7 +134,7 @@ icon.skill0000 P - + -2 PER @@ -144,7 +144,7 @@ icon.skill0000 P - + -2 PER @@ -154,7 +154,7 @@ icon.skill0000 P - + -2 PER @@ -164,7 +164,7 @@ icon.skill0000 P - + -2 PER @@ -174,7 +174,7 @@ icon.skill0000 P - + -2 PER @@ -184,7 +184,7 @@ icon.skill0000 P - + -2 PER @@ -194,7 +194,7 @@ icon.skill0000 P - + -2 PER @@ -204,7 +204,7 @@ icon.skill0000 P - + -2 PER @@ -214,7 +214,7 @@ icon.skill0000 P - + -2 PER @@ -224,7 +224,7 @@ icon.skill0000 P - + -2 PER @@ -234,7 +234,7 @@ icon.skill0000 P - + -2 PER @@ -244,7 +244,7 @@ icon.skill0000 P - + -2 PER @@ -254,7 +254,7 @@ icon.skill0000 P - + -2 PER @@ -264,7 +264,7 @@ icon.skill0000 P - + -2 PER @@ -274,7 +274,7 @@ icon.skill0000 P - + -2 PER @@ -284,7 +284,7 @@ icon.skill0000 P - + -2 PER @@ -294,7 +294,7 @@ icon.skill0000 P - + -2 PER @@ -304,7 +304,7 @@ icon.skill0000 P - + -2 PER @@ -314,7 +314,7 @@ icon.skill0000 P - + -2 PER @@ -324,7 +324,7 @@ icon.skill0000 P - + -2 PER @@ -334,7 +334,7 @@ icon.skill0000 P - + -2 PER @@ -344,7 +344,7 @@ icon.skill0000 P - + -2 PER @@ -354,7 +354,7 @@ icon.skill0000 P - + -2 PER @@ -364,7 +364,7 @@ icon.skill0000 P - + -2 PER @@ -374,7 +374,7 @@ icon.skill0000 P - + -2 PER @@ -384,7 +384,7 @@ icon.skill0000 P - + -2 PER @@ -394,7 +394,7 @@ icon.skill0000 P - + -2 PER @@ -404,7 +404,7 @@ icon.skill0000 P - + -2 PER @@ -414,7 +414,7 @@ icon.skill0000 P - + -2 PER @@ -424,7 +424,7 @@ icon.skill0000 P - + -2 PER @@ -434,7 +434,7 @@ icon.skill0000 P - + -2 PER @@ -444,7 +444,7 @@ icon.skill0000 P - + -2 PER @@ -454,7 +454,7 @@ icon.skill0000 P - + -2 PER @@ -464,7 +464,7 @@ icon.skill0000 P - + -2 PER @@ -474,7 +474,7 @@ icon.skill0000 P - + -2 PER @@ -484,7 +484,7 @@ icon.skill0000 P - + -2 PER @@ -494,7 +494,7 @@ icon.skill0000 P - + -2 PER @@ -504,7 +504,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81800-81899.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81800-81899.xml index d4fc73e204..2b33d653ac 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81800-81899.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/81800-81899.xml @@ -501,7 +501,7 @@ icon.skill0000 P - + -2 PER @@ -511,7 +511,7 @@ icon.skill0000 P - + -2 PER @@ -521,7 +521,7 @@ icon.skill0000 P - + -2 PER @@ -775,7 +775,7 @@ icon.skill0000 P - + -2 PER diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/82000-82099.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/82000-82099.xml index d979392d15..6a2344f685 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/82000-82099.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/82000-82099.xml @@ -597,7 +597,7 @@ P - + 0.5 0.7 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/83000-83099.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/83000-83099.xml index 4eb2899773..4953ca9f2b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/83000-83099.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/83000-83099.xml @@ -404,7 +404,7 @@ P 5 - + 0.1 0.2 @@ -584,7 +584,7 @@ DIFF - + 0 0 @@ -615,7 +615,7 @@ P - + 0 0 diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/documentation.txt index 222cfb0c5f..56bb2c794a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/documentation.txt @@ -91,7 +91,7 @@ DefenceCriticalDamage: Critical Damage resist stat. DefenceCriticalRate: Critical Rate resist stat. DefenceMagicCriticalDamage: Magic Critical Damage resist stat. DefenceMagicCriticalRate: Magic Critical Rate resist stat. -DefenceSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) +DefencePhysicalSkillCriticalDamage: Physical skill Critical Damage resist stat. (l2jmobius) DefenceTrait: Stat that manages all defence traits. DeleteHate: Has a chance to delete target's hate towards everyone. DeleteHateOfMe: Has a chance to delete target's hate towards you. @@ -236,6 +236,7 @@ PhysicalDefence: P. Def stat. PhysicalEvasion: P. Evasion stat. PhysicalMute: Prevents the usage of physical skills. Shield Slam. PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle. +PhysicalSkillCriticalDamage: Physical skill critical damage stat. PhysicalSkillCriticalRate: Physical skill critical rate stat. (l2jmobius) PhysicalSkillPower: Physical Skill Power stat. PhysicalSoulAttack: Physical attack depending on souls. @@ -302,7 +303,6 @@ ShieldDefenceRate: Shield block success rate stat. ShotsBonus: Additional shot damage bonus. (l2jmobius) SilentMove: Prevents aggressive mobs from attacking you when entering aggression range. SkillBonusRange: Additional cast range for skills. (l2jmobius) -SkillCriticalDamage: Skill critical damage stat. SkillEvasion: Skill evasion stat. SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. SkillMasteryRate: Bonus chance for skill mastery stat. diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 6a845a3cc2..c3bab3e41f 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -362,8 +362,8 @@ public class Formulas } else { - criticalDamage = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL, 1); - defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL, 1); + criticalDamage = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); + defenceCriticalDamage = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE, 1); if (attacker.isPlayable()) { balanceMod = target.isPlayable() ? Config.PVP_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()] : Config.PVE_PHYSICAL_SKILL_CRITICAL_DAMAGE_MULTIPLIERS[attacker.getActingPlayer().getClassId().getId()]; @@ -405,8 +405,8 @@ public class Formulas } else { - criticalDamageAdd = attacker.getStat().getValue(Stat.CRITICAL_DAMAGE_SKILL_ADD, 0); - defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_CRITICAL_DAMAGE_SKILL_ADD, 0); + criticalDamageAdd = attacker.getStat().getValue(Stat.PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); + defenceCriticalDamageAdd = target.getStat().getValue(Stat.DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD, 0); } } else diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Stat.java index 0274a39104..b9c7fd63ba 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -139,8 +139,8 @@ public enum Stat SKILL_POWER_ADD("skillPowerAdd"), PHYSICAL_SKILL_POWER("physicalSkillPower"), MAGICAL_SKILL_POWER("magicalSkillPower"), - CRITICAL_DAMAGE_SKILL("cAtkSkill"), - CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"), + PHYSICAL_SKILL_CRITICAL_DAMAGE("cAtkSkill"), + PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("cAtkSkillAdd"), MAGIC_CRITICAL_DAMAGE_ADD("mCritPowerAdd"), SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()), CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1), @@ -156,8 +156,8 @@ public enum Stat DEFENCE_MAGIC_CRITICAL_DAMAGE("defMCritDamage"), DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD("defMCritDamageAdd"), DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more). - DEFENCE_CRITICAL_DAMAGE_SKILL("defCAtkSkill"), - DEFENCE_CRITICAL_DAMAGE_SKILL_ADD("defCAtkSkillAdd"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE("defCAtkSkill"), + DEFENCE_PHYSICAL_SKILL_CRITICAL_DAMAGE_ADD("defCAtkSkillAdd"), AREA_OF_EFFECT_DAMAGE_MODIFIER("aoeDamageMofifier"), AREA_OF_EFFECT_DAMAGE_DEFENCE("aoeDamageDefence"), BLOW_RATE("blowRate"),