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

Fixed Party Solidarity and Aura Force skills.

Browse Source 
Contributed by facab.
This commit is contained in:
MobiusDevelopment
2019-06-07 21:54:15 +00:00
parent 2b3db165b2
commit 550b29b4f3
28 changed files with 374 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java vendored
View File

@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect
@Override @Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); if (!_skill.getSkill().isSynergySkill())
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType()));
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType()));
}
} }
@Override @Override
public void onExit(Creature effector, Creature effected, Skill skill) 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 @Override

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java vendored
View File

@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect
if (abnormalCount >= _minSlot) 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(); final Skill partyBuffSkill = partyBuff.getSkill();
if (partyBuffSkill != null) if (partyBuffSkill != null)

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

@ -691,16 +691,7 @@
<!-- Sigel Force --> <!-- Sigel Force -->
<skillId>1928</skillId> <!-- Sigel Force --> <skillId>1928</skillId> <!-- Sigel Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>15</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -708,18 +699,17 @@
<!-- P. Atk. + 1%. --> <!-- P. Atk. + 1%. -->
<icon>icon.icon_sigel_01</icon> <icon>icon.icon_sigel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_SIGEL</abnormalType> <abnormalType>SYNERGY_SIGEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -729,6 +719,15 @@
<amount>1</amount> <amount>1</amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>5</ticks>
</effect>
</effects> </effects>
</skill> </skill>
<skill id="1929" toLevel="1" name="Tyrr Aura"> <skill id="1929" toLevel="1" name="Tyrr Aura">
@ -745,7 +744,7 @@
<!-- Tyrr Force --> <!-- Tyrr Force -->
<skillId>1930</skillId> <!-- Tyrr Force --> <skillId>1930</skillId> <!-- Tyrr Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -753,18 +752,17 @@
<!-- P. Critical Rate + 1%. --> <!-- P. Critical Rate + 1%. -->
<icon>icon.icon_tir_01</icon> <icon>icon.icon_tir_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_TIR</abnormalType> <abnormalType>SYNERGY_TIR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -790,7 +788,7 @@
<!-- Othell Force --> <!-- Othell Force -->
<skillId>1932</skillId> <!-- Othell Force --> <skillId>1932</skillId> <!-- Othell Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -798,18 +796,17 @@
<!-- Atk. Spd. + 1%. --> <!-- Atk. Spd. + 1%. -->
<icon>icon.icon_othel_01</icon> <icon>icon.icon_othel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_OTHEL</abnormalType> <abnormalType>SYNERGY_OTHEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -835,7 +832,7 @@
<!-- Yul Force --> <!-- Yul Force -->
<skillId>1934</skillId> <!-- Yul Force --> <skillId>1934</skillId> <!-- Yul Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -843,18 +840,17 @@
<!-- MP Recovery Bonus + 50%. --> <!-- MP Recovery Bonus + 50%. -->
<icon>icon.icon_yr_01</icon> <icon>icon.icon_yr_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_YR</abnormalType> <abnormalType>SYNERGY_YR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -880,7 +876,7 @@
<!-- Feoh Force --> <!-- Feoh Force -->
<skillId>1936</skillId> <!-- Feoh Force --> <skillId>1936</skillId> <!-- Feoh Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -888,18 +884,17 @@
<!-- Casting Spd. + 1%. --> <!-- Casting Spd. + 1%. -->
<icon>icon.icon_feoh_01</icon> <icon>icon.icon_feoh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_FEOH</abnormalType> <abnormalType>SYNERGY_FEOH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -925,7 +920,7 @@
<!-- Wynn Force --> <!-- Wynn Force -->
<skillId>1938</skillId> <!-- Wynn Force --> <skillId>1938</skillId> <!-- Wynn Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -933,18 +928,17 @@
<!-- P./M. Skill MP Consumption - 3%. --> <!-- P./M. Skill MP Consumption - 3%. -->
<icon>icon.icon_wynn_01</icon> <icon>icon.icon_wynn_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_WYNN</abnormalType> <abnormalType>SYNERGY_WYNN</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -976,7 +970,7 @@
<!-- Aeore Force --> <!-- Aeore Force -->
<skillId>1940</skillId> <!-- Aeore Force --> <skillId>1940</skillId> <!-- Aeore Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -984,18 +978,17 @@
<!-- M. Atk. + 1%. --> <!-- M. Atk. + 1%. -->
<icon>icon.icon_eolh_01</icon> <icon>icon.icon_eolh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_EOLH</abnormalType> <abnormalType>SYNERGY_EOLH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -1247,8 +1240,7 @@
<skill id="1955" toLevel="3" name="Party Solidarity"> <skill id="1955" toLevel="3" name="Party Solidarity">
<!-- Increases party members' P. Atk. by 1%, M. Atk. by 1%, P. Critical Rate by 1%, Atk. Spd. by 1%, and Casting Spd. by 1%. Decreases physical and magic skill Cooldown by 1%. Always includes Sigel and Aeore Force. When 4 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. --> <!-- Increases party members' P. Atk. by 1%, M. Atk. by 1%, P. Critical Rate by 1%, Atk. Spd. by 1%, and Casting Spd. by 1%. Decreases physical and magic skill Cooldown by 1%. Always includes Sigel and Aeore Force. When 4 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. -->
<icon>icon.skill1955</icon> <icon>icon.skill1955</icon>
<abnormallVL>1</abnormallVL> <abnormalTime>6</abnormalTime>
<abnormalTime>11</abnormalTime>
<abnormalType>SYNERGY_PARTY_BUF</abnormalType> <abnormalType>SYNERGY_PARTY_BUF</abnormalType>
<affectRange>200</affectRange> <affectRange>200</affectRange>
<magicLvl> <magicLvl>
@ -1259,7 +1251,7 @@
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<operateType>A5</operateType> <operateType>A5</operateType>
<!-- Target ONE on retail, will be PARTY here. --> <!-- Target ONE on retail, will be PARTY here. -->
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
@ -1892,7 +1884,6 @@
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<staticDelay>true</staticDelay>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<effects> <effects>

23
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
View File

@ -195,17 +195,7 @@ public enum AbnormalType
SUPER_AVOID(-1), SUPER_AVOID(-1),
SUPER_BUFF(-1), SUPER_BUFF(-1),
SUPER_MOVE(-1), SUPER_MOVE(-1),
SYNERGY_EOLH(-1), TALISMAN_TRIGGER_SPECIAL(-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),
TIME_BOMB(-1), TIME_BOMB(-1),
TURN_CRYSTAL(-1), TURN_CRYSTAL(-1),
VAMPIRIC_ATTACK_SPECIAL(-1), VAMPIRIC_ATTACK_SPECIAL(-1),
@ -514,7 +504,18 @@ public enum AbnormalType
AIRBIND(365), AIRBIND(365),
KNOCKDOWN(367), KNOCKDOWN(367),
EARTHWORM_DEBUFF(424), 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), POTION_OF_PROTECTION(552),
SYNERGY_LENKER(589),
SYNERGY_SEER(590),
INSIDE_POSITION(593), INSIDE_POSITION(593),
STEEL_MIND(596); STEEL_MIND(596);

12
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java vendored
View File

@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect
@Override @Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); if (!_skill.getSkill().isSynergySkill())
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType()));
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType()));
}
} }
@Override @Override
public void onExit(Creature effector, Creature effected, Skill skill) 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 @Override

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java vendored
View File

@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect
if (abnormalCount >= _minSlot) 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(); final Skill partyBuffSkill = partyBuff.getSkill();
if (partyBuffSkill != null) if (partyBuffSkill != null)

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

@ -691,16 +691,7 @@
<!-- Sigel Force --> <!-- Sigel Force -->
<skillId>1928</skillId> <!-- Sigel Force --> <skillId>1928</skillId> <!-- Sigel Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>15</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -708,18 +699,17 @@
<!-- P. Atk. + 1%. --> <!-- P. Atk. + 1%. -->
<icon>icon.icon_sigel_01</icon> <icon>icon.icon_sigel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_SIGEL</abnormalType> <abnormalType>SYNERGY_SIGEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -729,6 +719,15 @@
<amount>1</amount> <amount>1</amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>5</ticks>
</effect>
</effects> </effects>
</skill> </skill>
<skill id="1929" toLevel="1" name="Tyrr Aura"> <skill id="1929" toLevel="1" name="Tyrr Aura">
@ -745,7 +744,7 @@
<!-- Tyrr Force --> <!-- Tyrr Force -->
<skillId>1930</skillId> <!-- Tyrr Force --> <skillId>1930</skillId> <!-- Tyrr Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -753,18 +752,17 @@
<!-- P. Critical Rate + 1%. --> <!-- P. Critical Rate + 1%. -->
<icon>icon.icon_tir_01</icon> <icon>icon.icon_tir_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_TIR</abnormalType> <abnormalType>SYNERGY_TIR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -790,7 +788,7 @@
<!-- Othell Force --> <!-- Othell Force -->
<skillId>1932</skillId> <!-- Othell Force --> <skillId>1932</skillId> <!-- Othell Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -798,18 +796,17 @@
<!-- Atk. Spd. + 1%. --> <!-- Atk. Spd. + 1%. -->
<icon>icon.icon_othel_01</icon> <icon>icon.icon_othel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_OTHEL</abnormalType> <abnormalType>SYNERGY_OTHEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -835,7 +832,7 @@
<!-- Yul Force --> <!-- Yul Force -->
<skillId>1934</skillId> <!-- Yul Force --> <skillId>1934</skillId> <!-- Yul Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -843,18 +840,17 @@
<!-- MP Recovery Bonus + 50%. --> <!-- MP Recovery Bonus + 50%. -->
<icon>icon.icon_yr_01</icon> <icon>icon.icon_yr_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_YR</abnormalType> <abnormalType>SYNERGY_YR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -880,7 +876,7 @@
<!-- Feoh Force --> <!-- Feoh Force -->
<skillId>1936</skillId> <!-- Feoh Force --> <skillId>1936</skillId> <!-- Feoh Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -888,18 +884,17 @@
<!-- Casting Spd. + 1%. --> <!-- Casting Spd. + 1%. -->
<icon>icon.icon_feoh_01</icon> <icon>icon.icon_feoh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_FEOH</abnormalType> <abnormalType>SYNERGY_FEOH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -925,7 +920,7 @@
<!-- Wynn Force --> <!-- Wynn Force -->
<skillId>1938</skillId> <!-- Wynn Force --> <skillId>1938</skillId> <!-- Wynn Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -933,18 +928,17 @@
<!-- P./M. Skill MP Consumption - 3%. --> <!-- P./M. Skill MP Consumption - 3%. -->
<icon>icon.icon_wynn_01</icon> <icon>icon.icon_wynn_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_WYNN</abnormalType> <abnormalType>SYNERGY_WYNN</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -976,7 +970,7 @@
<!-- Aeore Force --> <!-- Aeore Force -->
<skillId>1940</skillId> <!-- Aeore Force --> <skillId>1940</skillId> <!-- Aeore Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -984,18 +978,17 @@
<!-- M. Atk. + 1%. --> <!-- M. Atk. + 1%. -->
<icon>icon.icon_eolh_01</icon> <icon>icon.icon_eolh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_EOLH</abnormalType> <abnormalType>SYNERGY_EOLH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -1247,8 +1240,7 @@
<skill id="1955" toLevel="3" name="Party Solidarity"> <skill id="1955" toLevel="3" name="Party Solidarity">
<!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. --> <!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. -->
<icon>icon.skill1955</icon> <icon>icon.skill1955</icon>
<abnormallVL>1</abnormallVL> <abnormalTime>6</abnormalTime>
<abnormalTime>11</abnormalTime>
<abnormalType>SYNERGY_PARTY_BUF</abnormalType> <abnormalType>SYNERGY_PARTY_BUF</abnormalType>
<affectRange>200</affectRange> <affectRange>200</affectRange>
<magicLvl> <magicLvl>
@ -1259,7 +1251,7 @@
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<operateType>A5</operateType> <operateType>A5</operateType>
<!-- Target ONE on retail, will be PARTY here. --> <!-- Target ONE on retail, will be PARTY here. -->
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
@ -1892,7 +1884,6 @@
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<staticDelay>true</staticDelay>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<effects> <effects>

23
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
View File

@ -195,17 +195,7 @@ public enum AbnormalType
SUPER_AVOID(-1), SUPER_AVOID(-1),
SUPER_BUFF(-1), SUPER_BUFF(-1),
SUPER_MOVE(-1), SUPER_MOVE(-1),
SYNERGY_EOLH(-1), TALISMAN_TRIGGER_SPECIAL(-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),
TIME_BOMB(-1), TIME_BOMB(-1),
TURN_CRYSTAL(-1), TURN_CRYSTAL(-1),
VAMPIRIC_ATTACK_SPECIAL(-1), VAMPIRIC_ATTACK_SPECIAL(-1),
@ -514,7 +504,18 @@ public enum AbnormalType
AIRBIND(365), AIRBIND(365),
KNOCKDOWN(367), KNOCKDOWN(367),
EARTHWORM_DEBUFF(424), 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), POTION_OF_PROTECTION(552),
SYNERGY_LENKER(589),
SYNERGY_SEER(590),
INSIDE_POSITION(593), INSIDE_POSITION(593),
STEEL_MIND(596); STEEL_MIND(596);

12
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java vendored
View File

@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect
@Override @Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); if (!_skill.getSkill().isSynergySkill())
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType()));
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType()));
}
} }
@Override @Override
public void onExit(Creature effector, Creature effected, Skill skill) 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 @Override

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java vendored
View File

@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect
if (abnormalCount >= _minSlot) 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(); final Skill partyBuffSkill = partyBuff.getSkill();
if (partyBuffSkill != null) if (partyBuffSkill != null)

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

@ -691,16 +691,7 @@
<!-- Sigel Force --> <!-- Sigel Force -->
<skillId>1928</skillId> <!-- Sigel Force --> <skillId>1928</skillId> <!-- Sigel Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>15</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -708,18 +699,17 @@
<!-- P. Atk. + 1%. --> <!-- P. Atk. + 1%. -->
<icon>icon.icon_sigel_01</icon> <icon>icon.icon_sigel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_SIGEL</abnormalType> <abnormalType>SYNERGY_SIGEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -729,6 +719,15 @@
<amount>1</amount> <amount>1</amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>5</ticks>
</effect>
</effects> </effects>
</skill> </skill>
<skill id="1929" toLevel="1" name="Tyrr Aura"> <skill id="1929" toLevel="1" name="Tyrr Aura">
@ -745,7 +744,7 @@
<!-- Tyrr Force --> <!-- Tyrr Force -->
<skillId>1930</skillId> <!-- Tyrr Force --> <skillId>1930</skillId> <!-- Tyrr Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -753,18 +752,17 @@
<!-- P. Critical Rate + 1%. --> <!-- P. Critical Rate + 1%. -->
<icon>icon.icon_tir_01</icon> <icon>icon.icon_tir_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_TIR</abnormalType> <abnormalType>SYNERGY_TIR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -790,7 +788,7 @@
<!-- Othell Force --> <!-- Othell Force -->
<skillId>1932</skillId> <!-- Othell Force --> <skillId>1932</skillId> <!-- Othell Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -798,18 +796,17 @@
<!-- Atk. Spd. + 1%. --> <!-- Atk. Spd. + 1%. -->
<icon>icon.icon_othel_01</icon> <icon>icon.icon_othel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_OTHEL</abnormalType> <abnormalType>SYNERGY_OTHEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -835,7 +832,7 @@
<!-- Yul Force --> <!-- Yul Force -->
<skillId>1934</skillId> <!-- Yul Force --> <skillId>1934</skillId> <!-- Yul Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -843,18 +840,17 @@
<!-- MP Recovery Bonus + 50%. --> <!-- MP Recovery Bonus + 50%. -->
<icon>icon.icon_yr_01</icon> <icon>icon.icon_yr_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_YR</abnormalType> <abnormalType>SYNERGY_YR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -880,7 +876,7 @@
<!-- Feoh Force --> <!-- Feoh Force -->
<skillId>1936</skillId> <!-- Feoh Force --> <skillId>1936</skillId> <!-- Feoh Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -888,18 +884,17 @@
<!-- Casting Spd. + 1%. --> <!-- Casting Spd. + 1%. -->
<icon>icon.icon_feoh_01</icon> <icon>icon.icon_feoh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_FEOH</abnormalType> <abnormalType>SYNERGY_FEOH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -925,7 +920,7 @@
<!-- Wynn Force --> <!-- Wynn Force -->
<skillId>1938</skillId> <!-- Wynn Force --> <skillId>1938</skillId> <!-- Wynn Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -933,18 +928,17 @@
<!-- P./M. Skill MP Consumption - 3%. --> <!-- P./M. Skill MP Consumption - 3%. -->
<icon>icon.icon_wynn_01</icon> <icon>icon.icon_wynn_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_WYNN</abnormalType> <abnormalType>SYNERGY_WYNN</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -976,7 +970,7 @@
<!-- Aeore Force --> <!-- Aeore Force -->
<skillId>1940</skillId> <!-- Aeore Force --> <skillId>1940</skillId> <!-- Aeore Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -984,18 +978,17 @@
<!-- M. Atk. + 1%. --> <!-- M. Atk. + 1%. -->
<icon>icon.icon_eolh_01</icon> <icon>icon.icon_eolh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_EOLH</abnormalType> <abnormalType>SYNERGY_EOLH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -1247,8 +1240,7 @@
<skill id="1955" toLevel="3" name="Party Solidarity"> <skill id="1955" toLevel="3" name="Party Solidarity">
<!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. --> <!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. -->
<icon>icon.skill1955</icon> <icon>icon.skill1955</icon>
<abnormallVL>1</abnormallVL> <abnormalTime>6</abnormalTime>
<abnormalTime>11</abnormalTime>
<abnormalType>SYNERGY_PARTY_BUF</abnormalType> <abnormalType>SYNERGY_PARTY_BUF</abnormalType>
<affectRange>200</affectRange> <affectRange>200</affectRange>
<magicLvl> <magicLvl>
@ -1259,7 +1251,7 @@
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<operateType>A5</operateType> <operateType>A5</operateType>
<!-- Target ONE on retail, will be PARTY here. --> <!-- Target ONE on retail, will be PARTY here. -->
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
@ -1892,7 +1884,6 @@
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<staticDelay>true</staticDelay>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<effects> <effects>

23
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
View File

@ -196,17 +196,7 @@ public enum AbnormalType
SUPER_AVOID(-1), SUPER_AVOID(-1),
SUPER_BUFF(-1), SUPER_BUFF(-1),
SUPER_MOVE(-1), SUPER_MOVE(-1),
SYNERGY_EOLH(-1), TALISMAN_TRIGGER_SPECIAL(-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),
TIME_BOMB(-1), TIME_BOMB(-1),
TURN_CRYSTAL(-1), TURN_CRYSTAL(-1),
VAMPIRIC_ATTACK_SPECIAL(-1), VAMPIRIC_ATTACK_SPECIAL(-1),
@ -515,7 +505,18 @@ public enum AbnormalType
AIRBIND(365), AIRBIND(365),
KNOCKDOWN(367), KNOCKDOWN(367),
EARTHWORM_DEBUFF(424), 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), POTION_OF_PROTECTION(552),
SYNERGY_LENKER(589),
SYNERGY_SEER(590),
INSIDE_POSITION(593), INSIDE_POSITION(593),
STEEL_MIND(596); STEEL_MIND(596);

12
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java vendored
View File

@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect
@Override @Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); if (!_skill.getSkill().isSynergySkill())
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType()));
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType()));
}
} }
@Override @Override
public void onExit(Creature effector, Creature effected, Skill skill) 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 @Override

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java vendored
View File

@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect
if (abnormalCount >= _minSlot) 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(); final Skill partyBuffSkill = partyBuff.getSkill();
if (partyBuffSkill != null) if (partyBuffSkill != null)

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

@ -691,16 +691,7 @@
<!-- Sigel Force --> <!-- Sigel Force -->
<skillId>1928</skillId> <!-- Sigel Force --> <skillId>1928</skillId> <!-- Sigel Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>15</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -708,18 +699,17 @@
<!-- P. Atk. + 1%. --> <!-- P. Atk. + 1%. -->
<icon>icon.icon_sigel_01</icon> <icon>icon.icon_sigel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_SIGEL</abnormalType> <abnormalType>SYNERGY_SIGEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -729,6 +719,15 @@
<amount>1</amount> <amount>1</amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>5</ticks>
</effect>
</effects> </effects>
</skill> </skill>
<skill id="1929" toLevel="1" name="Tyrr Aura"> <skill id="1929" toLevel="1" name="Tyrr Aura">
@ -745,7 +744,7 @@
<!-- Tyrr Force --> <!-- Tyrr Force -->
<skillId>1930</skillId> <!-- Tyrr Force --> <skillId>1930</skillId> <!-- Tyrr Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -753,18 +752,17 @@
<!-- P. Critical Rate + 1%. --> <!-- P. Critical Rate + 1%. -->
<icon>icon.icon_tir_01</icon> <icon>icon.icon_tir_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_TIR</abnormalType> <abnormalType>SYNERGY_TIR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -790,7 +788,7 @@
<!-- Othell Force --> <!-- Othell Force -->
<skillId>1932</skillId> <!-- Othell Force --> <skillId>1932</skillId> <!-- Othell Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -798,18 +796,17 @@
<!-- Atk. Spd. + 1%. --> <!-- Atk. Spd. + 1%. -->
<icon>icon.icon_othel_01</icon> <icon>icon.icon_othel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_OTHEL</abnormalType> <abnormalType>SYNERGY_OTHEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -835,7 +832,7 @@
<!-- Yul Force --> <!-- Yul Force -->
<skillId>1934</skillId> <!-- Yul Force --> <skillId>1934</skillId> <!-- Yul Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -843,18 +840,17 @@
<!-- MP Recovery Bonus + 50%. --> <!-- MP Recovery Bonus + 50%. -->
<icon>icon.icon_yr_01</icon> <icon>icon.icon_yr_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_YR</abnormalType> <abnormalType>SYNERGY_YR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -880,7 +876,7 @@
<!-- Feoh Force --> <!-- Feoh Force -->
<skillId>1936</skillId> <!-- Feoh Force --> <skillId>1936</skillId> <!-- Feoh Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -888,18 +884,17 @@
<!-- Casting Spd. + 1%. --> <!-- Casting Spd. + 1%. -->
<icon>icon.icon_feoh_01</icon> <icon>icon.icon_feoh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_FEOH</abnormalType> <abnormalType>SYNERGY_FEOH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -925,7 +920,7 @@
<!-- Wynn Force --> <!-- Wynn Force -->
<skillId>1938</skillId> <!-- Wynn Force --> <skillId>1938</skillId> <!-- Wynn Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -933,18 +928,17 @@
<!-- P./M. Skill MP Consumption - 3%. --> <!-- P./M. Skill MP Consumption - 3%. -->
<icon>icon.icon_wynn_01</icon> <icon>icon.icon_wynn_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_WYNN</abnormalType> <abnormalType>SYNERGY_WYNN</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -976,7 +970,7 @@
<!-- Aeore Force --> <!-- Aeore Force -->
<skillId>1940</skillId> <!-- Aeore Force --> <skillId>1940</skillId> <!-- Aeore Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -984,18 +978,17 @@
<!-- M. Atk. + 1%. --> <!-- M. Atk. + 1%. -->
<icon>icon.icon_eolh_01</icon> <icon>icon.icon_eolh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_EOLH</abnormalType> <abnormalType>SYNERGY_EOLH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -1247,8 +1240,7 @@
<skill id="1955" toLevel="3" name="Party Solidarity"> <skill id="1955" toLevel="3" name="Party Solidarity">
<!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. --> <!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. -->
<icon>icon.skill1955</icon> <icon>icon.skill1955</icon>
<abnormallVL>1</abnormallVL> <abnormalTime>6</abnormalTime>
<abnormalTime>11</abnormalTime>
<abnormalType>SYNERGY_PARTY_BUF</abnormalType> <abnormalType>SYNERGY_PARTY_BUF</abnormalType>
<affectRange>200</affectRange> <affectRange>200</affectRange>
<magicLvl> <magicLvl>
@ -1259,7 +1251,7 @@
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<operateType>A5</operateType> <operateType>A5</operateType>
<!-- Target ONE on retail, will be PARTY here. --> <!-- Target ONE on retail, will be PARTY here. -->
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
@ -1892,7 +1884,6 @@
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<staticDelay>true</staticDelay>
<targetType>SELF</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<effects> <effects>

22
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
View File

@ -220,17 +220,6 @@ public enum AbnormalType
SUPER_AVOID(-1), SUPER_AVOID(-1),
SUPER_BUFF(-1), SUPER_BUFF(-1),
SUPER_MOVE(-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), TALISMAN_TRIGGER_SPECIAL(-1),
TIME_BOMB(-1), TIME_BOMB(-1),
TURN_CRYSTAL(-1), TURN_CRYSTAL(-1),
@ -540,7 +529,18 @@ public enum AbnormalType
AIRBIND(365), AIRBIND(365),
KNOCKDOWN(367), KNOCKDOWN(367),
EARTHWORM_DEBUFF(424), 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), POTION_OF_PROTECTION(552),
SYNERGY_LENKER(589),
SYNERGY_SEER(590),
INSIDE_POSITION(593), INSIDE_POSITION(593),
STEEL_MIND(596); STEEL_MIND(596);

12
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java vendored
View File

@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect
@Override @Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); if (!_skill.getSkill().isSynergySkill())
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType()));
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType()));
}
} }
@Override @Override
public void onExit(Creature effector, Creature effected, Skill skill) 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 @Override

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java vendored
View File

@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect
if (abnormalCount >= _minSlot) 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(); final Skill partyBuffSkill = partyBuff.getSkill();
if (partyBuffSkill != null) if (partyBuffSkill != null)

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

@ -691,16 +691,7 @@
<!-- Sigel Force --> <!-- Sigel Force -->
<skillId>1928</skillId> <!-- Sigel Force --> <skillId>1928</skillId> <!-- Sigel Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>15</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -708,18 +699,17 @@
<!-- P. Atk. +1%. --> <!-- P. Atk. +1%. -->
<icon>icon.icon_sigel_01</icon> <icon>icon.icon_sigel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_SIGEL</abnormalType> <abnormalType>SYNERGY_SIGEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -729,6 +719,15 @@
<amount>1</amount> <amount>1</amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>5</ticks>
</effect>
</effects> </effects>
</skill> </skill>
<skill id="1929" toLevel="1" name="Tyrr Aura"> <skill id="1929" toLevel="1" name="Tyrr Aura">
@ -745,7 +744,7 @@
<!-- Tyrr Force --> <!-- Tyrr Force -->
<skillId>1930</skillId> <!-- Tyrr Force --> <skillId>1930</skillId> <!-- Tyrr Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -753,18 +752,17 @@
<!-- P. Critical Rate +1%. --> <!-- P. Critical Rate +1%. -->
<icon>icon.icon_tir_01</icon> <icon>icon.icon_tir_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_TIR</abnormalType> <abnormalType>SYNERGY_TIR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -790,7 +788,7 @@
<!-- Othell Force --> <!-- Othell Force -->
<skillId>1932</skillId> <!-- Othell Force --> <skillId>1932</skillId> <!-- Othell Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -798,18 +796,17 @@
<!-- Atk. Spd. +1%. --> <!-- Atk. Spd. +1%. -->
<icon>icon.icon_othel_01</icon> <icon>icon.icon_othel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_OTHEL</abnormalType> <abnormalType>SYNERGY_OTHEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -835,7 +832,7 @@
<!-- Yul Force --> <!-- Yul Force -->
<skillId>1934</skillId> <!-- Yul Force --> <skillId>1934</skillId> <!-- Yul Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -843,18 +840,17 @@
<!-- MP Recovery Bonus +50%. --> <!-- MP Recovery Bonus +50%. -->
<icon>icon.icon_yr_01</icon> <icon>icon.icon_yr_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_YR</abnormalType> <abnormalType>SYNERGY_YR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -880,7 +876,7 @@
<!-- Feoh Force --> <!-- Feoh Force -->
<skillId>1936</skillId> <!-- Feoh Force --> <skillId>1936</skillId> <!-- Feoh Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -888,18 +884,17 @@
<!-- Casting Spd. +1%. --> <!-- Casting Spd. +1%. -->
<icon>icon.icon_feoh_01</icon> <icon>icon.icon_feoh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_FEOH</abnormalType> <abnormalType>SYNERGY_FEOH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -925,7 +920,7 @@
<!-- Wynn Force --> <!-- Wynn Force -->
<skillId>1938</skillId> <!-- Wynn Force --> <skillId>1938</skillId> <!-- Wynn Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -933,18 +928,17 @@
<!-- P./ M. Skill MP Consumption -3%. --> <!-- P./ M. Skill MP Consumption -3%. -->
<icon>icon.icon_wynn_01</icon> <icon>icon.icon_wynn_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_WYNN</abnormalType> <abnormalType>SYNERGY_WYNN</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -976,7 +970,7 @@
<!-- Aeore Force --> <!-- Aeore Force -->
<skillId>1940</skillId> <!-- Aeore Force --> <skillId>1940</skillId> <!-- Aeore Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -984,18 +978,17 @@
<!-- M. Atk. +1%. --> <!-- M. Atk. +1%. -->
<icon>icon.icon_eolh_01</icon> <icon>icon.icon_eolh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_EOLH</abnormalType> <abnormalType>SYNERGY_EOLH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -1247,8 +1240,7 @@
<skill id="1955" toLevel="3" name="Party Solidarity"> <skill id="1955" toLevel="3" name="Party Solidarity">
<!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. --> <!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. -->
<icon>icon.skill1955</icon> <icon>icon.skill1955</icon>
<abnormallVL>1</abnormallVL> <abnormalTime>6</abnormalTime>
<abnormalTime>11</abnormalTime>
<abnormalType>SYNERGY_PARTY_BUF</abnormalType> <abnormalType>SYNERGY_PARTY_BUF</abnormalType>
<affectRange>200</affectRange> <affectRange>200</affectRange>
<magicLvl> <magicLvl>
@ -1259,7 +1251,7 @@
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<operateType>A5</operateType> <operateType>A5</operateType>
<!-- Target ONE on retail, will be PARTY here. --> <!-- Target ONE on retail, will be PARTY here. -->
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>

22
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
View File

@ -220,17 +220,6 @@ public enum AbnormalType
SUPER_AVOID(-1), SUPER_AVOID(-1),
SUPER_BUFF(-1), SUPER_BUFF(-1),
SUPER_MOVE(-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), TALISMAN_TRIGGER_SPECIAL(-1),
TIME_BOMB(-1), TIME_BOMB(-1),
TURN_CRYSTAL(-1), TURN_CRYSTAL(-1),
@ -542,7 +531,18 @@ public enum AbnormalType
AIRBIND(365), AIRBIND(365),
KNOCKDOWN(367), KNOCKDOWN(367),
EARTHWORM_DEBUFF(424), 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), POTION_OF_PROTECTION(552),
SYNERGY_LENKER(589),
SYNERGY_SEER(590),
INSIDE_POSITION(593), INSIDE_POSITION(593),
STEEL_MIND(596), STEEL_MIND(596),
SIGEL_SHIELD(597); SIGEL_SHIELD(597);

12
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java vendored
View File

@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect
@Override @Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); if (!_skill.getSkill().isSynergySkill())
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType()));
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType()));
}
} }
@Override @Override
public void onExit(Creature effector, Creature effected, Skill skill) 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 @Override

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java vendored
View File

@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect
if (abnormalCount >= _minSlot) 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(); final Skill partyBuffSkill = partyBuff.getSkill();
if (partyBuffSkill != null) if (partyBuffSkill != null)

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

@ -691,16 +691,7 @@
<!-- Sigel Force --> <!-- Sigel Force -->
<skillId>1928</skillId> <!-- Sigel Force --> <skillId>1928</skillId> <!-- Sigel Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>15</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -708,18 +699,17 @@
<!-- P. Atk. +1%. --> <!-- P. Atk. +1%. -->
<icon>icon.icon_sigel_01</icon> <icon>icon.icon_sigel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_SIGEL</abnormalType> <abnormalType>SYNERGY_SIGEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -729,6 +719,15 @@
<amount>1</amount> <amount>1</amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>5</ticks>
</effect>
</effects> </effects>
</skill> </skill>
<skill id="1929" toLevel="1" name="Tyrr Aura"> <skill id="1929" toLevel="1" name="Tyrr Aura">
@ -745,7 +744,7 @@
<!-- Tyrr Force --> <!-- Tyrr Force -->
<skillId>1930</skillId> <!-- Tyrr Force --> <skillId>1930</skillId> <!-- Tyrr Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -753,18 +752,17 @@
<!-- P. Critical Rate +1%. --> <!-- P. Critical Rate +1%. -->
<icon>icon.icon_tir_01</icon> <icon>icon.icon_tir_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_TIR</abnormalType> <abnormalType>SYNERGY_TIR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -790,7 +788,7 @@
<!-- Othell Force --> <!-- Othell Force -->
<skillId>1932</skillId> <!-- Othell Force --> <skillId>1932</skillId> <!-- Othell Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -798,18 +796,17 @@
<!-- Atk. Spd. +1%. --> <!-- Atk. Spd. +1%. -->
<icon>icon.icon_othel_01</icon> <icon>icon.icon_othel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_OTHEL</abnormalType> <abnormalType>SYNERGY_OTHEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -835,7 +832,7 @@
<!-- Yul Force --> <!-- Yul Force -->
<skillId>1934</skillId> <!-- Yul Force --> <skillId>1934</skillId> <!-- Yul Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -843,18 +840,17 @@
<!-- MP Recovery Bonus +50%. --> <!-- MP Recovery Bonus +50%. -->
<icon>icon.icon_yr_01</icon> <icon>icon.icon_yr_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_YR</abnormalType> <abnormalType>SYNERGY_YR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -880,7 +876,7 @@
<!-- Feoh Force --> <!-- Feoh Force -->
<skillId>1936</skillId> <!-- Feoh Force --> <skillId>1936</skillId> <!-- Feoh Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -888,18 +884,17 @@
<!-- Casting Spd. +1%. --> <!-- Casting Spd. +1%. -->
<icon>icon.icon_feoh_01</icon> <icon>icon.icon_feoh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_FEOH</abnormalType> <abnormalType>SYNERGY_FEOH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -925,7 +920,7 @@
<!-- Wynn Force --> <!-- Wynn Force -->
<skillId>1938</skillId> <!-- Wynn Force --> <skillId>1938</skillId> <!-- Wynn Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -933,18 +928,17 @@
<!-- P./ M. Skill MP Consumption -3%. --> <!-- P./ M. Skill MP Consumption -3%. -->
<icon>icon.icon_wynn_01</icon> <icon>icon.icon_wynn_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_WYNN</abnormalType> <abnormalType>SYNERGY_WYNN</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -976,7 +970,7 @@
<!-- Aeore Force --> <!-- Aeore Force -->
<skillId>1940</skillId> <!-- Aeore Force --> <skillId>1940</skillId> <!-- Aeore Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -984,18 +978,17 @@
<!-- M. Atk. +1%. --> <!-- M. Atk. +1%. -->
<icon>icon.icon_eolh_01</icon> <icon>icon.icon_eolh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_EOLH</abnormalType> <abnormalType>SYNERGY_EOLH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -1247,8 +1240,7 @@
<skill id="1955" toLevel="3" name="Party Solidarity"> <skill id="1955" toLevel="3" name="Party Solidarity">
<!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. --> <!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. -->
<icon>icon.skill1955</icon> <icon>icon.skill1955</icon>
<abnormallVL>1</abnormallVL> <abnormalTime>6</abnormalTime>
<abnormalTime>11</abnormalTime>
<abnormalType>SYNERGY_PARTY_BUF</abnormalType> <abnormalType>SYNERGY_PARTY_BUF</abnormalType>
<affectRange>200</affectRange> <affectRange>200</affectRange>
<magicLvl> <magicLvl>
@ -1259,7 +1251,7 @@
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<operateType>A5</operateType> <operateType>A5</operateType>
<!-- Target ONE on retail, will be PARTY here. --> <!-- Target ONE on retail, will be PARTY here. -->
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>

22
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
View File

@ -220,17 +220,6 @@ public enum AbnormalType
SUPER_AVOID(-1), SUPER_AVOID(-1),
SUPER_BUFF(-1), SUPER_BUFF(-1),
SUPER_MOVE(-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), TALISMAN_TRIGGER_SPECIAL(-1),
TIME_BOMB(-1), TIME_BOMB(-1),
TURN_CRYSTAL(-1), TURN_CRYSTAL(-1),
@ -542,7 +531,18 @@ public enum AbnormalType
AIRBIND(365), AIRBIND(365),
KNOCKDOWN(367), KNOCKDOWN(367),
EARTHWORM_DEBUFF(424), 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), POTION_OF_PROTECTION(552),
SYNERGY_LENKER(589),
SYNERGY_SEER(590),
INSIDE_POSITION(593), INSIDE_POSITION(593),
STEEL_MIND(596), STEEL_MIND(596),
SIGEL_SHIELD(597); SIGEL_SHIELD(597);

12
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java vendored
View File

@ -44,14 +44,20 @@ public final class CallSkillOnActionTime extends AbstractEffect
@Override @Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item) public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); if (!_skill.getSkill().isSynergySkill())
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); {
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType()));
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType()));
}
} }
@Override @Override
public void onExit(Creature effector, Creature effected, Skill skill) 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 @Override

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java vendored
View File

@ -97,7 +97,7 @@ public final class Synergy extends AbstractEffect
if (abnormalCount >= _minSlot) 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(); final Skill partyBuffSkill = partyBuff.getSkill();
if (partyBuffSkill != null) if (partyBuffSkill != null)

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

@ -691,16 +691,7 @@
<!-- Sigel Force --> <!-- Sigel Force -->
<skillId>1928</skillId> <!-- Sigel Force --> <skillId>1928</skillId> <!-- Sigel Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>15</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -708,18 +699,17 @@
<!-- P. Atk. +1%. --> <!-- P. Atk. +1%. -->
<icon>icon.icon_sigel_01</icon> <icon>icon.icon_sigel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_SIGEL</abnormalType> <abnormalType>SYNERGY_SIGEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -729,6 +719,15 @@
<amount>1</amount> <amount>1</amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
<effect name="Synergy">
<!-- Party Solidarity -->
<optionalSlots>SYNERGY_FEOH;SYNERGY_LENKER;SYNERGY_OTHEL;SYNERGY_SEER;SYNERGY_TIR;SYNERGY_WYNN;SYNERGY_YR</optionalSlots>
<requiredSlots>SYNERGY_SIGEL;SYNERGY_EOLH</requiredSlots>
<partyBuffSkillId>1955</partyBuffSkillId>
<minSlot>2</minSlot>
<skillLevelScaleTo>3</skillLevelScaleTo>
<ticks>5</ticks>
</effect>
</effects> </effects>
</skill> </skill>
<skill id="1929" toLevel="1" name="Tyrr Aura"> <skill id="1929" toLevel="1" name="Tyrr Aura">
@ -745,7 +744,7 @@
<!-- Tyrr Force --> <!-- Tyrr Force -->
<skillId>1930</skillId> <!-- Tyrr Force --> <skillId>1930</skillId> <!-- Tyrr Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -753,18 +752,17 @@
<!-- P. Critical Rate +1%. --> <!-- P. Critical Rate +1%. -->
<icon>icon.icon_tir_01</icon> <icon>icon.icon_tir_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_TIR</abnormalType> <abnormalType>SYNERGY_TIR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -790,7 +788,7 @@
<!-- Othell Force --> <!-- Othell Force -->
<skillId>1932</skillId> <!-- Othell Force --> <skillId>1932</skillId> <!-- Othell Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -798,18 +796,17 @@
<!-- Atk. Spd. +1%. --> <!-- Atk. Spd. +1%. -->
<icon>icon.icon_othel_01</icon> <icon>icon.icon_othel_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_OTHEL</abnormalType> <abnormalType>SYNERGY_OTHEL</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -835,7 +832,7 @@
<!-- Yul Force --> <!-- Yul Force -->
<skillId>1934</skillId> <!-- Yul Force --> <skillId>1934</skillId> <!-- Yul Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -843,18 +840,17 @@
<!-- MP Recovery Bonus +50%. --> <!-- MP Recovery Bonus +50%. -->
<icon>icon.icon_yr_01</icon> <icon>icon.icon_yr_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_YR</abnormalType> <abnormalType>SYNERGY_YR</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -880,7 +876,7 @@
<!-- Feoh Force --> <!-- Feoh Force -->
<skillId>1936</skillId> <!-- Feoh Force --> <skillId>1936</skillId> <!-- Feoh Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -888,18 +884,17 @@
<!-- Casting Spd. +1%. --> <!-- Casting Spd. +1%. -->
<icon>icon.icon_feoh_01</icon> <icon>icon.icon_feoh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_FEOH</abnormalType> <abnormalType>SYNERGY_FEOH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -925,7 +920,7 @@
<!-- Wynn Force --> <!-- Wynn Force -->
<skillId>1938</skillId> <!-- Wynn Force --> <skillId>1938</skillId> <!-- Wynn Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -933,18 +928,17 @@
<!-- P./ M. Skill MP Consumption -3%. --> <!-- P./ M. Skill MP Consumption -3%. -->
<icon>icon.icon_wynn_01</icon> <icon>icon.icon_wynn_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_WYNN</abnormalType> <abnormalType>SYNERGY_WYNN</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -976,7 +970,7 @@
<!-- Aeore Force --> <!-- Aeore Force -->
<skillId>1940</skillId> <!-- Aeore Force --> <skillId>1940</skillId> <!-- Aeore Force -->
<skillLevel>1</skillLevel> <skillLevel>1</skillLevel>
<ticks>7</ticks> <ticks>5</ticks>
</effect> </effect>
</effects> </effects>
</skill> </skill>
@ -984,18 +978,17 @@
<!-- M. Atk. +1%. --> <!-- M. Atk. +1%. -->
<icon>icon.icon_eolh_01</icon> <icon>icon.icon_eolh_01</icon>
<abnormallVL>1</abnormallVL> <abnormallVL>1</abnormallVL>
<abnormalTime>11</abnormalTime> <abnormalTime>6</abnormalTime>
<abnormalType>SYNERGY_EOLH</abnormalType> <abnormalType>SYNERGY_EOLH</abnormalType>
<affectRange>1600</affectRange> <affectRange>1600</affectRange>
<canBeDispelled>false</canBeDispelled> <canBeDispelled>false</canBeDispelled>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl>85</magicLvl> <magicLvl>85</magicLvl>
<operateType>A6</operateType> <operateType>A6</operateType>
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<abnormalLvl>1</abnormalLvl>
<isMagic>3</isMagic> <isMagic>3</isMagic>
<targetType>MY_PARTY</targetType> <targetType>MY_PARTY</targetType>
<affectScope>PARTY</affectScope> <affectScope>PARTY</affectScope>
@ -1247,8 +1240,7 @@
<skill id="1955" toLevel="3" name="Party Solidarity"> <skill id="1955" toLevel="3" name="Party Solidarity">
<!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. --> <!-- Increases party members' P. Atk. by $s1, M. Atk. by $s2, P. Critical Rate by $s3, Atk. Spd. by $s4, and Casting Spd. by $s5. Decreases physical and magic skill Cooldown by $s6. Always includes Sigel and Aeore Force. When $s7 or more forces are applied, the Party Solidarity effect is activated. When the number of forces applied increases, the Party Solidarity effect is raised. -->
<icon>icon.skill1955</icon> <icon>icon.skill1955</icon>
<abnormallVL>1</abnormallVL> <abnormalTime>6</abnormalTime>
<abnormalTime>11</abnormalTime>
<abnormalType>SYNERGY_PARTY_BUF</abnormalType> <abnormalType>SYNERGY_PARTY_BUF</abnormalType>
<affectRange>200</affectRange> <affectRange>200</affectRange>
<magicLvl> <magicLvl>
@ -1259,7 +1251,7 @@
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<operateType>A5</operateType> <operateType>A5</operateType>
<!-- Target ONE on retail, will be PARTY here. --> <!-- Target ONE on retail, will be PARTY here. -->
<reuseDelay>5000</reuseDelay> <reuseDelay>1000</reuseDelay>
<effectPoint>2</effectPoint> <effectPoint>2</effectPoint>
<basicProperty>NONE</basicProperty> <basicProperty>NONE</basicProperty>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>

22
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/AbnormalType.java
View File

@ -220,17 +220,6 @@ public enum AbnormalType
SUPER_AVOID(-1), SUPER_AVOID(-1),
SUPER_BUFF(-1), SUPER_BUFF(-1),
SUPER_MOVE(-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), TALISMAN_TRIGGER_SPECIAL(-1),
TIME_BOMB(-1), TIME_BOMB(-1),
TURN_CRYSTAL(-1), TURN_CRYSTAL(-1),
@ -542,7 +531,18 @@ public enum AbnormalType
AIRBIND(365), AIRBIND(365),
KNOCKDOWN(367), KNOCKDOWN(367),
EARTHWORM_DEBUFF(424), 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), POTION_OF_PROTECTION(552),
SYNERGY_LENKER(589),
SYNERGY_SEER(590),
INSIDE_POSITION(593), INSIDE_POSITION(593),
STEEL_MIND(596), STEEL_MIND(596),
SIGEL_SHIELD(597); SIGEL_SHIELD(597);