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

More changes related to last commits.

Browse Source 
Contributed by Ofelin.
This commit is contained in:
MobiusDev 2018-09-17 18:38:46 +00:00
parent 0e2912652a
commit fa468930e7
10 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java vendored
View File

@ -61,7 +61,6 @@ public class DisableSkill extends AbstractEffect
effected.disableSkill(knownSKill, 0); effected.disableSkill(knownSKill, 0);
} }
effected.disableSkill(skill, 0);
} }
} }

4
L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml vendored
View File

@ -1317,7 +1317,7 @@
<value fromLevel="3" toLevel="7" fromSubLevel="1011" toSubLevel="1020">{base + 10 + 0.5 * subIndex}</value> <value fromLevel="3" toLevel="7" fromSubLevel="1011" toSubLevel="1020">{base + 10 + 0.5 * subIndex}</value>
</abnormalTime> </abnormalTime>
<abnormalType>SIGEL_SHIELD</abnormalType> <abnormalType>SIGEL_SHIELD</abnormalType>
<abnormalVisualEffect>ULTIMATE_DEFENCE</abnormalVisualEffect> <abnormalVisualEffect>RAISE_SHIELD;FOCUS_SHIELD</abnormalVisualEffect>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl> <magicLvl>
<value level="1">85</value> <value level="1">85</value>
@ -1573,6 +1573,7 @@
<value fromLevel="1" toLevel="7">10</value> <value fromLevel="1" toLevel="7">10</value>
</abnormalTime> </abnormalTime>
<abnormalType>SIGEL_SHIELD</abnormalType> <abnormalType>SIGEL_SHIELD</abnormalType>
<abnormalVisualEffect>FOCUS_SHIELD</abnormalVisualEffect>
<icon>icon.skill10020</icon> <icon>icon.skill10020</icon>
<operateType>A2</operateType> <operateType>A2</operateType>
<rideState>NONE</rideState> <rideState>NONE</rideState>
@ -1634,6 +1635,7 @@
<value fromLevel="3" toLevel="7" fromSubLevel="1001" toSubLevel="1020">{base + 0.5 * subIndex}</value> <value fromLevel="3" toLevel="7" fromSubLevel="1001" toSubLevel="1020">{base + 0.5 * subIndex}</value>
</abnormalTime> </abnormalTime>
<abnormalType>SIGEL_SHIELD</abnormalType> <abnormalType>SIGEL_SHIELD</abnormalType>
<abnormalVisualEffect>RAISE_SHIELD</abnormalVisualEffect>
<icon>icon.skill10021</icon> <icon>icon.skill10021</icon>
<operateType>A2</operateType> <operateType>A2</operateType>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>

8
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -8480,8 +8480,12 @@ public final class L2PcInstance extends L2Playable
sm.addSkillName(skill); sm.addSkillName(skill);
} }
sendPacket(sm); // Don't send packet for Raise/Focus Shield if Final Ultimate Defense is active.
return false; if (!(getEffectList().getBuffInfoBySkillId(10017) != null) && ((skill.getId() == 10020) || (skill.getId() == 10021)))
{
sendPacket(sm);
return false;
}
} }
// Check if the caster is sitting // Check if the caster is sitting

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
View File

@ -542,7 +542,7 @@ public enum AbnormalType
EARTHWORM_DEBUFF(424), EARTHWORM_DEBUFF(424),
INSIDE_POSITION(593), INSIDE_POSITION(593),
STEEL_MIND(596), STEEL_MIND(596),
SIGEL_SHIELD(-1); SIGEL_SHIELD(597);
private int _clientId; private int _clientId;

4
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java
View File

@ -230,8 +230,8 @@ public enum AbnormalVisualEffect
IN_B_DECAL(231), IN_B_DECAL(231),
CHANGESHAPE_TRANSFORM_6(232), CHANGESHAPE_TRANSFORM_6(232),
CHANGESHAPE_TRANSFORM_7(234), CHANGESHAPE_TRANSFORM_7(234),
POWER_BLOCKING(247), FOCUS_SHIELD(247),
FOCUS_SHIELD(248), RAISE_SHIELD(248),
TRUE_VANGUARD(249), TRUE_VANGUARD(249),
SHIELD_WALL(250), SHIELD_WALL(250),
DRAGON_ULTIMATE(700), DRAGON_ULTIMATE(700),

1
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java vendored
View File

@ -61,7 +61,6 @@ public class DisableSkill extends AbstractEffect
effected.disableSkill(knownSKill, 0); effected.disableSkill(knownSKill, 0);
} }
effected.disableSkill(skill, 0);
} }
} }

4
L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml vendored
View File

@ -1317,7 +1317,7 @@
<value fromLevel="3" toLevel="7" fromSubLevel="1011" toSubLevel="1020">{base + 10 + 0.5 * subIndex}</value> <value fromLevel="3" toLevel="7" fromSubLevel="1011" toSubLevel="1020">{base + 10 + 0.5 * subIndex}</value>
</abnormalTime> </abnormalTime>
<abnormalType>SIGEL_SHIELD</abnormalType> <abnormalType>SIGEL_SHIELD</abnormalType>
<abnormalVisualEffect>ULTIMATE_DEFENCE</abnormalVisualEffect> <abnormalVisualEffect>RAISE_SHIELD;FOCUS_SHIELD</abnormalVisualEffect>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<magicLvl> <magicLvl>
<value level="1">85</value> <value level="1">85</value>
@ -1573,6 +1573,7 @@
<value fromLevel="1" toLevel="7">10</value> <value fromLevel="1" toLevel="7">10</value>
</abnormalTime> </abnormalTime>
<abnormalType>SIGEL_SHIELD</abnormalType> <abnormalType>SIGEL_SHIELD</abnormalType>
<abnormalVisualEffect>FOCUS_SHIELD</abnormalVisualEffect>
<icon>icon.skill10020</icon> <icon>icon.skill10020</icon>
<operateType>A2</operateType> <operateType>A2</operateType>
<rideState>NONE</rideState> <rideState>NONE</rideState>
@ -1634,6 +1635,7 @@
<value fromLevel="3" toLevel="7" fromSubLevel="1001" toSubLevel="1020">{base + 0.5 * subIndex}</value> <value fromLevel="3" toLevel="7" fromSubLevel="1001" toSubLevel="1020">{base + 0.5 * subIndex}</value>
</abnormalTime> </abnormalTime>
<abnormalType>SIGEL_SHIELD</abnormalType> <abnormalType>SIGEL_SHIELD</abnormalType>
<abnormalVisualEffect>RAISE_SHIELD</abnormalVisualEffect>
<icon>icon.skill10021</icon> <icon>icon.skill10021</icon>
<operateType>A2</operateType> <operateType>A2</operateType>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>

8
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -8480,8 +8480,12 @@ public final class L2PcInstance extends L2Playable
sm.addSkillName(skill); sm.addSkillName(skill);
} }
sendPacket(sm); // Don't send packet for Raise/Focus Shield if Final Ultimate Defense is active.
return false; if (!(getEffectList().getBuffInfoBySkillId(10017) != null) && ((skill.getId() == 10020) || (skill.getId() == 10021)))
{
sendPacket(sm);
return false;
}
} }
// Check if the caster is sitting // Check if the caster is sitting

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
View File

@ -542,7 +542,7 @@ public enum AbnormalType
EARTHWORM_DEBUFF(424), EARTHWORM_DEBUFF(424),
INSIDE_POSITION(593), INSIDE_POSITION(593),
STEEL_MIND(596), STEEL_MIND(596),
SIGEL_SHIELD(-1); SIGEL_SHIELD(597);
private int _clientId; private int _clientId;

4
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java
View File

@ -230,8 +230,8 @@ public enum AbnormalVisualEffect
IN_B_DECAL(231), IN_B_DECAL(231),
CHANGESHAPE_TRANSFORM_6(232), CHANGESHAPE_TRANSFORM_6(232),
CHANGESHAPE_TRANSFORM_7(234), CHANGESHAPE_TRANSFORM_7(234),
POWER_BLOCKING(247), FOCUS_SHIELD(247),
FOCUS_SHIELD(248), RAISE_SHIELD(248),
TRUE_VANGUARD(249), TRUE_VANGUARD(249),
SHIELD_WALL(250), SHIELD_WALL(250),
DRAGON_ULTIMATE(700), DRAGON_ULTIMATE(700),