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

Improved AttackAttribute and DefenceAttribute logic.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-09 22:44:33 +00:00
parent 9cba6a7a3a
commit 4b27ff44de
76 changed files with 1580 additions and 1744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java vendored
View File

@@ -16,7 +16,9 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.AttributeType;
import java.util.EnumSet;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Mobius
*/
public class AttackAttribute extends AbstractEffect
{
private final AttributeType _attribute;
private final double _amount;
private final Stat _singleStat;
private final Set<Stat> _multipleStats;
public AttackAttribute(StatSet params)
{
_amount = params.getDouble("amount", 0);
_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
final String attributes = params.getString("attribute", "FIRE");
if (attributes.contains(","))
{
_singleStat = null;
_multipleStats = EnumSet.noneOf(Stat.class);
for (String attribute : attributes.split(","))
{
_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
}
}
else
{
_singleStat = Stat.valueOf(attributes + "_POWER");
_multipleStats = null;
}
}
@Override
public void pump(Creature effected, Skill skill)
{
Stat stat = Stat.FIRE_POWER;
switch (_attribute)
if (_singleStat != null)
{
case WATER:
{
stat = Stat.WATER_POWER;
break;
}
case WIND:
{
stat = Stat.WIND_POWER;
break;
}
case EARTH:
{
stat = Stat.EARTH_POWER;
break;
}
case HOLY:
{
stat = Stat.HOLY_POWER;
break;
}
case DARK:
{
stat = Stat.DARK_POWER;
break;
}
effected.getStat().mergeAdd(_singleStat, _amount);
return;
}
for (Stat stat : _multipleStats)
{
effected.getStat().mergeAdd(stat, _amount);
}
effected.getStat().mergeAdd(stat, _amount);
}
}

5
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java vendored
View File

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
switch (maxAttribute)
{
case FIRE:
{
stat = Stat.FIRE_POWER;
break;
}
case WATER:
{
stat = Stat.WATER_POWER;

62
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java vendored
View File

@@ -16,7 +16,9 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.AttributeType;
import java.util.EnumSet;
import java.util.Set;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
* @author Mobius
*/
public class DefenceAttribute extends AbstractEffect
{
private final AttributeType _attribute;
private final double _amount;
private final Stat _singleStat;
private final Set<Stat> _multipleStats;
public DefenceAttribute(StatSet params)
{
_amount = params.getDouble("amount", 0);
_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
final String attributes = params.getString("attribute", "FIRE");
if (attributes.contains(","))
{
_singleStat = null;
_multipleStats = EnumSet.noneOf(Stat.class);
for (String attribute : attributes.split(","))
{
_multipleStats.add(Stat.valueOf(attribute + "_RES"));
}
}
else
{
_singleStat = Stat.valueOf(attributes + "_RES");
_multipleStats = null;
}
}
@Override
public void pump(Creature effected, Skill skill)
{
Stat stat = Stat.FIRE_RES;
switch (_attribute)
if (_singleStat != null)
{
case WATER:
{
stat = Stat.WATER_RES;
break;
}
case WIND:
{
stat = Stat.WIND_RES;
break;
}
case EARTH:
{
stat = Stat.EARTH_RES;
break;
}
case HOLY:
{
stat = Stat.HOLY_RES;
break;
}
case DARK:
{
stat = Stat.DARK_RES;
break;
}
effected.getStat().mergeAdd(_singleStat, _amount);
return;
}
for (Stat stat : _multipleStats)
{
effected.getStat().mergeAdd(stat, _amount);
}
effected.getStat().mergeAdd(stat, _amount);
}
}