From 88cfda013d5eca01fe5ed318e4694062fc10720c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 30 Apr 2021 11:13:48 +0000 Subject: [PATCH] Proper naming for skill mastery related effects. --- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../{SkillCritical.java => SkillMastery.java} | 6 +-- .../effecthandlers/SkillMasteryRate.java | 6 +-- .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/08900-08999.xml | 4 +- .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 6 +-- .../game/data/stats/skills/10700-10799.xml | 6 +-- .../game/data/stats/skills/11000-11099.xml | 2 +- .../game/data/stats/skills/11200-11299.xml | 2 +- .../game/data/stats/skills/11500-11599.xml | 4 +- .../game/data/stats/skills/11700-11799.xml | 2 +- .../game/data/stats/skills/19100-19199.xml | 6 +-- .../game/data/stats/skills/21400-21499.xml | 2 +- .../game/data/stats/skills/30000-30099.xml | 2 +- .../game/data/stats/skills/30500-30599.xml | 4 +- .../game/data/stats/skills/30600-30699.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../handlers/effecthandlers/SkillMastery.java | 6 +-- .../effecthandlers/SkillMasteryRate.java | 6 +-- .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/08900-08999.xml | 4 +- .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 6 +-- .../game/data/stats/skills/10700-10799.xml | 6 +-- .../game/data/stats/skills/11000-11099.xml | 2 +- .../game/data/stats/skills/11200-11299.xml | 2 +- .../game/data/stats/skills/11500-11599.xml | 4 +- .../game/data/stats/skills/11700-11799.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 +- .../game/data/stats/skills/13800-13899.xml | 8 ++-- .../game/data/stats/skills/19100-19199.xml | 6 +-- .../game/data/stats/skills/21400-21499.xml | 2 +- .../game/data/stats/skills/30000-30099.xml | 2 +- .../game/data/stats/skills/30500-30599.xml | 4 +- .../game/data/stats/skills/30600-30699.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../handlers/effecthandlers/SkillMastery.java | 6 +-- .../effecthandlers/SkillMasteryRate.java | 6 +-- .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/08900-08999.xml | 4 +- .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 6 +-- .../game/data/stats/skills/10700-10799.xml | 6 +-- .../game/data/stats/skills/10900-10999.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 2 +- .../game/data/stats/skills/11200-11299.xml | 2 +- .../game/data/stats/skills/11500-11599.xml | 4 +- .../game/data/stats/skills/11700-11799.xml | 2 +- .../game/data/stats/skills/13300-13399.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 +- .../game/data/stats/skills/13800-13899.xml | 8 ++-- .../game/data/stats/skills/19100-19199.xml | 6 +-- .../game/data/stats/skills/21400-21499.xml | 2 +- .../game/data/stats/skills/30000-30099.xml | 2 +- .../game/data/stats/skills/30500-30599.xml | 4 +- .../game/data/stats/skills/30600-30699.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../{SkillCritical.java => SkillMastery.java} | 6 +-- .../effecthandlers/SkillMasteryRate.java | 6 +-- .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/08900-08999.xml | 4 +- .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 6 +-- .../game/data/stats/skills/10700-10799.xml | 6 +-- .../game/data/stats/skills/10900-10999.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 2 +- .../game/data/stats/skills/11200-11299.xml | 2 +- .../game/data/stats/skills/11500-11599.xml | 4 +- .../game/data/stats/skills/11700-11799.xml | 2 +- .../game/data/stats/skills/13300-13399.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 +- .../game/data/stats/skills/13800-13899.xml | 8 ++-- .../game/data/stats/skills/19100-19199.xml | 6 +-- .../game/data/stats/skills/19200-19299.xml | 8 ++-- .../game/data/stats/skills/21400-21499.xml | 2 +- .../game/data/stats/skills/27900-27999.xml | 4 +- .../game/data/stats/skills/30000-30099.xml | 2 +- .../game/data/stats/skills/30500-30599.xml | 4 +- .../game/data/stats/skills/30600-30699.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/08900-08999.xml | 6 +-- .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 6 +-- .../game/data/stats/skills/10700-10799.xml | 8 ++-- .../game/data/stats/skills/10900-10999.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 2 +- .../game/data/stats/skills/11200-11299.xml | 2 +- .../game/data/stats/skills/11500-11599.xml | 2 +- .../game/data/stats/skills/11700-11799.xml | 2 +- .../game/data/stats/skills/13300-13399.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 +- .../game/data/stats/skills/13800-13899.xml | 8 ++-- .../game/data/stats/skills/19100-19199.xml | 6 +-- .../game/data/stats/skills/19200-19299.xml | 10 ++--- .../game/data/stats/skills/21400-21499.xml | 2 +- .../game/data/stats/skills/27900-27999.xml | 4 +- .../game/data/stats/skills/28000-28099.xml | 2 +- .../game/data/stats/skills/30000-30099.xml | 2 +- .../game/data/stats/skills/30500-30599.xml | 4 +- .../game/data/stats/skills/30600-30699.xml | 2 +- .../game/data/stats/skills/35000-35099.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/08900-08999.xml | 6 +-- .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 6 +-- .../game/data/stats/skills/10700-10799.xml | 8 ++-- .../game/data/stats/skills/10900-10999.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 2 +- .../game/data/stats/skills/11200-11299.xml | 2 +- .../game/data/stats/skills/11500-11599.xml | 2 +- .../game/data/stats/skills/11700-11799.xml | 2 +- .../game/data/stats/skills/13300-13399.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 +- .../game/data/stats/skills/13800-13899.xml | 8 ++-- .../game/data/stats/skills/17800-17899.xml | 2 +- .../game/data/stats/skills/19100-19199.xml | 6 +-- .../game/data/stats/skills/19200-19299.xml | 10 ++--- .../game/data/stats/skills/21400-21499.xml | 2 +- .../game/data/stats/skills/27900-27999.xml | 4 +- .../game/data/stats/skills/28000-28099.xml | 2 +- .../game/data/stats/skills/30000-30099.xml | 2 +- .../game/data/stats/skills/30500-30599.xml | 4 +- .../game/data/stats/skills/30600-30699.xml | 2 +- .../game/data/stats/skills/35000-35099.xml | 2 +- .../game/data/stats/skills/35200-35299.xml | 4 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/08900-08999.xml | 6 +-- .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 6 +-- .../game/data/stats/skills/10700-10799.xml | 8 ++-- .../game/data/stats/skills/10900-10999.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 2 +- .../game/data/stats/skills/11200-11299.xml | 2 +- .../game/data/stats/skills/11500-11599.xml | 2 +- .../game/data/stats/skills/11700-11799.xml | 2 +- .../game/data/stats/skills/13300-13399.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 +- .../game/data/stats/skills/13800-13899.xml | 8 ++-- .../game/data/stats/skills/17800-17899.xml | 2 +- .../game/data/stats/skills/19100-19199.xml | 6 +-- .../game/data/stats/skills/19200-19299.xml | 10 ++--- .../game/data/stats/skills/21400-21499.xml | 2 +- .../game/data/stats/skills/27900-27999.xml | 4 +- .../game/data/stats/skills/28000-28099.xml | 2 +- .../game/data/stats/skills/30000-30099.xml | 2 +- .../game/data/stats/skills/30500-30599.xml | 4 +- .../game/data/stats/skills/30600-30699.xml | 2 +- .../game/data/stats/skills/35000-35099.xml | 8 ++-- .../game/data/stats/skills/35200-35299.xml | 4 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/08900-08999.xml | 6 +-- .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 6 +-- .../game/data/stats/skills/10700-10799.xml | 8 ++-- .../game/data/stats/skills/10900-10999.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 2 +- .../game/data/stats/skills/11200-11299.xml | 2 +- .../game/data/stats/skills/11500-11599.xml | 2 +- .../game/data/stats/skills/11700-11799.xml | 2 +- .../game/data/stats/skills/13300-13399.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 +- .../game/data/stats/skills/13800-13899.xml | 8 ++-- .../game/data/stats/skills/17800-17899.xml | 2 +- .../game/data/stats/skills/19100-19199.xml | 6 +-- .../game/data/stats/skills/19200-19299.xml | 10 ++--- .../game/data/stats/skills/21400-21499.xml | 2 +- .../game/data/stats/skills/27900-27999.xml | 4 +- .../game/data/stats/skills/28000-28099.xml | 2 +- .../game/data/stats/skills/30000-30099.xml | 2 +- .../game/data/stats/skills/30500-30599.xml | 4 +- .../game/data/stats/skills/30600-30699.xml | 14 +++--- .../game/data/stats/skills/30700-30799.xml | 16 +++---- .../game/data/stats/skills/30800-30899.xml | 2 +- .../game/data/stats/skills/35000-35099.xml | 8 ++-- .../game/data/stats/skills/35200-35299.xml | 4 +- .../game/data/stats/skills/35500-35599.xml | 4 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/01400-01499.xml | 2 +- .../game/data/stats/skills/08900-08999.xml | 6 +-- .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10300-10399.xml | 4 +- .../game/data/stats/skills/10500-10599.xml | 6 +-- .../game/data/stats/skills/10700-10799.xml | 6 +-- .../game/data/stats/skills/10900-10999.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 2 +- .../game/data/stats/skills/11200-11299.xml | 2 +- .../game/data/stats/skills/11500-11599.xml | 4 +- .../game/data/stats/skills/11700-11799.xml | 2 +- .../game/data/stats/skills/13300-13399.xml | 2 +- .../game/data/stats/skills/13600-13699.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 +- .../game/data/stats/skills/13800-13899.xml | 8 ++-- .../game/data/stats/skills/17800-17899.xml | 2 +- .../game/data/stats/skills/19100-19199.xml | 6 +-- .../game/data/stats/skills/19200-19299.xml | 8 ++-- .../game/data/stats/skills/21400-21499.xml | 2 +- .../game/data/stats/skills/27900-27999.xml | 4 +- .../game/data/stats/skills/28000-28099.xml | 2 +- .../game/data/stats/skills/30000-30099.xml | 2 +- .../game/data/stats/skills/30500-30599.xml | 4 +- .../game/data/stats/skills/30600-30699.xml | 14 +++--- .../game/data/stats/skills/30700-30799.xml | 16 +++---- .../game/data/stats/skills/30800-30899.xml | 4 +- .../game/data/stats/skills/35000-35099.xml | 8 ++-- .../game/data/stats/skills/35200-35299.xml | 4 +- .../game/data/stats/skills/35500-35599.xml | 4 +- .../game/data/stats/skills/35600-35699.xml | 2 +- .../game/data/stats/skills/35700-35799.xml | 8 ++-- .../game/data/stats/skills/35800-35899.xml | 6 +-- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/01400-01499.xml | 2 +- .../game/data/stats/skills/08900-08999.xml | 6 +-- .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10300-10399.xml | 4 +- .../game/data/stats/skills/10500-10599.xml | 6 +-- .../game/data/stats/skills/10700-10799.xml | 6 +-- .../game/data/stats/skills/10900-10999.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 2 +- .../game/data/stats/skills/11200-11299.xml | 2 +- .../game/data/stats/skills/11500-11599.xml | 4 +- .../game/data/stats/skills/11700-11799.xml | 2 +- .../game/data/stats/skills/13300-13399.xml | 2 +- .../game/data/stats/skills/13600-13699.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 +- .../game/data/stats/skills/13800-13899.xml | 8 ++-- .../game/data/stats/skills/17800-17899.xml | 2 +- .../game/data/stats/skills/19100-19199.xml | 6 +-- .../game/data/stats/skills/19200-19299.xml | 8 ++-- .../game/data/stats/skills/21400-21499.xml | 2 +- .../game/data/stats/skills/27900-27999.xml | 4 +- .../game/data/stats/skills/28000-28099.xml | 2 +- .../game/data/stats/skills/30000-30099.xml | 2 +- .../game/data/stats/skills/30500-30599.xml | 4 +- .../game/data/stats/skills/30600-30699.xml | 14 +++--- .../game/data/stats/skills/30700-30799.xml | 16 +++---- .../game/data/stats/skills/30800-30899.xml | 4 +- .../game/data/stats/skills/35000-35099.xml | 8 ++-- .../game/data/stats/skills/35200-35299.xml | 4 +- .../game/data/stats/skills/35500-35599.xml | 4 +- .../game/data/stats/skills/35600-35699.xml | 2 +- .../game/data/stats/skills/35700-35799.xml | 8 ++-- .../game/data/stats/skills/35800-35899.xml | 6 +-- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/55700-55799.xml | 2 +- .../game/data/stats/skills/55800-55899.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/55700-55799.xml | 2 +- .../game/data/stats/skills/55800-55899.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/55700-55799.xml | 2 +- .../game/data/stats/skills/55800-55899.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/55700-55799.xml | 2 +- .../game/data/stats/skills/55800-55899.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/55700-55799.xml | 2 +- .../game/data/stats/skills/55800-55899.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/08900-08999.xml | 4 +- .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 6 +-- .../game/data/stats/skills/10700-10799.xml | 6 +-- .../game/data/stats/skills/10900-10999.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 2 +- .../game/data/stats/skills/11200-11299.xml | 2 +- .../game/data/stats/skills/11500-11599.xml | 4 +- .../game/data/stats/skills/11700-11799.xml | 2 +- .../game/data/stats/skills/13300-13399.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 +- .../game/data/stats/skills/13800-13899.xml | 8 ++-- .../game/data/stats/skills/19100-19199.xml | 6 +-- .../game/data/stats/skills/19200-19299.xml | 8 ++-- .../game/data/stats/skills/21400-21499.xml | 2 +- .../game/data/stats/skills/27900-27999.xml | 4 +- .../game/data/stats/skills/30000-30099.xml | 2 +- .../game/data/stats/skills/30500-30599.xml | 4 +- .../game/data/stats/skills/30600-30699.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00100-00199.xml | 2 +- .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/00400-00499.xml | 2 +- .../game/data/stats/skills/45300-45399.xml | 2 +- .../game/data/stats/skills/50300-50399.xml | 4 +- .../game/data/stats/skills/55700-55799.xml | 2 +- .../game/data/stats/skills/55800-55899.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- .../scripts/handlers/EffectMasterHandler.java | 4 +- .../effecthandlers/SkillCritical.java | 43 ------------------- .../SkillCriticalProbability.java | 31 ------------- .../handlers/effecthandlers/SkillMastery.java | 43 +++++++++++++++++++ .../effecthandlers/SkillMasteryRate.java | 31 +++++++++++++ .../game/data/stats/skills/00100-00199.xml | 2 +- .../game/data/stats/skills/00300-00399.xml | 6 +-- .../game/data/stats/skills/00400-00499.xml | 2 +- .../game/data/stats/skills/45300-45399.xml | 2 +- .../game/data/stats/skills/50300-50399.xml | 4 +- .../game/data/stats/skills/50400-50499.xml | 2 +- .../game/data/stats/skills/55700-55799.xml | 2 +- .../game/data/stats/skills/55800-55899.xml | 2 +- .../game/data/stats/skills/documentation.txt | 4 +- .../gameserver/model/stats/Formulas.java | 4 +- .../gameserver/model/stats/Stat.java | 4 +- 437 files changed, 1863 insertions(+), 1863 deletions(-) rename L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/{SkillCritical.java => SkillMastery.java} (86%) rename L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java => L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java (81%) rename L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java => L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java (86%) rename L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java => L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java (81%) rename L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java => L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java (86%) rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java => L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java (81%) rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/{SkillCritical.java => SkillMastery.java} (86%) rename L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java => L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java (81%) delete mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java delete mode 100644 L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java delete mode 100644 L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java create mode 100644 L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java create mode 100644 L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java index a70ba55319..7f83965f1a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -313,10 +313,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java similarity index 86% rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java index 85fdcab54f..f8f1d8e485 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCritical extends AbstractEffect +public class SkillMastery extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatSet params) + public SkillMastery(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } @@ -38,6 +38,6 @@ public class SkillCritical extends AbstractEffect @Override public void pump(Creature effected, Skill skill) { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java similarity index 81% rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java index 0990e29035..edcfad0340 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCriticalProbability extends AbstractStatPercentEffect +public class SkillMasteryRate extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatSet params) + public SkillMasteryRate(StatSet params) { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); + super(params, Stat.SKILL_MASTERY_RATE); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml index 79bd1b4314..f67654cd62 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/00300-00399.xml @@ -1328,7 +1328,7 @@ P 5 - + STR @@ -1340,7 +1340,7 @@ P 5 - + INT @@ -1389,7 +1389,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/08900-08999.xml index 91bb457076..e2d943df24 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/08900-08999.xml @@ -25,7 +25,7 @@ 100 DIFF - + 30 PER @@ -75,7 +75,7 @@ 500 DIFF - + 50 PER diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml index c3b87ad377..4f939ccfa2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml @@ -49,7 +49,7 @@ 110 - + STR diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml index 6a19f69a05..69a1ef6766 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml @@ -186,7 +186,7 @@ 110 - + STR diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml index d3038e269a..a6b073e410 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml @@ -45,7 +45,7 @@ P - + STR @@ -396,11 +396,11 @@ STR PER - + 100 PER - + 10 PER diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml index 55cbe8a355..97373e7602 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml @@ -76,7 +76,7 @@ 30 PER - + 10 11 @@ -410,7 +410,7 @@ P - + STR @@ -810,7 +810,7 @@ 2 STR - + 100 PER diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml index ccba01a274..6285630945 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml @@ -53,7 +53,7 @@ 5 P - + INT diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml index 839851be73..1cb8706bf8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml @@ -356,7 +356,7 @@ 5 P - + INT diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml index 65fd536f61..021324e0d8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml @@ -47,7 +47,7 @@ 5 - + STR @@ -4056,7 +4056,7 @@ PER 1 - + 10 20 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml index 707ff3a00d..d3656c8629 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml @@ -149,7 +149,7 @@ P 5 - + INT diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml index 31716d4818..bc23e5469c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml @@ -540,7 +540,7 @@ icon.skill0193 P - + 5 10 @@ -1065,7 +1065,7 @@ 20 DIFF - + 50 PER @@ -1234,7 +1234,7 @@ icon.skill0330 P - + 30 50 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21400-21499.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21400-21499.xml index d7b65444cf..3ed7ad05bb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21400-21499.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21400-21499.xml @@ -1104,7 +1104,7 @@ PER - + 15 16 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml index 3c4878a578..b26e4f93b0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml @@ -2086,7 +2086,7 @@ 85 - + INT diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml index 4a9fe65050..79b400233b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30500-30599.xml @@ -1573,7 +1573,7 @@ DIFF - + 10 20 @@ -2170,7 +2170,7 @@ 85 - + STR diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30600-30699.xml index 2644552bdf..04e118629d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30600-30699.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/30600-30699.xml @@ -52,7 +52,7 @@ 2 3 - + 1 PER diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt index 2b90899468..ed046dcaf7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt @@ -282,10 +282,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 911a706ca6..99b1ebcead 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java index 03901690af..82eabb04ad 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -242,8 +242,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java index a70ba55319..7f83965f1a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -313,10 +313,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java similarity index 86% rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java index 85fdcab54f..f8f1d8e485 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCritical extends AbstractEffect +public class SkillMastery extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatSet params) + public SkillMastery(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } @@ -38,6 +38,6 @@ public class SkillCritical extends AbstractEffect @Override public void pump(Creature effected, Skill skill) { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java similarity index 81% rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java index 0990e29035..edcfad0340 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCriticalProbability extends AbstractStatPercentEffect +public class SkillMasteryRate extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatSet params) + public SkillMasteryRate(StatSet params) { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); + super(params, Stat.SKILL_MASTERY_RATE); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/00300-00399.xml index d576155a5c..fb619f8713 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/00300-00399.xml @@ -1328,7 +1328,7 @@ P 5 - + STR @@ -1340,7 +1340,7 @@ P 5 - + INT @@ -1389,7 +1389,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/08900-08999.xml index 9937e5ae87..c488396288 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/08900-08999.xml @@ -25,7 +25,7 @@ 100 DIFF - + 30 PER @@ -75,7 +75,7 @@ 500 DIFF - + 50 PER diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml index 10a79b9f43..8540ef7c20 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml @@ -49,7 +49,7 @@ 110 - + STR diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml index a18bd0ada7..2fb56a2179 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml @@ -186,7 +186,7 @@ 110 - + STR diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml index ac2924c776..dd236ee972 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml @@ -45,7 +45,7 @@ P - + STR @@ -396,11 +396,11 @@ STR PER - + 100 PER - + 10 PER diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml index 373f6feca3..714d047ccf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml @@ -81,7 +81,7 @@ 30 PER - + 10 11 @@ -421,7 +421,7 @@ P - + STR @@ -821,7 +821,7 @@ 2 STR - + 100 PER diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml index d8fa2dda07..978f19c51d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml @@ -53,7 +53,7 @@ 5 P - + INT diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml index 3ff3b59718..a141ccafb8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml @@ -363,7 +363,7 @@ 5 P - + INT diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml index ba0c48eb6a..60f26ac9e4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml @@ -47,7 +47,7 @@ 5 - + STR @@ -4199,7 +4199,7 @@ PER 1 - + 10 20 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml index cd4e4ad8c1..6b464126fe 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml @@ -149,7 +149,7 @@ P 5 - + INT diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13700-13799.xml index f57d778655..6ac9a0032d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13700-13799.xml @@ -3004,7 +3004,7 @@ icon.skill3238 P - + 0.55 0.65 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13800-13899.xml index 702ec8d325..5f727c6621 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13800-13899.xml @@ -1545,7 +1545,7 @@ icon.ensoul_big_p P - + {5+index} @@ -1841,7 +1841,7 @@ PER - + 3 4 @@ -2007,7 +2007,7 @@ DIFF - + 3 4 @@ -2675,7 +2675,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml index 6f63684ef9..0c58d6f23a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml @@ -540,7 +540,7 @@ icon.skill0193 P - + 5 10 @@ -1065,7 +1065,7 @@ 20 DIFF - + 50 PER @@ -1234,7 +1234,7 @@ icon.skill0330 P - + 30 50 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21400-21499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21400-21499.xml index 2da421dc9a..b33611b302 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21400-21499.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21400-21499.xml @@ -1102,7 +1102,7 @@ PER - + 15 16 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml index d855ec1da8..ffb726bcb5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30000-30099.xml @@ -2425,7 +2425,7 @@ 85 - + INT diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30500-30599.xml index 875494af7f..5ac9440769 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30500-30599.xml @@ -1722,7 +1722,7 @@ DIFF - + 10 20 @@ -2319,7 +2319,7 @@ 85 - + STR diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30600-30699.xml index fb020562ab..faac12dc22 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30600-30699.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/30600-30699.xml @@ -52,7 +52,7 @@ 2 3 - + 1 PER diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt index 2b90899468..ed046dcaf7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt @@ -282,10 +282,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 911a706ca6..99b1ebcead 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java index 03901690af..82eabb04ad 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -242,8 +242,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java index a70ba55319..7f83965f1a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -313,10 +313,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java similarity index 86% rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java index 85fdcab54f..f8f1d8e485 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCritical extends AbstractEffect +public class SkillMastery extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatSet params) + public SkillMastery(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } @@ -38,6 +38,6 @@ public class SkillCritical extends AbstractEffect @Override public void pump(Creature effected, Skill skill) { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java similarity index 81% rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java index 0990e29035..edcfad0340 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCriticalProbability extends AbstractStatPercentEffect +public class SkillMasteryRate extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatSet params) + public SkillMasteryRate(StatSet params) { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); + super(params, Stat.SKILL_MASTERY_RATE); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/00300-00399.xml index d576155a5c..fb619f8713 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/00300-00399.xml @@ -1328,7 +1328,7 @@ P 5 - + STR @@ -1340,7 +1340,7 @@ P 5 - + INT @@ -1389,7 +1389,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/08900-08999.xml index d0390e3b27..67f1741c1d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/08900-08999.xml @@ -25,7 +25,7 @@ 100 DIFF - + 30 PER @@ -75,7 +75,7 @@ 500 DIFF - + 50 PER diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml index 0a33acf240..f3987242bc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml @@ -49,7 +49,7 @@ 110 - + STR diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml index 2e450ad119..f427b565e8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml @@ -186,7 +186,7 @@ 110 - + STR diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml index df065945ce..c68307bde4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml @@ -45,7 +45,7 @@ P - + STR @@ -396,11 +396,11 @@ STR PER - + 100 PER - + 10 PER diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml index 76f3c3ea1b..f6b59858ec 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml @@ -81,7 +81,7 @@ 30 PER - + 10 11 @@ -421,7 +421,7 @@ P - + STR @@ -821,7 +821,7 @@ 2 STR - + 100 PER diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10900-10999.xml index 60f6b928fd..a61c67a90b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10900-10999.xml @@ -411,7 +411,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml index 99ccd3c53e..8a3e47caf2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml @@ -53,7 +53,7 @@ 5 P - + INT diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml index 1e96ce1849..eeb60f84cb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml @@ -388,7 +388,7 @@ 5 P - + INT diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml index beeac4ea46..46608fa84a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml @@ -47,7 +47,7 @@ 5 - + STR @@ -4200,7 +4200,7 @@ PER 1 - + 10 20 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml index 8a8ce7aa81..a02c61bd6d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml @@ -149,7 +149,7 @@ P 5 - + INT diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml index fea45d42b2..28a3391250 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13300-13399.xml @@ -1097,7 +1097,7 @@ -10 DEBUFF - + 0 14 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13700-13799.xml index f57d778655..6ac9a0032d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13700-13799.xml @@ -3004,7 +3004,7 @@ icon.skill3238 P - + 0.55 0.65 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13800-13899.xml index 2aaad28100..6643dc519d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13800-13899.xml @@ -1545,7 +1545,7 @@ icon.ensoul_big_p P - + {5+index} @@ -1841,7 +1841,7 @@ PER - + 3 4 @@ -2007,7 +2007,7 @@ DIFF - + 3 4 @@ -2675,7 +2675,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml index c9ba41cd26..89f70b25cd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml @@ -540,7 +540,7 @@ icon.skill0193 P - + 5 10 @@ -1065,7 +1065,7 @@ 20 DIFF - + 50 PER @@ -1234,7 +1234,7 @@ icon.skill0330 P - + 30 50 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21400-21499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21400-21499.xml index ceb09bbeb0..788570c8a5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21400-21499.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21400-21499.xml @@ -1103,7 +1103,7 @@ PER - + 15 16 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml index 136b21fb00..e00fa71f45 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30000-30099.xml @@ -2425,7 +2425,7 @@ 85 - + INT diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30500-30599.xml index 77e1aa85c9..1cb635e612 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30500-30599.xml @@ -1738,7 +1738,7 @@ DIFF - + 10 20 @@ -2335,7 +2335,7 @@ 85 - + STR diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30600-30699.xml index fb020562ab..faac12dc22 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30600-30699.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/30600-30699.xml @@ -52,7 +52,7 @@ 2 3 - + 1 PER diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt index 2b90899468..ed046dcaf7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt @@ -282,10 +282,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 911a706ca6..99b1ebcead 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java index 03901690af..82eabb04ad 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -242,8 +242,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java index 90980ea193..327de4e647 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -318,10 +318,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java similarity index 86% rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java index 85fdcab54f..f8f1d8e485 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCritical extends AbstractEffect +public class SkillMastery extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatSet params) + public SkillMastery(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } @@ -38,6 +38,6 @@ public class SkillCritical extends AbstractEffect @Override public void pump(Creature effected, Skill skill) { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java similarity index 81% rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java index 0990e29035..edcfad0340 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.stats.Stat; /** * @author Sdw */ -public class SkillCriticalProbability extends AbstractStatPercentEffect +public class SkillMasteryRate extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatSet params) + public SkillMasteryRate(StatSet params) { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); + super(params, Stat.SKILL_MASTERY_RATE); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00300-00399.xml index 7f4d6d3ee5..3fc848125a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/00300-00399.xml @@ -1328,7 +1328,7 @@ P 5 - + STR @@ -1340,7 +1340,7 @@ P 5 - + INT @@ -1389,7 +1389,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/08900-08999.xml index d0390e3b27..67f1741c1d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/08900-08999.xml @@ -25,7 +25,7 @@ 100 DIFF - + 30 PER @@ -75,7 +75,7 @@ 500 DIFF - + 50 PER diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml index 40f809cfb8..6cba306990 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml @@ -49,7 +49,7 @@ 110 - + STR diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10200-10299.xml index 17ff83ecc7..f82d5ee654 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10200-10299.xml @@ -186,7 +186,7 @@ 110 - + STR diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml index cb80708466..68da56b945 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml @@ -45,7 +45,7 @@ P - + STR @@ -396,11 +396,11 @@ STR PER - + 100 PER - + 10 PER diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml index b660bc973d..06b0c3da99 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml @@ -80,7 +80,7 @@ 30 PER - + 10 11 @@ -447,7 +447,7 @@ P - + STR @@ -847,7 +847,7 @@ 2 STR - + 100 PER diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10900-10999.xml index 35329b71c1..202081cced 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10900-10999.xml @@ -411,7 +411,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml index 5abad42d98..2efd676cbb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml @@ -53,7 +53,7 @@ 5 P - + INT diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml index 90e8edfe1d..0801b6360c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml @@ -379,7 +379,7 @@ 5 P - + INT diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml index 08b5b56e5f..6ebd750e2b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml @@ -47,7 +47,7 @@ 5 - + STR @@ -4166,7 +4166,7 @@ PER 1 - + 10 20 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml index 5210eb1fc2..ecf0460afd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml @@ -149,7 +149,7 @@ P 5 - + INT diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13300-13399.xml index 26bbb1ff1c..9f04a1a01a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13300-13399.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13300-13399.xml @@ -1097,7 +1097,7 @@ -10 DEBUFF - + 0 14 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13700-13799.xml index 38140f25b6..f13de3a550 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13700-13799.xml @@ -3004,7 +3004,7 @@ icon.skill3238 P - + 0.55 0.65 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml index 983710d1aa..8ca711981a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13800-13899.xml @@ -1818,7 +1818,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2114,7 +2114,7 @@ PER - + 3 4 @@ -2280,7 +2280,7 @@ DIFF - + 3 4 @@ -2948,7 +2948,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml index c149ef5714..f611c4fc65 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml @@ -540,7 +540,7 @@ icon.skill0193 P - + 5 10 @@ -1065,7 +1065,7 @@ 20 DIFF - + 50 PER @@ -1234,7 +1234,7 @@ icon.skill0330 P - + 30 50 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml index a883ad6cbb..01aa400a59 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml @@ -1580,7 +1580,7 @@ icon.skill1532 P - + 10 PER @@ -1669,7 +1669,7 @@ icon.skill0193 P - + 3 6 @@ -1741,7 +1741,7 @@ icon.skill0330 P - + 30 60 @@ -2085,7 +2085,7 @@ icon.skill0330 P - + 30 60 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21400-21499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21400-21499.xml index 07c02f0a51..b39eb7affe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21400-21499.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21400-21499.xml @@ -1103,7 +1103,7 @@ PER - + 15 16 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27900-27999.xml index cdc12ec521..a489778586 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27900-27999.xml @@ -222,7 +222,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1272,7 +1272,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml index 8c7af23129..496e9ee711 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml @@ -2343,7 +2343,7 @@ 85 - + INT diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml index 2e6238c610..ceb1f058cf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30500-30599.xml @@ -1738,7 +1738,7 @@ DIFF - + 10 20 @@ -2335,7 +2335,7 @@ 85 - + STR diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30600-30699.xml index fb020562ab..faac12dc22 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30600-30699.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30600-30699.xml @@ -52,7 +52,7 @@ 2 3 - + 1 PER diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt index 43ba17fbe2..c47e59a8c4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt @@ -287,10 +287,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 911a706ca6..99b1ebcead 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java index 6e836752c4..e4cb22c9a5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -242,8 +242,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java index 43ebd4968b..3ea0fadb77 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -322,10 +322,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/00300-00399.xml index 5a2e07ad33..203a17ef8f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/00300-00399.xml @@ -1328,7 +1328,7 @@ P 5 - + STR @@ -1340,7 +1340,7 @@ P 5 - + INT @@ -1389,7 +1389,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/08900-08999.xml index ef8a456463..2b57c0f58d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/08900-08999.xml @@ -25,7 +25,7 @@ 100 DIFF - + 30 PER @@ -75,7 +75,7 @@ 500 DIFF - + 50 PER @@ -128,7 +128,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml index e565ca1c11..435b00ca07 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml @@ -92,7 +92,7 @@ BLUNT - + STR diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml index 33e5c0a260..b68937f450 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml @@ -194,7 +194,7 @@ 110 - + STR diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml index f65ba184a0..2111d48b1f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml @@ -45,7 +45,7 @@ P - + STR @@ -396,11 +396,11 @@ STR PER - + 100 PER - + 10 PER diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml index bfbce62005..74fadbce11 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml @@ -80,7 +80,7 @@ 30 PER - + 10 11 @@ -486,7 +486,7 @@ P - + STR @@ -886,11 +886,11 @@ 2 STR - + 100 PER - + 10 PER diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10900-10999.xml index 1d6dfca9de..ebb056e2f7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10900-10999.xml @@ -411,7 +411,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11000-11099.xml index 17761f8b4f..ce2982caf5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11000-11099.xml @@ -53,7 +53,7 @@ 5 P - + INT diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11200-11299.xml index 226a10ca31..56b7409465 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11200-11299.xml @@ -386,7 +386,7 @@ 5 P - + INT diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml index 242f25d785..29877404ac 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml @@ -47,7 +47,7 @@ 5 - + STR diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml index 5783a29209..dfcf1667cd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml @@ -149,7 +149,7 @@ P 5 - + INT diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13300-13399.xml index d7852879fe..6181620d1a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13300-13399.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13300-13399.xml @@ -1097,7 +1097,7 @@ -10 DEBUFF - + 0 14 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13700-13799.xml index 6b72be0565..61416a2619 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13700-13799.xml @@ -3004,7 +3004,7 @@ icon.skill3238 P - + 0.55 0.65 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13800-13899.xml index 61b98a0378..3e7080d1dc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13800-13899.xml @@ -1818,7 +1818,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2114,7 +2114,7 @@ PER - + 3 4 @@ -2280,7 +2280,7 @@ DIFF - + 3 4 @@ -2948,7 +2948,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19100-19199.xml index 2b3dce4de8..0d28970272 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19100-19199.xml @@ -540,7 +540,7 @@ icon.skill0193 P - + 5 10 @@ -1065,7 +1065,7 @@ 20 DIFF - + 50 PER @@ -1234,7 +1234,7 @@ icon.skill0330 P - + 30 50 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml index aa809f2032..ef83d498a8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml @@ -1126,7 +1126,7 @@ 15 PER - + 15 PER @@ -1619,7 +1619,7 @@ icon.skill1532 P - + 10 PER @@ -1708,7 +1708,7 @@ icon.skill0193 P - + 3 6 @@ -1780,7 +1780,7 @@ icon.skill0330 P - + 30 60 @@ -2124,7 +2124,7 @@ icon.skill0330 P - + 30 60 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21400-21499.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21400-21499.xml index ed9fb8397c..fd5874657e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21400-21499.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21400-21499.xml @@ -1103,7 +1103,7 @@ PER - + 15 16 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/27900-27999.xml index a403e90a75..bd478dfcc4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/27900-27999.xml @@ -222,7 +222,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1272,7 +1272,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/28000-28099.xml index fb7be604e4..14ffcbc333 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/28000-28099.xml @@ -1084,7 +1084,7 @@ BranchIcon.icon.g_bm_sag_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30000-30099.xml index bf0b4359e7..23c8717c5b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30000-30099.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30000-30099.xml @@ -2343,7 +2343,7 @@ 85 - + INT diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30500-30599.xml index 352c4189ca..f4f4c6e399 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30500-30599.xml @@ -1749,7 +1749,7 @@ DIFF - + 10 20 @@ -2391,7 +2391,7 @@ 85 - + STR diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30600-30699.xml index d3501f3ac5..8554c3146b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30600-30699.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/30600-30699.xml @@ -52,7 +52,7 @@ 2 3 - + 1 PER diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35000-35099.xml index b5f6e39e64..30c9cc9a95 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/35000-35099.xml @@ -1173,7 +1173,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/documentation.txt index 619dfbde53..47b1f61bb5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/documentation.txt @@ -291,10 +291,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 911a706ca6..99b1ebcead 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java index 18e8e84039..6098657149 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -244,8 +244,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java index 5530ef8da1..73d6d960a3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -323,10 +323,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/00300-00399.xml index 14697f51c2..f0980441e1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/00300-00399.xml @@ -1328,7 +1328,7 @@ P 5 - + STR @@ -1340,7 +1340,7 @@ P 5 - + INT @@ -1389,7 +1389,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/08900-08999.xml index ef8a456463..2b57c0f58d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/08900-08999.xml @@ -25,7 +25,7 @@ 100 DIFF - + 30 PER @@ -75,7 +75,7 @@ 500 DIFF - + 50 PER @@ -128,7 +128,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml index fca8c9e5c5..2a8487de96 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml @@ -92,7 +92,7 @@ BLUNT - + STR diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml index 3d90e6a683..9308c2de22 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml @@ -194,7 +194,7 @@ 110 - + STR diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml index 9caf3c06b2..659281e09c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml @@ -45,7 +45,7 @@ P - + STR @@ -396,11 +396,11 @@ STR PER - + 100 PER - + 10 PER diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml index 0af2290f37..f4f9e194b7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml @@ -80,7 +80,7 @@ 30 PER - + 10 11 @@ -484,7 +484,7 @@ P - + STR @@ -884,11 +884,11 @@ 2 STR - + 100 PER - + 10 PER diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10900-10999.xml index b35f5610b7..ff3aa1756f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10900-10999.xml @@ -411,7 +411,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml index cbcaace43d..48613301bb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml @@ -53,7 +53,7 @@ 5 P - + INT diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11200-11299.xml index 03ad3982e6..eadb6e02a6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11200-11299.xml @@ -386,7 +386,7 @@ 5 P - + INT diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml index 17616eb742..f60cfc8571 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml @@ -47,7 +47,7 @@ 5 - + STR diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml index faed81f5e9..4763b0d06f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml @@ -149,7 +149,7 @@ P 5 - + INT diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13300-13399.xml index e495ee8bca..2dfa02d601 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13300-13399.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13300-13399.xml @@ -1097,7 +1097,7 @@ -10 DEBUFF - + 0 14 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13700-13799.xml index ec9b14cd8b..3d53afb79e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13700-13799.xml @@ -3004,7 +3004,7 @@ icon.skill3238 P - + 0.55 0.65 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13800-13899.xml index 5368378552..d70debcc5f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13800-13899.xml @@ -1818,7 +1818,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2114,7 +2114,7 @@ PER - + 3 4 @@ -2280,7 +2280,7 @@ DIFF - + 3 4 @@ -2948,7 +2948,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17800-17899.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17800-17899.xml index f132551eb5..6ef419c2c5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17800-17899.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17800-17899.xml @@ -984,7 +984,7 @@ CHA - + 0 0 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml index cc21e29d49..f9c1734a78 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml @@ -540,7 +540,7 @@ icon.skill0193 P - + 5 10 @@ -1065,7 +1065,7 @@ 20 DIFF - + 50 PER @@ -1234,7 +1234,7 @@ icon.skill0330 P - + 30 50 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml index f267f7eaa2..0f6a92319c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml @@ -1126,7 +1126,7 @@ 15 PER - + 15 PER @@ -1619,7 +1619,7 @@ icon.skill1532 P - + 10 PER @@ -1708,7 +1708,7 @@ icon.skill0193 P - + 3 6 @@ -1780,7 +1780,7 @@ icon.skill0330 P - + 30 60 @@ -2124,7 +2124,7 @@ icon.skill0330 P - + 30 60 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21400-21499.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21400-21499.xml index ed0b4bbdeb..f808170b3c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21400-21499.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21400-21499.xml @@ -1103,7 +1103,7 @@ PER - + 15 16 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/27900-27999.xml index 2d2fc63b74..9fd75084e7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/27900-27999.xml @@ -222,7 +222,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1272,7 +1272,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml index 7d9b5c4049..ba45155f36 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml @@ -1084,7 +1084,7 @@ BranchIcon.icon.g_bm_sag_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml index 93a645f8a9..9fd61a63f7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml @@ -2343,7 +2343,7 @@ 85 - + INT diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml index 29c2930d0d..3fe2021be0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30500-30599.xml @@ -1750,7 +1750,7 @@ DIFF - + 10 20 @@ -2395,7 +2395,7 @@ 85 - + STR diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30600-30699.xml index d3501f3ac5..8554c3146b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30600-30699.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/30600-30699.xml @@ -52,7 +52,7 @@ 2 3 - + 1 PER diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35000-35099.xml index 1ab267e6ca..3dba9e58ff 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35000-35099.xml @@ -1173,7 +1173,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35200-35299.xml index 44284e283b..3e01b19d42 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/35200-35299.xml @@ -2751,7 +2751,7 @@ 5 80 - + 0 1 @@ -2777,7 +2777,7 @@ 5 80 - + 0 1 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/documentation.txt index 130b688b37..84641d7d6f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/documentation.txt @@ -292,10 +292,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 911a706ca6..99b1ebcead 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java index bcb0a6d10d..6d01f22316 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -244,8 +244,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java index 5530ef8da1..73d6d960a3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -323,10 +323,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/00300-00399.xml index 5a77da9bc2..0b2c71c2b8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/00300-00399.xml @@ -1336,7 +1336,7 @@ P 5 - + STR @@ -1348,7 +1348,7 @@ P 5 - + INT @@ -1397,7 +1397,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/08900-08999.xml index ef8a456463..2b57c0f58d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/08900-08999.xml @@ -25,7 +25,7 @@ 100 DIFF - + 30 PER @@ -75,7 +75,7 @@ 500 DIFF - + 50 PER @@ -128,7 +128,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml index 3cad50684f..11f47baec9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml @@ -92,7 +92,7 @@ BLUNT - + STR diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml index 762e4a6694..15d879e4a5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml @@ -194,7 +194,7 @@ 110 - + STR diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml index 00515d3f7a..de0c2b62e5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml @@ -45,7 +45,7 @@ P - + STR @@ -396,11 +396,11 @@ STR PER - + 100 PER - + 10 PER diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml index e780cac063..5493248fd2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml @@ -86,7 +86,7 @@ 30 PER - + 10 11 @@ -504,7 +504,7 @@ P - + STR @@ -904,11 +904,11 @@ 2 STR - + 100 PER - + 10 PER diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10900-10999.xml index e15d73ead0..8adc4d1aff 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10900-10999.xml @@ -411,7 +411,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml index 4588667121..0e0fe0551a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml @@ -53,7 +53,7 @@ 5 P - + INT diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml index ded7df27cf..4f90342616 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11200-11299.xml @@ -390,7 +390,7 @@ 5 P - + INT diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml index 04765005b4..bbabba9465 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml @@ -47,7 +47,7 @@ 5 - + STR diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml index f275fb110c..dcd6d69ef3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml @@ -149,7 +149,7 @@ P 5 - + INT diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13300-13399.xml index 7a1c288de1..416ae7ad8f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13300-13399.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13300-13399.xml @@ -1097,7 +1097,7 @@ -10 DEBUFF - + 0 14 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13700-13799.xml index f535555ad9..f107ccf191 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13700-13799.xml @@ -3004,7 +3004,7 @@ icon.skill3238 P - + 0.55 0.65 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13800-13899.xml index 4d0cd109d2..cf48d6736e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13800-13899.xml @@ -1818,7 +1818,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2114,7 +2114,7 @@ PER - + 3 4 @@ -2280,7 +2280,7 @@ DIFF - + 3 4 @@ -2948,7 +2948,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17800-17899.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17800-17899.xml index 796e4a8ca7..2bd462fd83 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17800-17899.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17800-17899.xml @@ -984,7 +984,7 @@ CHA - + 0 0 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml index 5122bb268c..f0871df201 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml @@ -540,7 +540,7 @@ icon.skill0193 P - + 5 10 @@ -1065,7 +1065,7 @@ 20 DIFF - + 50 PER @@ -1234,7 +1234,7 @@ icon.skill0330 P - + 30 50 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml index db2bbab566..6bfd4a02b9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml @@ -1126,7 +1126,7 @@ 15 PER - + 15 PER @@ -1619,7 +1619,7 @@ icon.skill1532 P - + 10 PER @@ -1708,7 +1708,7 @@ icon.skill0193 P - + 3 6 @@ -1780,7 +1780,7 @@ icon.skill0330 P - + 30 60 @@ -2124,7 +2124,7 @@ icon.skill0330 P - + 30 60 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/21400-21499.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/21400-21499.xml index 4e4a1be191..3abfc8236c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/21400-21499.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/21400-21499.xml @@ -1104,7 +1104,7 @@ PER - + 15 16 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/27900-27999.xml index 3be1a08e6d..5abc2b0cd2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/27900-27999.xml @@ -222,7 +222,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1272,7 +1272,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml index 9bb5a6aea7..3a49cdae3f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml @@ -1084,7 +1084,7 @@ BranchIcon.icon.g_bm_sag_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml index 971c10648f..32c571a0a3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml @@ -2433,7 +2433,7 @@ 85 - + INT diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml index 43e9212cf4..e7847dcedc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30500-30599.xml @@ -1813,7 +1813,7 @@ DIFF - + 10 20 @@ -2458,7 +2458,7 @@ 85 - + STR diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30600-30699.xml index d3501f3ac5..8554c3146b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30600-30699.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/30600-30699.xml @@ -52,7 +52,7 @@ 2 3 - + 1 PER diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35000-35099.xml index 53d0358870..7c109768c3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35000-35099.xml @@ -555,7 +555,7 @@ PER - + 0 20 @@ -663,7 +663,7 @@ PER - + 0 20 @@ -771,7 +771,7 @@ PER - + 0 20 @@ -1564,7 +1564,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35200-35299.xml index ed129a4327..eb82f0e3fc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35200-35299.xml @@ -2751,7 +2751,7 @@ 5 80 - + 0 1 @@ -2777,7 +2777,7 @@ 5 80 - + 0 1 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/documentation.txt index 130b688b37..84641d7d6f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/documentation.txt @@ -292,10 +292,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 911a706ca6..99b1ebcead 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java index bcb0a6d10d..6d01f22316 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -244,8 +244,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java index b21b4d92c3..a59d55b96d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -323,10 +323,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/00300-00399.xml index 8bd7482ff4..27da3cd809 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/00300-00399.xml @@ -1336,7 +1336,7 @@ P 5 - + STR @@ -1348,7 +1348,7 @@ P 5 - + INT @@ -1397,7 +1397,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/08900-08999.xml index 330d6652e3..34c403afaa 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/08900-08999.xml @@ -25,7 +25,7 @@ 100 DIFF - + 30 PER @@ -75,7 +75,7 @@ 500 DIFF - + 50 PER @@ -128,7 +128,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml index 9458ca6d0c..c0a998e096 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml @@ -92,7 +92,7 @@ BLUNT - + STR diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml index 880c410de6..286db5c88a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml @@ -194,7 +194,7 @@ 110 - + STR diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml index e7d8136302..ee6e4ffc9b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml @@ -45,7 +45,7 @@ P - + STR @@ -396,11 +396,11 @@ STR PER - + 100 PER - + 10 PER diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml index 996fa9dd06..a11c2df800 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml @@ -86,7 +86,7 @@ 30 PER - + 10 11 @@ -504,7 +504,7 @@ P - + STR @@ -904,11 +904,11 @@ 2 STR - + 100 PER - + 10 PER diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10900-10999.xml index 6028b5cc4a..23dcb500a9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10900-10999.xml @@ -411,7 +411,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml index c4f24ad88e..9ea954a372 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml @@ -53,7 +53,7 @@ 5 P - + INT diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11200-11299.xml index a5ea6dc055..68c2d87850 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11200-11299.xml @@ -390,7 +390,7 @@ 5 P - + INT diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml index 820c8d8cfd..a703444289 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml @@ -47,7 +47,7 @@ 5 - + STR diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml index ba131e2a0b..423a19783b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml @@ -149,7 +149,7 @@ P 5 - + INT diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13300-13399.xml index 5240fc47c4..93d86b8f81 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13300-13399.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13300-13399.xml @@ -1097,7 +1097,7 @@ -10 DEBUFF - + 0 14 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13700-13799.xml index e964e09fbb..2bf7bcb462 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13700-13799.xml @@ -3004,7 +3004,7 @@ icon.skill3238 P - + 0.55 0.65 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13800-13899.xml index 19ba7b62da..13b19a3ac5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/13800-13899.xml @@ -1818,7 +1818,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2114,7 +2114,7 @@ PER - + 3 4 @@ -2280,7 +2280,7 @@ DIFF - + 3 4 @@ -2948,7 +2948,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/17800-17899.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/17800-17899.xml index 5df2edfdd3..c4cd515a0a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/17800-17899.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/17800-17899.xml @@ -984,7 +984,7 @@ CHA - + 0 0 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml index f1fa792ebc..6a79417af9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml @@ -540,7 +540,7 @@ icon.skill0193 P - + 5 10 @@ -1065,7 +1065,7 @@ 20 DIFF - + 50 PER @@ -1234,7 +1234,7 @@ icon.skill0330 P - + 30 50 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml index eb5e223c19..4a6b7b87a0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml @@ -1130,7 +1130,7 @@ 15 PER - + 15 PER @@ -1623,7 +1623,7 @@ icon.skill1532 P - + 10 PER @@ -1712,7 +1712,7 @@ icon.skill0193 P - + 3 6 @@ -1784,7 +1784,7 @@ icon.skill0330 P - + 30 60 @@ -2128,7 +2128,7 @@ icon.skill0330 P - + 30 60 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/21400-21499.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/21400-21499.xml index 970a72c4d8..9dde3a884e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/21400-21499.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/21400-21499.xml @@ -1104,7 +1104,7 @@ PER - + 15 16 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/27900-27999.xml index c2b59bc50b..d68b95b44b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/27900-27999.xml @@ -222,7 +222,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1272,7 +1272,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/28000-28099.xml index 70f8f7831b..77abe48393 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/28000-28099.xml @@ -1084,7 +1084,7 @@ BranchIcon.icon.g_bm_sag_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml index 57ae230f37..f821e435f2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml @@ -2450,7 +2450,7 @@ 85 - + INT diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml index cfe86cd32e..5891f16c24 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30500-30599.xml @@ -1813,7 +1813,7 @@ DIFF - + 10 20 @@ -2458,7 +2458,7 @@ 85 - + STR diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml index 51294ca653..5251fda5a0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30600-30699.xml @@ -24,7 +24,7 @@ 5 85 - + 1 PER @@ -48,7 +48,7 @@ 2 3 - + 1 PER @@ -934,7 +934,7 @@ P 5 - + STR @@ -1033,7 +1033,7 @@ P 5 - + STR @@ -1130,7 +1130,7 @@ P 5 - + STR @@ -1181,7 +1181,7 @@ P 5 - + INT @@ -1204,7 +1204,7 @@ P 5 - + INT diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml index 25498193f5..bb5a828244 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml @@ -83,7 +83,7 @@ 76 - + STR @@ -534,7 +534,7 @@ 76 - + STR @@ -700,7 +700,7 @@ 76 - + STR @@ -882,7 +882,7 @@ 76 - + STR @@ -1025,7 +1025,7 @@ 76 - + INT @@ -1136,7 +1136,7 @@ 76 - + STR @@ -1446,7 +1446,7 @@ 76 - + INT @@ -1700,7 +1700,7 @@ 76 - + INT diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30800-30899.xml index 35348028c0..686838959a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30800-30899.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30800-30899.xml @@ -75,7 +75,7 @@ BLUNT - + STR diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35000-35099.xml index 18cb0836e6..4c89d2d3c4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35000-35099.xml @@ -555,7 +555,7 @@ PER - + 0 20 @@ -663,7 +663,7 @@ PER - + 0 20 @@ -771,7 +771,7 @@ PER - + 0 20 @@ -1564,7 +1564,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35200-35299.xml index 5618430f64..913f482507 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35200-35299.xml @@ -2751,7 +2751,7 @@ 5 80 - + 0 1 @@ -2777,7 +2777,7 @@ 5 80 - + 0 1 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35500-35599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35500-35599.xml index c4f85f9446..a18df34d1f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35500-35599.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/35500-35599.xml @@ -594,7 +594,7 @@ 100 DIFF - + 30 PER @@ -676,7 +676,7 @@ 100 DIFF - + 30 PER diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt index 8ad58d0f8a..c5295a3a6e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt @@ -291,10 +291,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java index eff174edb5..42aec5ba73 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java index bcb0a6d10d..6d01f22316 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -244,8 +244,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java index 41ac762926..8531b684f8 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -323,10 +323,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/00300-00399.xml index d1a07614ab..3cec9a5cd8 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/00300-00399.xml @@ -1336,7 +1336,7 @@ P 5 - + STR @@ -1348,7 +1348,7 @@ P 5 - + INT @@ -1397,7 +1397,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01400-01499.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01400-01499.xml index da1a6bc538..a8f7b63450 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01400-01499.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01400-01499.xml @@ -634,7 +634,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/08900-08999.xml index 00d03076e8..8c7b68d5ef 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/08900-08999.xml @@ -25,7 +25,7 @@ 100 DIFF - + 30 PER @@ -75,7 +75,7 @@ 500 DIFF - + 50 PER @@ -128,7 +128,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10000-10099.xml index 0ac3bbe8f1..3e322c7c14 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10000-10099.xml @@ -114,7 +114,7 @@ BLUNT - + STR diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10200-10299.xml index e8e3922756..fdeec01acf 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10200-10299.xml @@ -194,7 +194,7 @@ 110 - + STR diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10300-10399.xml index 022ff7aa13..230d2ad0e9 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10300-10399.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10300-10399.xml @@ -1387,7 +1387,7 @@ BLUNT - + 30 PER @@ -1516,7 +1516,7 @@ DUAL - + 20 PER diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10500-10599.xml index c1158b9952..b4535dac8a 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10500-10599.xml @@ -45,7 +45,7 @@ P - + STR @@ -395,11 +395,11 @@ 2 STR - + 100 PER - + 10 PER diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10700-10799.xml index 4f06ee4a4c..828de3cb3f 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10700-10799.xml @@ -86,7 +86,7 @@ 30 PER - + 10 11 @@ -510,7 +510,7 @@ P - + STR @@ -927,7 +927,7 @@ 2 STR - + 10 PER diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10900-10999.xml index 73c7ed7fd2..2c95464910 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/10900-10999.xml @@ -425,7 +425,7 @@ PER - + 15 PER diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11000-11099.xml index 08db350354..3d52849b76 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11000-11099.xml @@ -53,7 +53,7 @@ 5 P - + INT diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11200-11299.xml index 6d4f383977..71ed690c06 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11200-11299.xml @@ -391,7 +391,7 @@ 5 P - + INT diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11500-11599.xml index bdcffccb0c..52361832c7 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11500-11599.xml @@ -47,7 +47,7 @@ 5 - + STR @@ -3577,7 +3577,7 @@ {base + (base / 100 * subIndex)} - + -50 PER diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11700-11799.xml index b1e97a353e..63f69318dd 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11700-11799.xml @@ -149,7 +149,7 @@ P 5 - + INT diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13300-13399.xml index e3b4f8502f..490341e8e7 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13300-13399.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13300-13399.xml @@ -1102,7 +1102,7 @@ -10 DEBUFF - + 0 14 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13600-13699.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13600-13699.xml index f37d5443ed..d0e78db3d0 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13600-13699.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13600-13699.xml @@ -1426,7 +1426,7 @@ 30 PER - + 20 PER diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13700-13799.xml index 5db254eead..ff4ae1ba72 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13700-13799.xml @@ -3016,7 +3016,7 @@ icon.skill3238 P - + 0.55 0.65 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13800-13899.xml index 75c37b0c12..985f15748d 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/13800-13899.xml @@ -1818,7 +1818,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2114,7 +2114,7 @@ PER - + 3 4 @@ -2280,7 +2280,7 @@ DIFF - + 3 4 @@ -2948,7 +2948,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/17800-17899.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/17800-17899.xml index b6d7d4516f..5a3fd0c731 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/17800-17899.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/17800-17899.xml @@ -1170,7 +1170,7 @@ CHA - + 0 0 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19100-19199.xml index a6fd1f22f9..99f3b64363 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19100-19199.xml @@ -581,7 +581,7 @@ icon.skill0193 P - + 5 10 @@ -1106,7 +1106,7 @@ 20 DIFF - + 50 PER @@ -1275,7 +1275,7 @@ icon.skill0330 P - + 30 50 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19200-19299.xml index 4f2506745c..3dff522973 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19200-19299.xml @@ -1652,7 +1652,7 @@ icon.skill1532 P - + 10 PER @@ -1741,7 +1741,7 @@ icon.skill0193 P - + 3 6 @@ -1825,7 +1825,7 @@ - + 30 60 @@ -2181,7 +2181,7 @@ - + 30 60 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/21400-21499.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/21400-21499.xml index facc5acacb..fa102d7cbc 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/21400-21499.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/21400-21499.xml @@ -1111,7 +1111,7 @@ PER - + 15 16 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/27900-27999.xml index 618acf8de4..7d6c232fe4 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/27900-27999.xml @@ -222,7 +222,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1272,7 +1272,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/28000-28099.xml index 0f7549e8ec..1dff444810 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/28000-28099.xml @@ -1084,7 +1084,7 @@ BranchIcon.icon.g_bm_sag_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30000-30099.xml index 63d584ab9e..70d1b49676 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30000-30099.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30000-30099.xml @@ -2530,7 +2530,7 @@ 85 - + INT diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30500-30599.xml index 5e38378242..f5674c8bb9 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30500-30599.xml @@ -1829,7 +1829,7 @@ DIFF - + 10 20 @@ -2517,7 +2517,7 @@ 85 - + STR diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30600-30699.xml index 2e6101ea02..cf179b64a2 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30600-30699.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30600-30699.xml @@ -24,7 +24,7 @@ 5 85 - + 1 PER @@ -48,7 +48,7 @@ 2 3 - + 1 PER @@ -937,7 +937,7 @@ P 5 - + STR @@ -1036,7 +1036,7 @@ P 5 - + STR @@ -1133,7 +1133,7 @@ P 5 - + STR @@ -1184,7 +1184,7 @@ P 5 - + INT @@ -1207,7 +1207,7 @@ P 5 - + INT diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30700-30799.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30700-30799.xml index 15f8756b60..3e1149afb9 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30700-30799.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30700-30799.xml @@ -84,7 +84,7 @@ 76 - + STR @@ -524,7 +524,7 @@ 76 - + STR @@ -697,7 +697,7 @@ 76 - + STR @@ -879,7 +879,7 @@ 76 - + STR @@ -1022,7 +1022,7 @@ 76 - + INT @@ -1133,7 +1133,7 @@ 76 - + STR @@ -1437,7 +1437,7 @@ 76 - + INT @@ -1691,7 +1691,7 @@ 76 - + INT diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30800-30899.xml index 85eae8bc65..7a7cad888b 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30800-30899.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30800-30899.xml @@ -75,7 +75,7 @@ BLUNT - + STR @@ -1062,7 +1062,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35000-35099.xml index 1fa66ed4e6..08cea32f9c 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35000-35099.xml @@ -1166,7 +1166,7 @@ PER - + 0 20 @@ -1274,7 +1274,7 @@ PER - + 0 20 @@ -1382,7 +1382,7 @@ PER - + 0 20 @@ -2175,7 +2175,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35200-35299.xml index 73e0d89883..6500f4025f 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35200-35299.xml @@ -2872,7 +2872,7 @@ 5 80 - + 0 1 @@ -2898,7 +2898,7 @@ 5 80 - + 0 1 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35500-35599.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35500-35599.xml index 90ca34ecce..a6819fb0a7 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35500-35599.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35500-35599.xml @@ -605,7 +605,7 @@ 100 DIFF - + 30 PER @@ -687,7 +687,7 @@ 100 DIFF - + 30 PER diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35600-35699.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35600-35699.xml index c6684069e0..ab04b512e5 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35600-35699.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35600-35699.xml @@ -3245,7 +3245,7 @@ icon.elemental_necklace_wind_i00 P - + 1 2 3 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35700-35799.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35700-35799.xml index 2b80c00da3..eab6e37885 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35700-35799.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35700-35799.xml @@ -1471,7 +1471,7 @@ icon.accessary_angel_of_earing P - + 1 2 3 @@ -1773,7 +1773,7 @@ icon.new_ring_of_hero P - + 1 2 3 @@ -2075,7 +2075,7 @@ icon.bm_ring_of_fallen_angel P - + 1 2 3 @@ -2377,7 +2377,7 @@ branchsys2.icon2.g_accessory_event_earring P - + 1 2 3 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35800-35899.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35800-35899.xml index 71526879d5..f29a03d4e8 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35800-35899.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/35800-35899.xml @@ -262,7 +262,7 @@ icon.dragon_accessary_necklace P - + 1 2 3 @@ -564,7 +564,7 @@ icon.dragon_accessary_earring P - + 1 2 3 @@ -866,7 +866,7 @@ icon.dragon_accessary_ring P - + 1 2 3 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/documentation.txt index 739004dd72..e3c907937e 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/documentation.txt @@ -291,10 +291,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java index eff174edb5..42aec5ba73 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java index bcb0a6d10d..6d01f22316 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -244,8 +244,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java index b967dfc3eb..36cd12a9fc 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -323,10 +323,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/00300-00399.xml index 7a452d1b73..1a20b82290 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/00300-00399.xml @@ -1336,7 +1336,7 @@ P 5 - + STR @@ -1348,7 +1348,7 @@ P 5 - + INT @@ -1397,7 +1397,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01400-01499.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01400-01499.xml index e1e538baf2..6b381a0c34 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01400-01499.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01400-01499.xml @@ -634,7 +634,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/08900-08999.xml index 00d03076e8..8c7b68d5ef 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/08900-08999.xml @@ -25,7 +25,7 @@ 100 DIFF - + 30 PER @@ -75,7 +75,7 @@ 500 DIFF - + 50 PER @@ -128,7 +128,7 @@ 30 PER - + 30 PER diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10000-10099.xml index 0ade3bd534..93850ad18f 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10000-10099.xml @@ -114,7 +114,7 @@ BLUNT - + STR diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10200-10299.xml index 05463f04f6..9e9bc48d85 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10200-10299.xml @@ -194,7 +194,7 @@ 110 - + STR diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10300-10399.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10300-10399.xml index 022ff7aa13..230d2ad0e9 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10300-10399.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10300-10399.xml @@ -1387,7 +1387,7 @@ BLUNT - + 30 PER @@ -1516,7 +1516,7 @@ DUAL - + 20 PER diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10500-10599.xml index 3979b59b0a..7fdc061cea 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10500-10599.xml @@ -45,7 +45,7 @@ P - + STR @@ -395,11 +395,11 @@ 2 STR - + 100 PER - + 10 PER diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10700-10799.xml index b0b6b7657b..4f39fb01a0 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10700-10799.xml @@ -86,7 +86,7 @@ 30 PER - + 10 11 @@ -510,7 +510,7 @@ P - + STR @@ -927,7 +927,7 @@ 2 STR - + 10 PER diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10900-10999.xml index bef75028cd..ab7fff974a 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10900-10999.xml @@ -425,7 +425,7 @@ PER - + 15 PER diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11000-11099.xml index d27ea4cc52..b2298af3c1 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11000-11099.xml @@ -53,7 +53,7 @@ 5 P - + INT diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11200-11299.xml index f76a493c9f..22e13c9019 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11200-11299.xml @@ -391,7 +391,7 @@ 5 P - + INT diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11500-11599.xml index 5793b83299..e226a44d75 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11500-11599.xml @@ -47,7 +47,7 @@ 5 - + STR @@ -3577,7 +3577,7 @@ {base + (base / 100 * subIndex)} - + -50 PER diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml index 71136e1fa8..8dec8a4504 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml @@ -149,7 +149,7 @@ P 5 - + INT diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13300-13399.xml index d77f679afa..f9cdc09960 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13300-13399.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13300-13399.xml @@ -1102,7 +1102,7 @@ -10 DEBUFF - + 0 14 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13600-13699.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13600-13699.xml index a3f801f326..9c85a5b5de 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13600-13699.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13600-13699.xml @@ -1426,7 +1426,7 @@ 30 PER - + 20 PER diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13700-13799.xml index 0c6c0b73e5..1bdf871c36 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13700-13799.xml @@ -3016,7 +3016,7 @@ icon.skill3238 P - + 0.55 0.65 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13800-13899.xml index b9019931ff..00102fc352 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/13800-13899.xml @@ -1818,7 +1818,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2114,7 +2114,7 @@ PER - + 3 4 @@ -2280,7 +2280,7 @@ DIFF - + 3 4 @@ -2948,7 +2948,7 @@ PER - + 3 4 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17800-17899.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17800-17899.xml index bc1de8b18d..ed560aa98d 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17800-17899.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17800-17899.xml @@ -1170,7 +1170,7 @@ CHA - + 0 0 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19100-19199.xml index befae0ceef..b91273d70e 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19100-19199.xml @@ -581,7 +581,7 @@ icon.skill0193 P - + 5 10 @@ -1106,7 +1106,7 @@ 20 DIFF - + 50 PER @@ -1275,7 +1275,7 @@ icon.skill0330 P - + 30 50 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml index 367c2247ff..94998605f5 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml @@ -1652,7 +1652,7 @@ icon.skill1532 P - + 10 PER @@ -1741,7 +1741,7 @@ icon.skill0193 P - + 3 6 @@ -1825,7 +1825,7 @@ - + 30 60 @@ -2181,7 +2181,7 @@ - + 30 60 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21400-21499.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21400-21499.xml index facc5acacb..fa102d7cbc 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21400-21499.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21400-21499.xml @@ -1111,7 +1111,7 @@ PER - + 15 16 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27900-27999.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27900-27999.xml index e7090fe0e3..4cfb8025c1 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27900-27999.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/27900-27999.xml @@ -222,7 +222,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1272,7 +1272,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/28000-28099.xml index 083bd0e859..e9fd90e34f 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/28000-28099.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/28000-28099.xml @@ -1084,7 +1084,7 @@ BranchIcon.icon.g_bm_sag_agathion_charm P - + 0 1 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30000-30099.xml index 8226ae5182..d2299c4d1c 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30000-30099.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30000-30099.xml @@ -2530,7 +2530,7 @@ 85 - + INT diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml index a1b06bb803..96398d00a9 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30500-30599.xml @@ -1829,7 +1829,7 @@ DIFF - + 10 20 @@ -2517,7 +2517,7 @@ 85 - + STR diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30600-30699.xml index 7ef9eaf846..502d38bf72 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30600-30699.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30600-30699.xml @@ -24,7 +24,7 @@ 5 85 - + 1 PER @@ -48,7 +48,7 @@ 2 3 - + 1 PER @@ -937,7 +937,7 @@ P 5 - + STR @@ -1036,7 +1036,7 @@ P 5 - + STR @@ -1133,7 +1133,7 @@ P 5 - + STR @@ -1184,7 +1184,7 @@ P 5 - + INT @@ -1207,7 +1207,7 @@ P 5 - + INT diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30700-30799.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30700-30799.xml index 0ba00a0418..a8f155923b 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30700-30799.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30700-30799.xml @@ -84,7 +84,7 @@ 76 - + STR @@ -524,7 +524,7 @@ 76 - + STR @@ -697,7 +697,7 @@ 76 - + STR @@ -879,7 +879,7 @@ 76 - + STR @@ -1022,7 +1022,7 @@ 76 - + INT @@ -1133,7 +1133,7 @@ 76 - + STR @@ -1437,7 +1437,7 @@ 76 - + INT @@ -1691,7 +1691,7 @@ 76 - + INT diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml index 6c87909e5e..967da1dd31 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml @@ -75,7 +75,7 @@ BLUNT - + STR @@ -1062,7 +1062,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35000-35099.xml index 86f4cdda44..fbccc4671b 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35000-35099.xml @@ -1166,7 +1166,7 @@ PER - + 0 20 @@ -1274,7 +1274,7 @@ PER - + 0 20 @@ -1382,7 +1382,7 @@ PER - + 0 20 @@ -2175,7 +2175,7 @@ P 5 - + 0 1 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35200-35299.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35200-35299.xml index bc59de4678..1ac3765ed4 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35200-35299.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35200-35299.xml @@ -2872,7 +2872,7 @@ 5 80 - + 0 1 @@ -2898,7 +2898,7 @@ 5 80 - + 0 1 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35500-35599.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35500-35599.xml index 90ca34ecce..a6819fb0a7 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35500-35599.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35500-35599.xml @@ -605,7 +605,7 @@ 100 DIFF - + 30 PER @@ -687,7 +687,7 @@ 100 DIFF - + 30 PER diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35600-35699.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35600-35699.xml index f310e8af6c..d52c919ef6 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35600-35699.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35600-35699.xml @@ -3245,7 +3245,7 @@ icon.elemental_necklace_wind_i00 P - + 1 2 3 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35700-35799.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35700-35799.xml index 8f105dcf5f..5f77925031 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35700-35799.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35700-35799.xml @@ -1471,7 +1471,7 @@ icon.accessary_angel_of_earing P - + 1 2 3 @@ -1773,7 +1773,7 @@ icon.new_ring_of_hero P - + 1 2 3 @@ -2075,7 +2075,7 @@ icon.bm_ring_of_fallen_angel P - + 1 2 3 @@ -2377,7 +2377,7 @@ branchsys2.icon2.g_accessory_event_earring P - + 1 2 3 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35800-35899.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35800-35899.xml index 3fe1d9160c..efa91dc507 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35800-35899.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/35800-35899.xml @@ -262,7 +262,7 @@ icon.dragon_accessary_necklace P - + 1 2 3 @@ -564,7 +564,7 @@ icon.dragon_accessary_earring P - + 1 2 3 @@ -866,7 +866,7 @@ icon.dragon_accessary_ring P - + 1 2 3 diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt index 75d16e754f..83ec0450a5 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt @@ -291,10 +291,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java index eff174edb5..42aec5ba73 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java index bcb0a6d10d..6d01f22316 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -244,8 +244,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), 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 86b06303c2..a2a0997bae 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 @@ -309,10 +309,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00300-00399.xml index 82a4864602..730d9cc3ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00300-00399.xml @@ -1259,7 +1259,7 @@ P 5 - + STR @@ -1271,7 +1271,7 @@ P 5 - + INT @@ -1320,7 +1320,7 @@ 2 5 - + 100 PER 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 1f4d879ef5..60df008dc2 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 @@ -278,10 +278,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. 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 3527f31496..3028801def 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 @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } 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 2b9f5de3ef..519d0fad43 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 @@ -239,8 +239,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), 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 86b06303c2..a2a0997bae 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 @@ -309,10 +309,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/00300-00399.xml index a1a99e1cae..84f857f1f0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/00300-00399.xml @@ -1257,7 +1257,7 @@ P 5 - + STR @@ -1269,7 +1269,7 @@ P 5 - + INT @@ -1318,7 +1318,7 @@ 2 5 - + 100 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 774bcb36fd..56adca3796 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 @@ -2307,7 +2307,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 8e016f421c..7caeb558eb 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 @@ -412,7 +412,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 1f4d879ef5..60df008dc2 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 @@ -278,10 +278,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. 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 3527f31496..3028801def 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 @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } 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 2b9f5de3ef..519d0fad43 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 @@ -239,8 +239,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), 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 8430a4c68a..7146f13915 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 @@ -310,10 +310,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/00300-00399.xml index 4174d7b221..b6d089d3a7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/00300-00399.xml @@ -1296,7 +1296,7 @@ P 5 - + STR @@ -1308,7 +1308,7 @@ P 5 - + INT @@ -1357,7 +1357,7 @@ 2 5 - + 100 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 5337816760..6faeea1842 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 @@ -2331,7 +2331,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 cd03f22e62..a25e11ce6d 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 @@ -412,7 +412,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 2e36c5bd0c..6d8a292bda 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 @@ -279,10 +279,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. 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 3527f31496..3028801def 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 @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } 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 5873067451..3fb09f4d4c 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 @@ -241,8 +241,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), 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 fcf2e9b815..e0272bb4b8 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 @@ -313,10 +313,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/00300-00399.xml index 2c698f72c3..99c136ad6e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/00300-00399.xml @@ -1296,7 +1296,7 @@ P 5 - + STR @@ -1308,7 +1308,7 @@ P 5 - + INT @@ -1357,7 +1357,7 @@ 2 5 - + 100 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 1b60408669..3cae8b3aef 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 @@ -2331,7 +2331,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 ef07ffc59e..48a35f4b0f 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 @@ -412,7 +412,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 adebacae1b..98e7d5a4e5 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 @@ -282,10 +282,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. 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 24e55cf408..6b8ab02ef9 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 @@ -960,13 +960,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } 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 44131034ce..21e6bae309 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 @@ -254,8 +254,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), 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 fcf2e9b815..e0272bb4b8 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 @@ -313,10 +313,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/00300-00399.xml index f43f706823..c2affa2204 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/00300-00399.xml @@ -1311,7 +1311,7 @@ P 5 - + STR @@ -1323,7 +1323,7 @@ P 5 - + INT @@ -1372,7 +1372,7 @@ 2 5 - + 100 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 36bd2511e2..5b378bf557 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 @@ -2331,7 +2331,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 56da463c42..49ae2bc76e 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 @@ -412,7 +412,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 adebacae1b..98e7d5a4e5 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 @@ -282,10 +282,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. 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 24e55cf408..6b8ab02ef9 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 @@ -960,13 +960,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } 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 44131034ce..21e6bae309 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 @@ -254,8 +254,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), 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 1154cf3494..f9dca4b930 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 @@ -315,10 +315,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00300-00399.xml index 023063cde0..6439b35013 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00300-00399.xml @@ -1322,7 +1322,7 @@ P 5 - + STR @@ -1334,7 +1334,7 @@ P 5 - + INT @@ -1383,7 +1383,7 @@ 2 5 - + 100 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 36bd2511e2..5b378bf557 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 @@ -2331,7 +2331,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 c7479ceb41..a71b58a0bd 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 @@ -412,7 +412,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 a583d3f6e9..4efd1a55ce 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 @@ -284,10 +284,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. 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 24e55cf408..6b8ab02ef9 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 @@ -960,13 +960,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } 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 47fa8f0d51..6a70134d8a 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 @@ -256,8 +256,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), 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 13e2f150e4..88e06d4622 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 @@ -312,10 +312,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/00300-00399.xml index 7f4d6d3ee5..3fc848125a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/00300-00399.xml @@ -1328,7 +1328,7 @@ P 5 - + STR @@ -1340,7 +1340,7 @@ P 5 - + INT @@ -1389,7 +1389,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/08900-08999.xml index d0390e3b27..67f1741c1d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/08900-08999.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/08900-08999.xml @@ -25,7 +25,7 @@ 100 DIFF - + 30 PER @@ -75,7 +75,7 @@ 500 DIFF - + 50 PER diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10000-10099.xml index 40f809cfb8..6cba306990 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10000-10099.xml @@ -49,7 +49,7 @@ 110 - + STR diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10200-10299.xml index 0762d8918b..ff6083777d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10200-10299.xml @@ -186,7 +186,7 @@ 110 - + STR diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml index cb80708466..68da56b945 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml @@ -45,7 +45,7 @@ P - + STR @@ -396,11 +396,11 @@ STR PER - + 100 PER - + 10 PER diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10700-10799.xml index d0be313358..078877e652 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10700-10799.xml @@ -80,7 +80,7 @@ 30 PER - + 10 11 @@ -447,7 +447,7 @@ P - + STR @@ -826,7 +826,7 @@ 2 STR - + 100 PER diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10900-10999.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10900-10999.xml index 26533d3896..751fa465a1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10900-10999.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10900-10999.xml @@ -410,7 +410,7 @@ 15 PER - + 15 PER diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11000-11099.xml index b9971d3be3..94e14c6df0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11000-11099.xml @@ -53,7 +53,7 @@ 5 P - + INT diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11200-11299.xml index 5c16306922..8c91f6ff3c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11200-11299.xml @@ -378,7 +378,7 @@ 5 P - + INT diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11500-11599.xml index a1f5d6df94..530f2c891d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11500-11599.xml @@ -47,7 +47,7 @@ 5 - + STR @@ -4165,7 +4165,7 @@ PER 1 - + 10 20 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11700-11799.xml index 5210eb1fc2..ecf0460afd 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11700-11799.xml @@ -149,7 +149,7 @@ P 5 - + INT diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13300-13399.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13300-13399.xml index b6aea4f5df..6abc7bec38 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13300-13399.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13300-13399.xml @@ -1096,7 +1096,7 @@ -10 DEBUFF - + 0 14 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13700-13799.xml index 38140f25b6..f13de3a550 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13700-13799.xml @@ -3004,7 +3004,7 @@ icon.skill3238 P - + 0.55 0.65 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13800-13899.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13800-13899.xml index 983710d1aa..8ca711981a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13800-13899.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/13800-13899.xml @@ -1818,7 +1818,7 @@ icon.ensoul_big_p P - + {5+index} @@ -2114,7 +2114,7 @@ PER - + 3 4 @@ -2280,7 +2280,7 @@ DIFF - + 3 4 @@ -2948,7 +2948,7 @@ PER - + 3 4 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 c149ef5714..f611c4fc65 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 @@ -540,7 +540,7 @@ icon.skill0193 P - + 5 10 @@ -1065,7 +1065,7 @@ 20 DIFF - + 50 PER @@ -1234,7 +1234,7 @@ icon.skill0330 P - + 30 50 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 27ddf87235..c3f277a5f1 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 @@ -1578,7 +1578,7 @@ icon.skill1532 P - + 10 PER @@ -1667,7 +1667,7 @@ icon.skill0193 P - + 3 6 @@ -1739,7 +1739,7 @@ icon.skill0330 P - + 30 60 @@ -2083,7 +2083,7 @@ icon.skill0330 P - + 30 60 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21400-21499.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21400-21499.xml index d9258c0862..c4e19a6e3f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21400-21499.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21400-21499.xml @@ -1100,7 +1100,7 @@ PER - + 15 16 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 cdc12ec521..a489778586 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 @@ -222,7 +222,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 @@ -1272,7 +1272,7 @@ BranchIcon.icon.g_bm_cloak_mineral_normal P - + 0.9 1 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30000-30099.xml index 8c7af23129..496e9ee711 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30000-30099.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30000-30099.xml @@ -2343,7 +2343,7 @@ 85 - + INT 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 2e6238c610..ceb1f058cf 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 @@ -1738,7 +1738,7 @@ DIFF - + 10 20 @@ -2335,7 +2335,7 @@ 85 - + STR diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30600-30699.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30600-30699.xml index fb020562ab..faac12dc22 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30600-30699.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30600-30699.xml @@ -52,7 +52,7 @@ 2 3 - + 1 PER 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 f3f7215ac7..35c8e6201e 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 @@ -280,10 +280,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. 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 3527f31496..3028801def 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 @@ -959,13 +959,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } 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 3eb580d4b1..9d81854f8b 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 @@ -241,8 +241,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java index 4a1960117f..6d49c69d18 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -320,10 +320,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00100-00199.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00100-00199.xml index 6dcd4dc7b3..f5d0c3cffd 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00100-00199.xml +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00100-00199.xml @@ -3023,7 +3023,7 @@ PER - + 5 5 diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00300-00399.xml index 55fa58698c..b26551a3ce 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00300-00399.xml @@ -1233,7 +1233,7 @@ P 5 - + STR @@ -1245,7 +1245,7 @@ P 5 - + INT @@ -1294,7 +1294,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml index f1327b1032..7cc9655e42 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml @@ -1863,7 +1863,7 @@ PER - + 11 22 diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/45300-45399.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/45300-45399.xml index e739b2f6e5..6a3cecd3b4 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/45300-45399.xml +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/45300-45399.xml @@ -3686,7 +3686,7 @@ 5 PER - + 5 PER diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50300-50399.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50300-50399.xml index c968845797..24308e0df5 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50300-50399.xml +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50300-50399.xml @@ -3637,7 +3637,7 @@ 1 PER - + 1 PER @@ -3654,7 +3654,7 @@ 1 PER - + 1 PER diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/55700-55799.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/55700-55799.xml index 36bd2511e2..5b378bf557 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/55700-55799.xml +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/55700-55799.xml @@ -2331,7 +2331,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/55800-55899.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/55800-55899.xml index c7479ceb41..a71b58a0bd 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/55800-55899.xml +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/55800-55899.xml @@ -412,7 +412,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt index 8c499d9fa6..1f32c75fea 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt @@ -289,10 +289,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 24e55cf408..6b8ab02ef9 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -960,13 +960,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java index c49354dc24..e1cecee703 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -256,8 +256,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"), diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/EffectMasterHandler.java index 7e918afde7..9339cb51e0 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -320,10 +320,10 @@ public class EffectMasterHandler EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new); EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new); EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new); - EffectHandler.getInstance().registerHandler("SkillCritical", SkillCritical::new); EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new); - EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new); EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new); + EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new); + EffectHandler.getInstance().registerHandler("SkillMasteryRate", SkillMasteryRate::new); EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new); EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new); EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new); diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java deleted file mode 100644 index 85fdcab54f..0000000000 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ /dev/null @@ -1,43 +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.actor.Creature; -import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author Sdw - */ -public class SkillCritical extends AbstractEffect -{ - private final BaseStat _stat; - - public SkillCritical(StatSet params) - { - _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); - } - - @Override - public void pump(Creature effected, Skill skill) - { - effected.getStat().mergeAdd(Stat.SKILL_CRITICAL, _stat.ordinal()); - } -} diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java deleted file mode 100644 index 0990e29035..0000000000 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.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 SkillCriticalProbability extends AbstractStatPercentEffect -{ - public SkillCriticalProbability(StatSet params) - { - super(params, Stat.SKILL_CRITICAL_PROBABILITY); - } -} diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java new file mode 100644 index 0000000000..f8f1d8e485 --- /dev/null +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillMastery.java @@ -0,0 +1,43 @@ +/* + * 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.actor.Creature; +import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author Sdw + */ +public class SkillMastery extends AbstractEffect +{ + private final BaseStat _stat; + + public SkillMastery(StatSet params) + { + _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); + } + + @Override + public void pump(Creature effected, Skill skill) + { + effected.getStat().mergeAdd(Stat.SKILL_MASTERY, _stat.ordinal()); + } +} diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.java new file mode 100644 index 0000000000..edcfad0340 --- /dev/null +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/SkillMasteryRate.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 SkillMasteryRate extends AbstractStatPercentEffect +{ + public SkillMasteryRate(StatSet params) + { + super(params, Stat.SKILL_MASTERY_RATE); + } +} diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00100-00199.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00100-00199.xml index a96fc358db..46677f94e1 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00100-00199.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00100-00199.xml @@ -3023,7 +3023,7 @@ PER - + 5 5 diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00300-00399.xml index 6609ae1634..5a4e2da330 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00300-00399.xml @@ -1233,7 +1233,7 @@ P 5 - + STR @@ -1245,7 +1245,7 @@ P 5 - + INT @@ -1294,7 +1294,7 @@ 2 5 - + 100 PER diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00400-00499.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00400-00499.xml index 70362eb7ab..60341a57b0 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00400-00499.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00400-00499.xml @@ -1863,7 +1863,7 @@ PER - + 11 22 diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/45300-45399.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/45300-45399.xml index 3b53cab475..1c86494d3d 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/45300-45399.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/45300-45399.xml @@ -3801,7 +3801,7 @@ 5 PER - + 5 PER diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50300-50399.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50300-50399.xml index c2d6d68b19..236425d5be 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50300-50399.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50300-50399.xml @@ -3637,7 +3637,7 @@ 1 PER - + 1 PER @@ -3654,7 +3654,7 @@ 1 PER - + 1 PER diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50400-50499.xml index 97d10b29f4..6666944877 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50400-50499.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50400-50499.xml @@ -3342,7 +3342,7 @@ icon.bm_zaken_doll_30d P - + 10 40 diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/55700-55799.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/55700-55799.xml index 36bd2511e2..5b378bf557 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/55700-55799.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/55700-55799.xml @@ -2331,7 +2331,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/55800-55899.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/55800-55899.xml index e51d6641b0..25f2489c73 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/55800-55899.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/55800-55899.xml @@ -412,7 +412,7 @@ 5 1 - + 0.9 1 diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/documentation.txt index f17f5f0b55..233d42f045 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/documentation.txt @@ -289,10 +289,10 @@ 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. -SkillCritical: Activates double debuff or cooldown reset critical based on the specified stat. SkillCriticalDamage: Skill critical damage stat. -SkillCriticalProbability: Skill critical rate stat. SkillEvasion: Skill evasion stat. +SkillMastery: Activates double debuff or cooldown reset critical based on the specified stat. +SkillMasteryRate: Skill critical rate stat. SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius) SkillTurning: Stops target's casting. SkillTurningOverTime: Stops target's casting at a fixed rate. diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 24e55cf408..6b8ab02ef9 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -960,13 +960,13 @@ public class Formulas return false; } - final int val = (int) actor.getStat().getAdd(Stat.SKILL_CRITICAL, -1); + final int val = (int) actor.getStat().getAdd(Stat.SKILL_MASTERY, -1); if (val == -1) { return false; } - final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_CRITICAL_PROBABILITY, 1); + final double chance = BaseStat.values()[val].calcBonus(actor) * actor.getStat().getMul(Stat.SKILL_MASTERY_RATE, 1); return ((Rnd.nextDouble() * 100.) < (chance * Config.SKILL_MASTERY_CHANCE_MULTIPLIERS[actor.getActingPlayer().getClassId().getId()])); } diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Stat.java index c49354dc24..e1cecee703 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Stat.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/Stat.java @@ -256,8 +256,8 @@ public enum Stat RECIPE_COMMON("CommonRecipeLimit"), // Skill mastery - SKILL_CRITICAL("skillCritical"), - SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"), + SKILL_MASTERY("skillMastery"), + SKILL_MASTERY_RATE("skillMasteryRate"), // Vitality VITALITY_CONSUME_RATE("vitalityConsumeRate"),