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

Addition of SoulType enum.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-01-25 23:08:37 +00:00
parent a8e1ab0ba6
commit 15183e84b6
34 changed files with 510 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java vendored
View File

@@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.SoulType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -32,10 +33,12 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
public class FocusSouls extends AbstractEffect
{
private final int _charge;
private final SoulType _type;
public FocusSouls(StatSet params)
{
_charge = params.getInt("charge", 0);
_type = params.getEnum("type", SoulType.class, SoulType.LIGHT);
}
@Override
@@ -57,10 +60,10 @@ public class FocusSouls extends AbstractEffect
if (maxSouls > 0)
{
final int amount = _charge;
if ((target.getChargedSouls() < maxSouls))
if ((target.getChargedSouls(_type) < maxSouls))
{
final int count = ((target.getChargedSouls() + amount) <= maxSouls) ? amount : (maxSouls - target.getChargedSouls());
target.increaseSouls(count);
final int count = ((target.getChargedSouls(_type) + amount) <= maxSouls) ? amount : (maxSouls - target.getChargedSouls(_type));
target.increaseSouls(count, _type);
}
else
{

22
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java vendored
View File

@@ -66,8 +66,26 @@ public class MagicalSoulAttack extends AbstractEffect
effected.stopFakeDeath(true);
}
final int chargedSouls = Math.min(skill.getMaxSoulConsumeCount(), effector.getActingPlayer().getCharges());
if (!effector.getActingPlayer().decreaseCharges(chargedSouls))
final int chargedLightSouls = Math.min(skill.getMaxLightSoulConsumeCount(), effector.getActingPlayer().getCharges());
if ((chargedLightSouls > 0) && !effector.getActingPlayer().decreaseCharges(chargedLightSouls))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
effector.sendPacket(sm);
return;
}
final int chargedShadowSouls = Math.min(skill.getMaxShadowSoulConsumeCount(), effector.getActingPlayer().getCharges());
if ((chargedShadowSouls > 0) && !effector.getActingPlayer().decreaseCharges(chargedShadowSouls))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
effector.sendPacket(sm);
return;
}
final int chargedSouls = chargedLightSouls + chargedShadowSouls;
if (chargedSouls < 1)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);

24
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@@ -86,8 +86,26 @@ public class PhysicalSoulAttack extends AbstractEffect
effected.stopFakeDeath(true);
}
final int souls = Math.min(skill.getMaxSoulConsumeCount(), effector.getActingPlayer().getCharges());
if (!effector.getActingPlayer().decreaseCharges(souls))
final int chargedLightSouls = Math.min(skill.getMaxLightSoulConsumeCount(), effector.getActingPlayer().getCharges());
if ((chargedLightSouls > 0) && !effector.getActingPlayer().decreaseCharges(chargedLightSouls))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
effector.sendPacket(sm);
return;
}
final int chargedShadowSouls = Math.min(skill.getMaxShadowSoulConsumeCount(), effector.getActingPlayer().getCharges());
if ((chargedShadowSouls > 0) && !effector.getActingPlayer().decreaseCharges(chargedShadowSouls))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
effector.sendPacket(sm);
return;
}
final int chargedSouls = chargedLightSouls + chargedShadowSouls;
if (chargedSouls < 1)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(skill);
@@ -150,7 +168,7 @@ public class PhysicalSoulAttack extends AbstractEffect
ssmod = 4 * effector.getStat().getValue(Stat.SHOTS_BONUS);
}
}
final double soulsMod = 1 + (souls * 0.04); // Souls Formula (each soul increase +4%)
final double soulsMod = 1 + (chargedSouls * 0.04); // Souls Formula (each soul increase +4%)
// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef

19
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java vendored
View File

@@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.enums.SoulType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -83,11 +84,21 @@ public class SoulBlow extends AbstractEffect
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));
final byte shld = Formulas.calcShldUse(effector, effected);
double damage = Formulas.calcBlowDamage(effector, effected, skill, false, _power, shld, ss);
if ((skill.getMaxSoulConsumeCount() > 0) && effector.isPlayer())
if (effector.isPlayer())
{
// Souls Formula (each soul increase +4%)
final int chargedSouls = (effector.getActingPlayer().getChargedSouls() <= skill.getMaxSoulConsumeCount()) ? effector.getActingPlayer().getChargedSouls() : skill.getMaxSoulConsumeCount();
damage *= 1 + (chargedSouls * 0.04);
if (skill.getMaxLightSoulConsumeCount() > 0)
{
// Souls Formula (each soul increase +4%)
final int chargedSouls = (effector.getActingPlayer().getChargedSouls(SoulType.LIGHT) <= skill.getMaxLightSoulConsumeCount()) ? effector.getActingPlayer().getChargedSouls(SoulType.LIGHT) : skill.getMaxLightSoulConsumeCount();
damage *= 1 + (chargedSouls * 0.04);
}
if (skill.getMaxShadowSoulConsumeCount() > 0)
{
// Souls Formula (each soul increase +4%)
final int chargedSouls = (effector.getActingPlayer().getChargedSouls(SoulType.SHADOW) <= skill.getMaxShadowSoulConsumeCount()) ? effector.getActingPlayer().getChargedSouls(SoulType.SHADOW) : skill.getMaxShadowSoulConsumeCount();
damage *= 1 + (chargedSouls * 0.04);
}
}
effector.doAttack(damage, effected, skill, false, false, true, false);

7
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java vendored
View File

@@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.SoulType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -37,11 +38,13 @@ import org.l2jmobius.gameserver.network.serverpackets.ExSpawnEmitter;
*/
public class SoulEating extends AbstractEffect
{
private final SoulType _type;
private final int _expNeeded;
private final int _maxSouls;
public SoulEating(StatSet params)
{
_type = params.getEnum("type", SoulType.class, SoulType.LIGHT);
_expNeeded = params.getInt("expNeeded");
_maxSouls = params.getInt("maxSouls");
}
@@ -77,13 +80,13 @@ public class SoulEating extends AbstractEffect
{
final PlayerInstance player = playable.getActingPlayer();
final int maxSouls = (int) player.getStat().getValue(Stat.MAX_SOULS, 0);
if (player.getChargedSouls() >= maxSouls)
if (player.getChargedSouls(_type) >= maxSouls)
{
playable.sendPacket(SystemMessageId.YOU_CAN_T_ABSORB_MORE_SOULS);
return;
}
player.increaseSouls(1);
player.increaseSouls(1, _type);
if ((player.getTarget() != null) && player.getTarget().isNpc())
{

6
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java vendored
View File

@@ -16,6 +16,7 @@
*/
package handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.enums.SoulType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -28,14 +29,17 @@ import org.l2jmobius.gameserver.model.stats.Stat;
*/
public class OpSoulMaxSkillCondition implements ISkillCondition
{
private final SoulType _type;
public OpSoulMaxSkillCondition(StatSet params)
{
_type = params.getEnum("type", SoulType.class, SoulType.LIGHT);
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
final int maxSouls = (int) caster.getStat().getValue(Stat.MAX_SOULS);
return caster.isPlayable() && (caster.getActingPlayer().getChargedSouls() < maxSouls);
return caster.isPlayable() && (caster.getActingPlayer().getChargedSouls(_type) < maxSouls);
}
}

5
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java vendored
View File

@@ -16,6 +16,7 @@
*/
package handlers.skillconditionhandlers;
import org.l2jmobius.gameserver.enums.SoulType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -27,16 +28,18 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class SoulSavedSkillCondition implements ISkillCondition
{
private final SoulType _type;
private final int _amount;
public SoulSavedSkillCondition(StatSet params)
{
_type = params.getEnum("type", SoulType.class, SoulType.LIGHT);
_amount = params.getInt("amount");
}
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isPlayer() && (caster.getActingPlayer().getChargedSouls() >= _amount);
return caster.isPlayer() && (caster.getActingPlayer().getChargedSouls(_type) >= _amount);
}
}

33
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00300-00399.xml vendored
View File

@@ -3678,19 +3678,40 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpSoulMax" />
<condition name="OpSoulMax" type="LIGHT" />
</conditions>
<effects>
<effect name="FocusSouls">
<type>LIGHT</type>
<charge>2</charge>
</effect>
</effects>
</skill>
<skill id="394" toLevel="1" name="Absorb Shadow Souls">
<!-- TODO: Shadow Souls Implementation -->
<magicLevel>1</magicLevel>
<effectPoint>150</effectPoint>
<hitTime>500</hitTime>
<hpConsume>30</hpConsume>
<magicLevel>
<value level="1">40</value>
<value level="2">49</value>
<value level="3">58</value>
<value level="4">66</value>
<value level="5">72</value>
</magicLevel>
<operateType>A1</operateType>
<reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpSoulMax" type="SHADOW" />
</conditions>
<effects>
<effect name="FocusSouls">
<type>SHADOW</type>
<charge>2</charge>
</effect>
</effects>
</skill>
<skill id="395" toLevel="1" name="Heroic Miracle">
<!-- For 30 sec., P. Def. +5400, M. Def. +4050, Buff-canceling Attack Resistance +80, and Speed +5. Consumes 40 Soulstone(s). -->
@@ -3806,7 +3827,8 @@
<skill id="397" toLevel="2" name="Light Veil">
<!-- Enough Shine Souls have been gathered to be in the Shine Side state. <Acceleration Stage 1>. P. Atk. +130, Atk. Spd. +30, Casting Spd. +40, Speed +10. P./M. Def. +5%. Has a chance to recover MP when attacking. -->
<abnormalLevel>1</abnormalLevel>
<abnormalTime>30</abnormalTime>
<abnormalTime>60</abnormalTime>
<abnormalType>BR_EVENT_BUF1</abnormalType>
<isMagic>4</isMagic>
<magicLevel>
<value level="1">20</value>
@@ -3884,7 +3906,8 @@
<skill id="398" toLevel="2" name="Shadow Veil">
<!-- Enough Shadow Souls have been gathered to be in the Shadow Side state. <Acceleration Stage 2>. P. Atk. +280, Atk. Spd. +80, Casting Spd. +120, Speed +15. Has a chance to activate powerful attack skills. -->
<abnormalLevel>1</abnormalLevel>
<abnormalTime>30</abnormalTime>
<abnormalTime>60</abnormalTime>
<abnormalType>BR_EVENT_BUF1</abnormalType>
<isMagic>4</isMagic>
<magicLevel>
<value level="1">20</value>

66
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/45100-45199.xml vendored
View File

@@ -2235,10 +2235,11 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpSoulMax" />
<condition name="OpSoulMax" type="LIGHT" />
</conditions>
<effects>
<effect name="FocusSouls">
<type>LIGHT</type>
<charge>
<value level="1">70</value>
<value level="2">100</value>
@@ -2260,10 +2261,11 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpSoulMax" />
<condition name="OpSoulMax" type="SHADOW" />
</conditions>
<effects>
<effect name="FocusSouls">
<type>SHADOW</type>
<charge>
<value level="1">70</value>
<value level="2">100</value>
@@ -3595,6 +3597,7 @@
<magicCriticalRate>5</magicCriticalRate>
<effects>
<effect name="SoulEating">
<type>LIGHT</type>
<maxSouls>
<value level="1">100</value>
<value level="2">100</value>
@@ -3629,8 +3632,45 @@
<skill id="45179" toLevel="2" name="Shadow Master">
<!-- Allows to absorb the power of shadows.\n\nCollect 100 Shadow Souls to assume the Shadow Veil.\n\n<Shadow Veil>\nGrants Evolved Wings Lv. 2 that allows to make powerful attacks. -->
<icon>icon.skill_jinkama_black1</icon>
<magicLevel>
<value level="1">20</value>
<value level="2">60</value>
</magicLevel>
<operateType>P</operateType>
<isMagic>4</isMagic>
<magicCriticalRate>5</magicCriticalRate>
<effects>
<effect name="SoulEating">
<type>SHADOW</type>
<maxSouls>
<value level="1">100</value>
<value level="2">100</value>
</maxSouls>
<expNeeded>
<value level="1">294</value>
<value level="2">2160</value>
</expNeeded>
</effect>
<effect name="TriggerSkillByAttack">
<isCritical>true</isCritical>
<skillId>45181</skillId> <!-- Shadow Soul Absorption -->
<skillLevel>1</skillLevel>
<allowWeapons>ALL</allowWeapons>
<attackerType>Creature</attackerType>
<targetType>SELF</targetType>
<minDamage>1</minDamage>
<chance>30</chance>
</effect>
<effect name="TriggerSkillByAttack">
<isCritical>false</isCritical>
<skillId>45181</skillId> <!-- Shadow Soul Absorption -->
<skillLevel>1</skillLevel>
<allowWeapons>ALL</allowWeapons>
<attackerType>Creature</attackerType>
<targetType>SELF</targetType>
<minDamage>1</minDamage>
<chance>15</chance>
</effect>
</effects>
</skill>
<skill id="45180" toLevel="4" name="Light Soul Absorption">
<!-- Activates when attacking. -->
@@ -3643,17 +3683,33 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpSoulMax" />
<condition name="OpSoulMax" type="LIGHT" />
</conditions>
<effects>
<effect name="FocusSouls">
<type>LIGHT</type>
<charge>1</charge>
</effect>
</effects>
</skill>
<skill id="45181" toLevel="4" name="Shadow Soul Absorption">
<!-- Activates when attacking. -->
<isTriggeredSkill>true</isTriggeredSkill>
<magicLevel>20</magicLevel>
<operateType>A1</operateType>
<reuseDelay>10000</reuseDelay>
<magicCriticalRate>-5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpSoulMax" type="SHADOW" />
</conditions>
<effects>
<effect name="FocusSouls">
<type>SHADOW</type>
<charge>1</charge>
</effect>
</effects>
</skill>
<skill id="45182" toLevel="8" name="Soul Thrust">
<!-- M. Def. -$s1. -->

1
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/xsd/skills.xsd vendored
View File

@@ -462,6 +462,7 @@
</xs:element>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="type" type="xs:string" use="optional" />
</xs:complexType>
</xs:element>
</xs:sequence>