diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 10600f1d1e..4fee87311e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) { - effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); - effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); + effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override public void onExit(Creature effector, Creature effected, Skill skill) { - effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 5a434cfc92..9cc62ab4c9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect if (abnormalCount >= _minSlot) { - final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.max(abnormalCount - 1, _skillLevelScaleTo)); + final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.min(abnormalCount - 1, _skillLevelScaleTo)); final Skill partyBuffSkill = partyBuff.getSkill(); if (partyBuffSkill != null) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml index d2815d08f9..9512383218 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml @@ -691,16 +691,7 @@ 1928 1 - 7 - - - - SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR - SYNERGY_SIGEL;SYNERGY_EOLH - 1955 - 2 - 3 - 15 + 5 @@ -708,18 +699,17 @@ icon.icon_sigel_01 1 - 11 + 6 SYNERGY_SIGEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -729,6 +719,15 @@ 1 PER + + + SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR + SYNERGY_SIGEL;SYNERGY_EOLH + 1955 + 2 + 3 + 5 + @@ -745,7 +744,7 @@ 1930 1 - 7 + 5 @@ -753,18 +752,17 @@ icon.icon_tir_01 1 - 11 + 6 SYNERGY_TIR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -790,7 +788,7 @@ 1932 1 - 7 + 5 @@ -798,18 +796,17 @@ icon.icon_othel_01 1 - 11 + 6 SYNERGY_OTHEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -835,7 +832,7 @@ 1934 1 - 7 + 5 @@ -843,18 +840,17 @@ icon.icon_yr_01 1 - 11 + 6 SYNERGY_YR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -880,7 +876,7 @@ 1936 1 - 7 + 5 @@ -888,18 +884,17 @@ icon.icon_feoh_01 1 - 11 + 6 SYNERGY_FEOH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -925,7 +920,7 @@ 1938 1 - 7 + 5 @@ -933,18 +928,17 @@ icon.icon_wynn_01 1 - 11 + 6 SYNERGY_WYNN 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -976,7 +970,7 @@ 1940 1 - 7 + 5 @@ -984,18 +978,17 @@ icon.icon_eolh_01 1 - 11 + 6 SYNERGY_EOLH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -1247,8 +1240,7 @@ icon.skill1955 - 1 - 11 + 6 SYNERGY_PARTY_BUF 200 @@ -1259,7 +1251,7 @@ 5 A5 - 5000 + 1000 2 NONE 0 @@ -1892,7 +1884,6 @@ 20000 0 true - true SELF SINGLE diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java index c9b1912c95..6898643065 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java @@ -195,17 +195,7 @@ public enum AbnormalType SUPER_AVOID(-1), SUPER_BUFF(-1), SUPER_MOVE(-1), - SYNERGY_EOLH(-1), - SYNERGY_FEOH(-1), - SYNERGY_IS(-1), - SYNERGY_LENKER(-1), - SYNERGY_OTHEL(-1), - SYNERGY_PARTY_BUF(-1), - SYNERGY_SEER(-1), - SYNERGY_SIGEL(-1), - SYNERGY_TIR(-1), - SYNERGY_WYNN(-1), - SYNERGY_YR(-1), + TALISMAN_TRIGGER_SPECIAL(-1), TIME_BOMB(-1), TURN_CRYSTAL(-1), VAMPIRIC_ATTACK_SPECIAL(-1), @@ -514,7 +504,18 @@ public enum AbnormalType AIRBIND(365), KNOCKDOWN(367), EARTHWORM_DEBUFF(424), + SYNERGY_SIGEL(433), + SYNERGY_TIR(434), + SYNERGY_OTHEL(435), + SYNERGY_YR(436), + SYNERGY_FEOH(437), + SYNERGY_IS(438), + SYNERGY_WYNN(439), + SYNERGY_EOLH(440), + SYNERGY_PARTY_BUF(465), POTION_OF_PROTECTION(552), + SYNERGY_LENKER(589), + SYNERGY_SEER(590), INSIDE_POSITION(593), STEEL_MIND(596); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 10600f1d1e..4fee87311e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) { - effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); - effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); + effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override public void onExit(Creature effector, Creature effected, Skill skill) { - effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 5a434cfc92..9cc62ab4c9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect if (abnormalCount >= _minSlot) { - final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.max(abnormalCount - 1, _skillLevelScaleTo)); + final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.min(abnormalCount - 1, _skillLevelScaleTo)); final Skill partyBuffSkill = partyBuff.getSkill(); if (partyBuffSkill != null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml index 30f5551c78..4190b4d952 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml @@ -691,16 +691,7 @@ 1928 1 - 7 - - - - SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR - SYNERGY_SIGEL;SYNERGY_EOLH - 1955 - 2 - 3 - 15 + 5 @@ -708,18 +699,17 @@ icon.icon_sigel_01 1 - 11 + 6 SYNERGY_SIGEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -729,6 +719,15 @@ 1 PER + + + SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR + SYNERGY_SIGEL;SYNERGY_EOLH + 1955 + 2 + 3 + 5 + @@ -745,7 +744,7 @@ 1930 1 - 7 + 5 @@ -753,18 +752,17 @@ icon.icon_tir_01 1 - 11 + 6 SYNERGY_TIR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -790,7 +788,7 @@ 1932 1 - 7 + 5 @@ -798,18 +796,17 @@ icon.icon_othel_01 1 - 11 + 6 SYNERGY_OTHEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -835,7 +832,7 @@ 1934 1 - 7 + 5 @@ -843,18 +840,17 @@ icon.icon_yr_01 1 - 11 + 6 SYNERGY_YR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -880,7 +876,7 @@ 1936 1 - 7 + 5 @@ -888,18 +884,17 @@ icon.icon_feoh_01 1 - 11 + 6 SYNERGY_FEOH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -925,7 +920,7 @@ 1938 1 - 7 + 5 @@ -933,18 +928,17 @@ icon.icon_wynn_01 1 - 11 + 6 SYNERGY_WYNN 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -976,7 +970,7 @@ 1940 1 - 7 + 5 @@ -984,18 +978,17 @@ icon.icon_eolh_01 1 - 11 + 6 SYNERGY_EOLH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -1247,8 +1240,7 @@ icon.skill1955 - 1 - 11 + 6 SYNERGY_PARTY_BUF 200 @@ -1259,7 +1251,7 @@ 5 A5 - 5000 + 1000 2 NONE 0 @@ -1892,7 +1884,6 @@ 20000 0 true - true SELF SINGLE diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java index c9b1912c95..6898643065 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java @@ -195,17 +195,7 @@ public enum AbnormalType SUPER_AVOID(-1), SUPER_BUFF(-1), SUPER_MOVE(-1), - SYNERGY_EOLH(-1), - SYNERGY_FEOH(-1), - SYNERGY_IS(-1), - SYNERGY_LENKER(-1), - SYNERGY_OTHEL(-1), - SYNERGY_PARTY_BUF(-1), - SYNERGY_SEER(-1), - SYNERGY_SIGEL(-1), - SYNERGY_TIR(-1), - SYNERGY_WYNN(-1), - SYNERGY_YR(-1), + TALISMAN_TRIGGER_SPECIAL(-1), TIME_BOMB(-1), TURN_CRYSTAL(-1), VAMPIRIC_ATTACK_SPECIAL(-1), @@ -514,7 +504,18 @@ public enum AbnormalType AIRBIND(365), KNOCKDOWN(367), EARTHWORM_DEBUFF(424), + SYNERGY_SIGEL(433), + SYNERGY_TIR(434), + SYNERGY_OTHEL(435), + SYNERGY_YR(436), + SYNERGY_FEOH(437), + SYNERGY_IS(438), + SYNERGY_WYNN(439), + SYNERGY_EOLH(440), + SYNERGY_PARTY_BUF(465), POTION_OF_PROTECTION(552), + SYNERGY_LENKER(589), + SYNERGY_SEER(590), INSIDE_POSITION(593), STEEL_MIND(596); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 10600f1d1e..4fee87311e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) { - effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); - effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); + effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override public void onExit(Creature effector, Creature effected, Skill skill) { - effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 5a434cfc92..9cc62ab4c9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect if (abnormalCount >= _minSlot) { - final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.max(abnormalCount - 1, _skillLevelScaleTo)); + final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.min(abnormalCount - 1, _skillLevelScaleTo)); final Skill partyBuffSkill = partyBuff.getSkill(); if (partyBuffSkill != null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml index 8387ca49af..cc4ed637ad 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml @@ -691,16 +691,7 @@ 1928 1 - 7 - - - - SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR - SYNERGY_SIGEL;SYNERGY_EOLH - 1955 - 2 - 3 - 15 + 5 @@ -708,18 +699,17 @@ icon.icon_sigel_01 1 - 11 + 6 SYNERGY_SIGEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -729,6 +719,15 @@ 1 PER + + + SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR + SYNERGY_SIGEL;SYNERGY_EOLH + 1955 + 2 + 3 + 5 + @@ -745,7 +744,7 @@ 1930 1 - 7 + 5 @@ -753,18 +752,17 @@ icon.icon_tir_01 1 - 11 + 6 SYNERGY_TIR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -790,7 +788,7 @@ 1932 1 - 7 + 5 @@ -798,18 +796,17 @@ icon.icon_othel_01 1 - 11 + 6 SYNERGY_OTHEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -835,7 +832,7 @@ 1934 1 - 7 + 5 @@ -843,18 +840,17 @@ icon.icon_yr_01 1 - 11 + 6 SYNERGY_YR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -880,7 +876,7 @@ 1936 1 - 7 + 5 @@ -888,18 +884,17 @@ icon.icon_feoh_01 1 - 11 + 6 SYNERGY_FEOH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -925,7 +920,7 @@ 1938 1 - 7 + 5 @@ -933,18 +928,17 @@ icon.icon_wynn_01 1 - 11 + 6 SYNERGY_WYNN 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -976,7 +970,7 @@ 1940 1 - 7 + 5 @@ -984,18 +978,17 @@ icon.icon_eolh_01 1 - 11 + 6 SYNERGY_EOLH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -1247,8 +1240,7 @@ icon.skill1955 - 1 - 11 + 6 SYNERGY_PARTY_BUF 200 @@ -1259,7 +1251,7 @@ 5 A5 - 5000 + 1000 2 NONE 0 @@ -1892,7 +1884,6 @@ 20000 0 true - true SELF SINGLE diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java index d5cc6ca708..a530872062 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java @@ -196,17 +196,7 @@ public enum AbnormalType SUPER_AVOID(-1), SUPER_BUFF(-1), SUPER_MOVE(-1), - SYNERGY_EOLH(-1), - SYNERGY_FEOH(-1), - SYNERGY_IS(-1), - SYNERGY_LENKER(-1), - SYNERGY_OTHEL(-1), - SYNERGY_PARTY_BUF(-1), - SYNERGY_SEER(-1), - SYNERGY_SIGEL(-1), - SYNERGY_TIR(-1), - SYNERGY_WYNN(-1), - SYNERGY_YR(-1), + TALISMAN_TRIGGER_SPECIAL(-1), TIME_BOMB(-1), TURN_CRYSTAL(-1), VAMPIRIC_ATTACK_SPECIAL(-1), @@ -515,7 +505,18 @@ public enum AbnormalType AIRBIND(365), KNOCKDOWN(367), EARTHWORM_DEBUFF(424), + SYNERGY_SIGEL(433), + SYNERGY_TIR(434), + SYNERGY_OTHEL(435), + SYNERGY_YR(436), + SYNERGY_FEOH(437), + SYNERGY_IS(438), + SYNERGY_WYNN(439), + SYNERGY_EOLH(440), + SYNERGY_PARTY_BUF(465), POTION_OF_PROTECTION(552), + SYNERGY_LENKER(589), + SYNERGY_SEER(590), INSIDE_POSITION(593), STEEL_MIND(596); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 10600f1d1e..4fee87311e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) { - effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); - effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); + effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override public void onExit(Creature effector, Creature effected, Skill skill) { - effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 5a434cfc92..9cc62ab4c9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect if (abnormalCount >= _minSlot) { - final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.max(abnormalCount - 1, _skillLevelScaleTo)); + final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.min(abnormalCount - 1, _skillLevelScaleTo)); final Skill partyBuffSkill = partyBuff.getSkill(); if (partyBuffSkill != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml index 06714b3a25..d9905d32b8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml @@ -691,16 +691,7 @@ 1928 1 - 7 - - - - SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR - SYNERGY_SIGEL;SYNERGY_EOLH - 1955 - 2 - 3 - 15 + 5 @@ -708,18 +699,17 @@ icon.icon_sigel_01 1 - 11 + 6 SYNERGY_SIGEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -729,6 +719,15 @@ 1 PER + + + SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR + SYNERGY_SIGEL;SYNERGY_EOLH + 1955 + 2 + 3 + 5 + @@ -745,7 +744,7 @@ 1930 1 - 7 + 5 @@ -753,18 +752,17 @@ icon.icon_tir_01 1 - 11 + 6 SYNERGY_TIR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -790,7 +788,7 @@ 1932 1 - 7 + 5 @@ -798,18 +796,17 @@ icon.icon_othel_01 1 - 11 + 6 SYNERGY_OTHEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -835,7 +832,7 @@ 1934 1 - 7 + 5 @@ -843,18 +840,17 @@ icon.icon_yr_01 1 - 11 + 6 SYNERGY_YR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -880,7 +876,7 @@ 1936 1 - 7 + 5 @@ -888,18 +884,17 @@ icon.icon_feoh_01 1 - 11 + 6 SYNERGY_FEOH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -925,7 +920,7 @@ 1938 1 - 7 + 5 @@ -933,18 +928,17 @@ icon.icon_wynn_01 1 - 11 + 6 SYNERGY_WYNN 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -976,7 +970,7 @@ 1940 1 - 7 + 5 @@ -984,18 +978,17 @@ icon.icon_eolh_01 1 - 11 + 6 SYNERGY_EOLH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -1247,8 +1240,7 @@ icon.skill1955 - 1 - 11 + 6 SYNERGY_PARTY_BUF 200 @@ -1259,7 +1251,7 @@ 5 A5 - 5000 + 1000 2 NONE 0 @@ -1892,7 +1884,6 @@ 20000 0 true - true SELF SINGLE diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java index 9d73b9931b..94957f9965 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java @@ -220,17 +220,6 @@ public enum AbnormalType SUPER_AVOID(-1), SUPER_BUFF(-1), SUPER_MOVE(-1), - SYNERGY_EOLH(-1), - SYNERGY_FEOH(-1), - SYNERGY_IS(-1), - SYNERGY_LENKER(-1), - SYNERGY_OTHEL(-1), - SYNERGY_PARTY_BUF(-1), - SYNERGY_SEER(-1), - SYNERGY_SIGEL(-1), - SYNERGY_TIR(-1), - SYNERGY_WYNN(-1), - SYNERGY_YR(-1), TALISMAN_TRIGGER_SPECIAL(-1), TIME_BOMB(-1), TURN_CRYSTAL(-1), @@ -540,7 +529,18 @@ public enum AbnormalType AIRBIND(365), KNOCKDOWN(367), EARTHWORM_DEBUFF(424), + SYNERGY_SIGEL(433), + SYNERGY_TIR(434), + SYNERGY_OTHEL(435), + SYNERGY_YR(436), + SYNERGY_FEOH(437), + SYNERGY_IS(438), + SYNERGY_WYNN(439), + SYNERGY_EOLH(440), + SYNERGY_PARTY_BUF(465), POTION_OF_PROTECTION(552), + SYNERGY_LENKER(589), + SYNERGY_SEER(590), INSIDE_POSITION(593), STEEL_MIND(596); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 10600f1d1e..4fee87311e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) { - effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); - effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); + effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override public void onExit(Creature effector, Creature effected, Skill skill) { - effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 5a434cfc92..9cc62ab4c9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect if (abnormalCount >= _minSlot) { - final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.max(abnormalCount - 1, _skillLevelScaleTo)); + final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.min(abnormalCount - 1, _skillLevelScaleTo)); final Skill partyBuffSkill = partyBuff.getSkill(); if (partyBuffSkill != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml index e45bd25c3d..4b2a387562 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml @@ -691,16 +691,7 @@ 1928 1 - 7 - - - - SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR - SYNERGY_SIGEL;SYNERGY_EOLH - 1955 - 2 - 3 - 15 + 5 @@ -708,18 +699,17 @@ icon.icon_sigel_01 1 - 11 + 6 SYNERGY_SIGEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -729,6 +719,15 @@ 1 PER + + + SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR + SYNERGY_SIGEL;SYNERGY_EOLH + 1955 + 2 + 3 + 5 + @@ -745,7 +744,7 @@ 1930 1 - 7 + 5 @@ -753,18 +752,17 @@ icon.icon_tir_01 1 - 11 + 6 SYNERGY_TIR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -790,7 +788,7 @@ 1932 1 - 7 + 5 @@ -798,18 +796,17 @@ icon.icon_othel_01 1 - 11 + 6 SYNERGY_OTHEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -835,7 +832,7 @@ 1934 1 - 7 + 5 @@ -843,18 +840,17 @@ icon.icon_yr_01 1 - 11 + 6 SYNERGY_YR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -880,7 +876,7 @@ 1936 1 - 7 + 5 @@ -888,18 +884,17 @@ icon.icon_feoh_01 1 - 11 + 6 SYNERGY_FEOH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -925,7 +920,7 @@ 1938 1 - 7 + 5 @@ -933,18 +928,17 @@ icon.icon_wynn_01 1 - 11 + 6 SYNERGY_WYNN 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -976,7 +970,7 @@ 1940 1 - 7 + 5 @@ -984,18 +978,17 @@ icon.icon_eolh_01 1 - 11 + 6 SYNERGY_EOLH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -1247,8 +1240,7 @@ icon.skill1955 - 1 - 11 + 6 SYNERGY_PARTY_BUF 200 @@ -1259,7 +1251,7 @@ 5 A5 - 5000 + 1000 2 NONE 0 diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java index f65d66465f..e2d5c76b68 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java @@ -220,17 +220,6 @@ public enum AbnormalType SUPER_AVOID(-1), SUPER_BUFF(-1), SUPER_MOVE(-1), - SYNERGY_EOLH(-1), - SYNERGY_FEOH(-1), - SYNERGY_IS(-1), - SYNERGY_LENKER(-1), - SYNERGY_OTHEL(-1), - SYNERGY_PARTY_BUF(-1), - SYNERGY_SEER(-1), - SYNERGY_SIGEL(-1), - SYNERGY_TIR(-1), - SYNERGY_WYNN(-1), - SYNERGY_YR(-1), TALISMAN_TRIGGER_SPECIAL(-1), TIME_BOMB(-1), TURN_CRYSTAL(-1), @@ -542,7 +531,18 @@ public enum AbnormalType AIRBIND(365), KNOCKDOWN(367), EARTHWORM_DEBUFF(424), + SYNERGY_SIGEL(433), + SYNERGY_TIR(434), + SYNERGY_OTHEL(435), + SYNERGY_YR(436), + SYNERGY_FEOH(437), + SYNERGY_IS(438), + SYNERGY_WYNN(439), + SYNERGY_EOLH(440), + SYNERGY_PARTY_BUF(465), POTION_OF_PROTECTION(552), + SYNERGY_LENKER(589), + SYNERGY_SEER(590), INSIDE_POSITION(593), STEEL_MIND(596), SIGEL_SHIELD(597); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 10600f1d1e..4fee87311e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) { - effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); - effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); + effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override public void onExit(Creature effector, Creature effected, Skill skill) { - effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 5a434cfc92..9cc62ab4c9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect if (abnormalCount >= _minSlot) { - final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.max(abnormalCount - 1, _skillLevelScaleTo)); + final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.min(abnormalCount - 1, _skillLevelScaleTo)); final Skill partyBuffSkill = partyBuff.getSkill(); if (partyBuffSkill != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml index 79ef73cf02..15284357a5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml @@ -691,16 +691,7 @@ 1928 1 - 7 - - - - SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR - SYNERGY_SIGEL;SYNERGY_EOLH - 1955 - 2 - 3 - 15 + 5 @@ -708,18 +699,17 @@ icon.icon_sigel_01 1 - 11 + 6 SYNERGY_SIGEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -729,6 +719,15 @@ 1 PER + + + SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR + SYNERGY_SIGEL;SYNERGY_EOLH + 1955 + 2 + 3 + 5 + @@ -745,7 +744,7 @@ 1930 1 - 7 + 5 @@ -753,18 +752,17 @@ icon.icon_tir_01 1 - 11 + 6 SYNERGY_TIR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -790,7 +788,7 @@ 1932 1 - 7 + 5 @@ -798,18 +796,17 @@ icon.icon_othel_01 1 - 11 + 6 SYNERGY_OTHEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -835,7 +832,7 @@ 1934 1 - 7 + 5 @@ -843,18 +840,17 @@ icon.icon_yr_01 1 - 11 + 6 SYNERGY_YR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -880,7 +876,7 @@ 1936 1 - 7 + 5 @@ -888,18 +884,17 @@ icon.icon_feoh_01 1 - 11 + 6 SYNERGY_FEOH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -925,7 +920,7 @@ 1938 1 - 7 + 5 @@ -933,18 +928,17 @@ icon.icon_wynn_01 1 - 11 + 6 SYNERGY_WYNN 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -976,7 +970,7 @@ 1940 1 - 7 + 5 @@ -984,18 +978,17 @@ icon.icon_eolh_01 1 - 11 + 6 SYNERGY_EOLH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -1247,8 +1240,7 @@ icon.skill1955 - 1 - 11 + 6 SYNERGY_PARTY_BUF 200 @@ -1259,7 +1251,7 @@ 5 A5 - 5000 + 1000 2 NONE 0 diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java index f65d66465f..e2d5c76b68 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java @@ -220,17 +220,6 @@ public enum AbnormalType SUPER_AVOID(-1), SUPER_BUFF(-1), SUPER_MOVE(-1), - SYNERGY_EOLH(-1), - SYNERGY_FEOH(-1), - SYNERGY_IS(-1), - SYNERGY_LENKER(-1), - SYNERGY_OTHEL(-1), - SYNERGY_PARTY_BUF(-1), - SYNERGY_SEER(-1), - SYNERGY_SIGEL(-1), - SYNERGY_TIR(-1), - SYNERGY_WYNN(-1), - SYNERGY_YR(-1), TALISMAN_TRIGGER_SPECIAL(-1), TIME_BOMB(-1), TURN_CRYSTAL(-1), @@ -542,7 +531,18 @@ public enum AbnormalType AIRBIND(365), KNOCKDOWN(367), EARTHWORM_DEBUFF(424), + SYNERGY_SIGEL(433), + SYNERGY_TIR(434), + SYNERGY_OTHEL(435), + SYNERGY_YR(436), + SYNERGY_FEOH(437), + SYNERGY_IS(438), + SYNERGY_WYNN(439), + SYNERGY_EOLH(440), + SYNERGY_PARTY_BUF(465), POTION_OF_PROTECTION(552), + SYNERGY_LENKER(589), + SYNERGY_SEER(590), INSIDE_POSITION(593), STEEL_MIND(596), SIGEL_SHIELD(597); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 10600f1d1e..4fee87311e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect @Override public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) { - effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); - effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); + effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override public void onExit(Creature effector, Creature effected, Skill skill) { - effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + if (!_skill.getSkill().isSynergySkill()) + { + effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); + } } @Override diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 5a434cfc92..9cc62ab4c9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect if (abnormalCount >= _minSlot) { - final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.max(abnormalCount - 1, _skillLevelScaleTo)); + final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.min(abnormalCount - 1, _skillLevelScaleTo)); final Skill partyBuffSkill = partyBuff.getSkill(); if (partyBuffSkill != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml index ad239fe189..09d9c387b4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml @@ -691,16 +691,7 @@ 1928 1 - 7 - - - - SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR - SYNERGY_SIGEL;SYNERGY_EOLH - 1955 - 2 - 3 - 15 + 5 @@ -708,18 +699,17 @@ icon.icon_sigel_01 1 - 11 + 6 SYNERGY_SIGEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -729,6 +719,15 @@ 1 PER + + + SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR + SYNERGY_SIGEL;SYNERGY_EOLH + 1955 + 2 + 3 + 5 + @@ -745,7 +744,7 @@ 1930 1 - 7 + 5 @@ -753,18 +752,17 @@ icon.icon_tir_01 1 - 11 + 6 SYNERGY_TIR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -790,7 +788,7 @@ 1932 1 - 7 + 5 @@ -798,18 +796,17 @@ icon.icon_othel_01 1 - 11 + 6 SYNERGY_OTHEL 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -835,7 +832,7 @@ 1934 1 - 7 + 5 @@ -843,18 +840,17 @@ icon.icon_yr_01 1 - 11 + 6 SYNERGY_YR 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -880,7 +876,7 @@ 1936 1 - 7 + 5 @@ -888,18 +884,17 @@ icon.icon_feoh_01 1 - 11 + 6 SYNERGY_FEOH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -925,7 +920,7 @@ 1938 1 - 7 + 5 @@ -933,18 +928,17 @@ icon.icon_wynn_01 1 - 11 + 6 SYNERGY_WYNN 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -976,7 +970,7 @@ 1940 1 - 7 + 5 @@ -984,18 +978,17 @@ icon.icon_eolh_01 1 - 11 + 6 SYNERGY_EOLH 1600 false 5 85 A6 - 5000 + 1000 2 NONE 0 - 1 3 MY_PARTY PARTY @@ -1247,8 +1240,7 @@ icon.skill1955 - 1 - 11 + 6 SYNERGY_PARTY_BUF 200 @@ -1259,7 +1251,7 @@ 5 A5 - 5000 + 1000 2 NONE 0 diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java index f65d66465f..e2d5c76b68 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java @@ -220,17 +220,6 @@ public enum AbnormalType SUPER_AVOID(-1), SUPER_BUFF(-1), SUPER_MOVE(-1), - SYNERGY_EOLH(-1), - SYNERGY_FEOH(-1), - SYNERGY_IS(-1), - SYNERGY_LENKER(-1), - SYNERGY_OTHEL(-1), - SYNERGY_PARTY_BUF(-1), - SYNERGY_SEER(-1), - SYNERGY_SIGEL(-1), - SYNERGY_TIR(-1), - SYNERGY_WYNN(-1), - SYNERGY_YR(-1), TALISMAN_TRIGGER_SPECIAL(-1), TIME_BOMB(-1), TURN_CRYSTAL(-1), @@ -542,7 +531,18 @@ public enum AbnormalType AIRBIND(365), KNOCKDOWN(367), EARTHWORM_DEBUFF(424), + SYNERGY_SIGEL(433), + SYNERGY_TIR(434), + SYNERGY_OTHEL(435), + SYNERGY_YR(436), + SYNERGY_FEOH(437), + SYNERGY_IS(438), + SYNERGY_WYNN(439), + SYNERGY_EOLH(440), + SYNERGY_PARTY_BUF(465), POTION_OF_PROTECTION(552), + SYNERGY_LENKER(589), + SYNERGY_SEER(590), INSIDE_POSITION(593), STEEL_MIND(596), SIGEL_SHIELD(597);