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

Plunder effect improvements.

Browse Source
This commit is contained in:
MobiusDev
2019-03-10 12:01:10 +00:00
parent 21d1e27080
commit 66041edbf0
11 changed files with 275 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Plunder.java vendored
View File

@@ -18,6 +18,8 @@ package handlers.effecthandlers;
import java.util.Collection;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlEvent;
import com.l2jmobius.gameserver.model.L2Party;
import com.l2jmobius.gameserver.model.StatsSet;
@@ -28,7 +30,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.holders.ItemHolder;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.stats.Formulas;
import com.l2jmobius.gameserver.network.SystemMessageId;
/**
@@ -43,7 +44,22 @@ public final class Plunder extends AbstractEffect
@Override
public boolean calcSuccess(L2Character effector, L2Character effected, Skill skill)
{
return Formulas.calcMagicSuccess(effector, effected, skill);
final int lvlDifference = (effected.getLevel() - (skill.getMagicLevel() > 0 ? skill.getMagicLevel() : effector.getLevel()));
final double lvlModifier = Math.pow(1.3, lvlDifference);
float targetModifier = 1;
if (effected.isAttackable() && !effected.isRaid() && !effected.isRaidMinion() && (effected.getLevel() >= Config.MIN_NPC_LVL_MAGIC_PENALTY) && (effector.getActingPlayer() != null) && ((effected.getLevel() - effector.getActingPlayer().getLevel()) >= 3))
{
final int lvlDiff = effected.getLevel() - effector.getActingPlayer().getLevel() - 2;
if (lvlDiff >= Config.NPC_SKILL_CHANCE_PENALTY.size())
{
targetModifier = Config.NPC_SKILL_CHANCE_PENALTY.get(Config.NPC_SKILL_CHANCE_PENALTY.size() - 1);
}
else
{
targetModifier = Config.NPC_SKILL_CHANCE_PENALTY.get(lvlDiff);
}
}
return Rnd.get(100) < (100 - Math.round((float) (lvlModifier * targetModifier)));
}
@Override
@@ -74,7 +90,13 @@ public final class Plunder extends AbstractEffect
return;
}
if (!player.getInventory().checkInventorySlotsAndWeight(monster.getSpoilLootItems(), false, false))
{
return;
}
monster.setSpoilerObjectId(effector.getObjectId());
if (monster.isSweepActive())
{
final Collection<ItemHolder> items = monster.takeSweep();
@@ -89,7 +111,7 @@ public final class Plunder extends AbstractEffect
}
else
{
player.addItem("Sweeper", sweepedItem, effected, true);
player.addItem("Plunder", sweepedItem, effected, true);
}
}
}