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
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType()));
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType()));
if (!_skill.getSkill().isSynergySkill())
{
effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType()));
effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType()));
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType()));
if (!_skill.getSkill().isSynergySkill())
{
effected.getEffectList().removeBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType()));
}
}
@Override

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)
{
final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.max(abnormalCount - 1, _skillLevelScaleTo));
final SkillHolder partyBuff = new SkillHolder(_partyBuffSkillId, Math.min(abnormalCount - 1, _skillLevelScaleTo));
final Skill partyBuffSkill = partyBuff.getSkill();
if (partyBuffSkill != null)

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

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