Proper syntax for several methods and values.

This commit is contained in:
MobiusDevelopment
2020-01-26 14:05:47 +00:00
parent 8e7ecd2ac0
commit 9d155febb7
6555 changed files with 39425 additions and 39342 deletions

View File

@@ -117,7 +117,7 @@ public class DenOfEvil extends AbstractNpcAI
public String onSpawn(Npc npc)
{
npc.disableCoreAI(true);
npc.setIsImmobilized(true);
npc.setImmobilized(true);
final EffectZone zone = ZoneManager.getInstance().getZone(npc, EffectZone.class);
if (zone == null)
{

View File

@@ -311,7 +311,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader
{
npc.stopSkillEffects(PETRIFY.getSkill());
npc.setTargetable(true);
npc.setIsInvul(false);
npc.setInvul(false);
return null;
}
case "WAVE_DEFEATED_CHECK":
@@ -402,7 +402,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader
npc.doCast(PETRIFY.getSkill());
((Attackable) npc).setCanReturnToSpawnPoint(false);
npc.setTargetable(false);
npc.setIsInvul(true);
npc.setInvul(true);
cancelQuestTimer("REMOVE_PETRIFY", npc, null);
startQuestTimer("REMOVE_PETRIFY", 5 * 60 * 1000, npc, null, false); // 5 minutes
}

View File

@@ -280,7 +280,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
@Override
public String onSpawn(Npc npc)
{
npc.setIsInvul(true);
npc.setInvul(true);
npc.disableCoreAI(true);
cancelQuestTimer("TRAINING", npc, null);
startQuestTimer("TRAINING", 30000, npc, null, true);

View File

@@ -224,7 +224,7 @@ public class Core extends AbstractNpcAI
{
if (npc.getId() == CORE)
{
npc.setIsImmobilized(true);
npc.setImmobilized(true);
}
return super.onSpawn(npc);
}

View File

@@ -227,8 +227,8 @@ public class LastImperialTomb extends AbstractInstance
broadCastPacket(world, new SpecialCamera(overheadDummy, 300, 90, -10, 6500, 7000, 0, 0, 1, 0, 0));
final Npc frintezza = addSpawn(FRINTEZZA, -87780, -155086, -9080, 16384, false, 0, false, world.getId());
frintezza.setIsImmobilized(true);
frintezza.setIsInvul(true);
frintezza.setImmobilized(true);
frintezza.setInvul(true);
frintezza.disableAllSkills();
world.setParameter("frintezza", frintezza);
@@ -236,7 +236,7 @@ public class LastImperialTomb extends AbstractInstance
for (int[] element : PORTRAIT_SPAWNS)
{
final MonsterInstance demon = (MonsterInstance) addSpawn(element[0] + 2, element[5], element[6], element[7], element[8], false, 0, false, world.getId());
demon.setIsImmobilized(true);
demon.setImmobilized(true);
demon.disableAllSkills();
demons.add(demon);
}
@@ -376,8 +376,8 @@ public class LastImperialTomb extends AbstractInstance
final Npc activeScarlet = addSpawn(SCARLET1, -87789, -153295, -9176, 16384, false, 0, false, world.getId());
world.setParameter("activeScarlet", activeScarlet);
activeScarlet.setRHandId(FIRST_SCARLET_WEAPON);
activeScarlet.setIsInvul(true);
activeScarlet.setIsImmobilized(true);
activeScarlet.setInvul(true);
activeScarlet.setImmobilized(true);
activeScarlet.disableAllSkills();
broadCastPacket(world, new SocialAction(activeScarlet.getObjectId(), 3));
broadCastPacket(world, new SpecialCamera(scarletDummy, 800, 180, 10, 1000, 10000, 0, 0, 1, 0, 0));
@@ -427,17 +427,17 @@ public class LastImperialTomb extends AbstractInstance
final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
for (Npc demon : demons)
{
demon.setIsImmobilized(false);
demon.setImmobilized(false);
demon.enableAllSkills();
}
activeScarlet.setIsInvul(false);
activeScarlet.setIsImmobilized(false);
activeScarlet.setInvul(false);
activeScarlet.setImmobilized(false);
activeScarlet.enableAllSkills();
activeScarlet.setRunning();
activeScarlet.doCast(INTRO_SKILL.getSkill());
frintezza.enableAllSkills();
frintezza.disableCoreAI(true);
frintezza.setIsInvul(true);
frintezza.setInvul(true);
enablePlayers(world);
startQuestTimer("PLAY_RANDOM_SONG", RANDOM_SONG_INTERVAL * 1000, frintezza, null, false);
startQuestTimer("SPAWN_DEMONS", TIME_BETWEEN_DEMON_SPAWNS * 1000, null, player, false);
@@ -488,8 +488,8 @@ public class LastImperialTomb extends AbstractInstance
final Npc activeScarlet = world.getParameters().getObject("activeScarlet", Npc.class);
activeScarlet.abortAttack();
activeScarlet.abortCast();
activeScarlet.setIsInvul(true);
activeScarlet.setIsImmobilized(true);
activeScarlet.setInvul(true);
activeScarlet.setImmobilized(true);
activeScarlet.disableAllSkills();
playRandomSong(world);
startQuestTimer("SCARLET_SECOND_MORPH_CAMERA_1", 2000, npc, null, false);
@@ -570,8 +570,8 @@ public class LastImperialTomb extends AbstractInstance
final Npc activeScarlet = addSpawn(SCARLET2, scarletLocation, false, 0, false, world.getId());
world.setParameter("activeScarlet", activeScarlet);
activeScarlet.setRHandId(SECOND_SCARLET_WEAPON);
activeScarlet.setIsInvul(true);
activeScarlet.setIsImmobilized(true);
activeScarlet.setInvul(true);
activeScarlet.setImmobilized(true);
activeScarlet.disableAllSkills();
broadCastPacket(world, new SpecialCamera(activeScarlet, 450, newHeading, 12, 500, 14000, 0, 0, 1, 0, 0));
startQuestTimer("SCARLET_SECOND_MORPH_CAMERA_8", 8100, npc, null, false);
@@ -589,8 +589,8 @@ public class LastImperialTomb extends AbstractInstance
{
final Instance world = npc.getInstanceWorld();
final Npc activeScarlet = world.getParameters().getObject("activeScarlet", Npc.class);
activeScarlet.setIsInvul(false);
activeScarlet.setIsImmobilized(false);
activeScarlet.setInvul(false);
activeScarlet.setImmobilized(false);
activeScarlet.enableAllSkills();
enablePlayers(world);
break;
@@ -678,14 +678,14 @@ public class LastImperialTomb extends AbstractInstance
public String onSpawn(Npc npc)
{
npc.setRandomWalking(false);
npc.setIsImmobilized(true);
npc.setImmobilized(true);
if (npc.getId() == HALL_ALARM)
{
npc.disableCoreAI(true);
}
else // dummy
{
npc.setIsInvul(true);
npc.setInvul(true);
}
return super.onSpawn(npc);
}
@@ -854,7 +854,7 @@ public class LastImperialTomb extends AbstractInstance
player.disableAllSkills();
player.setTarget(null);
player.stopMove(null);
player.setIsImmobilized(true);
player.setImmobilized(true);
player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
@@ -867,7 +867,7 @@ public class LastImperialTomb extends AbstractInstance
if ((player != null) && player.isOnline())
{
player.enableAllSkills();
player.setIsImmobilized(false);
player.setImmobilized(false);
}
}
}

View File

@@ -191,7 +191,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
if ((target == null) || target.isDead())
{
// npc.setIsCastingNow(false);
// npc.setCastingNow(false);
return;
}
@@ -199,7 +199,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
{
npc.getAI().setIntention(AI_INTENTION_IDLE);
npc.setTarget(target);
// npc.setIsCastingNow(true);
// npc.setCastingNow(true);
_target = null;
npc.doCast(skill);
}
@@ -207,7 +207,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
{
npc.getAI().setIntention(AI_INTENTION_FOLLOW, target, null);
npc.getAI().setIntention(AI_INTENTION_ATTACK, target, null);
// npc.setIsCastingNow(false);
// npc.setCastingNow(false);
}
}

View File

@@ -250,7 +250,7 @@ public class QueenAnt extends AbstractNpcAI
{
case LARVA:
{
mob.setIsImmobilized(true);
mob.setImmobilized(true);
mob.setUndying(true);
mob.setIsRaidMinion(true);
break;

View File

@@ -149,8 +149,8 @@ public class Sailren extends AbstractNpcAI
{
final RaidBossInstance sailren = (RaidBossInstance) addSpawn(SAILREN, 27549, -6638, -2008, 0, false, 0);
final Npc movieNpc = addSpawn(MOVIE_NPC, sailren.getX(), sailren.getY(), sailren.getZ() + 30, 0, false, 26000);
sailren.setIsInvul(true);
sailren.setIsImmobilized(true);
sailren.setInvul(true);
sailren.setImmobilized(true);
zone.broadcastPacket(new SpecialCamera(movieNpc, 60, 110, 30, 4000, 1500, 20000, 0, 65, 1, 0, 0));
startQuestTimer("ATTACK", 24600, sailren, null);
@@ -205,8 +205,8 @@ public class Sailren extends AbstractNpcAI
}
case "ATTACK":
{
npc.setIsInvul(false);
npc.setIsImmobilized(false);
npc.setInvul(false);
npc.setImmobilized(false);
break;
}
case "CLEAR_STATUS":

View File

@@ -143,7 +143,7 @@ public class Valakas extends AbstractNpcAI
GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
GrandBossManager.getInstance().addBoss((GrandBossInstance) valakas);
valakas.setIsInvul(true);
valakas.setInvul(true);
valakas.setRunning();
valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
@@ -176,7 +176,7 @@ public class Valakas extends AbstractNpcAI
else
{
valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
valakas.setIsInvul(true);
valakas.setInvul(true);
valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
// Start timer to lock entry after 30 minutes
@@ -314,7 +314,7 @@ public class Valakas extends AbstractNpcAI
else if (event.equalsIgnoreCase("spawn_10"))
{
GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
npc.setIsInvul(false);
npc.setInvul(false);
startQuestTimer("regen_task", 60000, npc, null, true);
startQuestTimer("skill_task", 2000, npc, null, true);
@@ -368,7 +368,7 @@ public class Valakas extends AbstractNpcAI
{
final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
valakas.setIsInvul(true);
valakas.setInvul(true);
valakas.setRunning();
valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
GrandBossManager.getInstance().addBoss((GrandBossInstance) valakas);

View File

@@ -76,7 +76,7 @@ public class FairyTrees extends AbstractNpcAI
public String onSpawn(Npc npc)
{
npc.setRandomWalking(false);
npc.setIsImmobilized(true);
npc.setImmobilized(true);
return super.onSpawn(npc);
}

View File

@@ -39,7 +39,7 @@ public class Scarecrow extends AbstractNpcAI
public String onSpawn(Npc npc)
{
npc.disableCoreAI(true);
npc.setIsImmobilized(true);
npc.setImmobilized(true);
return super.onSpawn(npc);
}

View File

@@ -143,7 +143,7 @@ public class SiegeGuards extends AbstractNpcAI
npc.setRandomWalking(false);
if ((npc.getTemplate().getBaseAttackType() != WeaponType.SWORD) && (npc.getTemplate().getBaseAttackType() != WeaponType.POLE))
{
npc.setIsImmobilized(true);
npc.setImmobilized(true);
}
final Castle castle = npc.getCastle();
final Fort fortress = npc.getFort();

View File

@@ -256,7 +256,7 @@ public class Rabbits extends Event
final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay);
if (npc.getId() == CHEST)
{
npc.setIsImmobilized(true);
npc.setImmobilized(true);
npc.disableCoreAI(true);
npc.setInvisible(true);
}

View File

@@ -363,13 +363,13 @@ public class TvT extends Event
// Disable players.
for (PlayerInstance participant : PLAYER_LIST)
{
participant.setIsInvul(true);
participant.setIsImmobilized(true);
participant.setInvul(true);
participant.setImmobilized(true);
participant.disableAllSkills();
for (Summon summon : participant.getServitors().values())
{
summon.setIsInvul(true);
summon.setIsImmobilized(true);
summon.setInvul(true);
summon.setImmobilized(true);
summon.disableAllSkills();
}
}
@@ -448,13 +448,13 @@ public class TvT extends Event
// Enable players.
for (PlayerInstance participant : PLAYER_LIST)
{
participant.setIsInvul(false);
participant.setIsImmobilized(false);
participant.setInvul(false);
participant.setImmobilized(false);
participant.enableAllSkills();
for (Summon summon : participant.getServitors().values())
{
summon.setIsInvul(true);
summon.setIsImmobilized(true);
summon.setInvul(true);
summon.setImmobilized(true);
summon.disableAllSkills();
}
}

View File

@@ -504,11 +504,11 @@ public class MerrySquashmas extends LongTimeEvent
@Override
public String onSpawn(Npc npc)
{
npc.setIsImmobilized(true);
npc.setImmobilized(true);
npc.disableCoreAI(true);
if (LARGE_SQUASH_LIST.contains(npc.getId()))
{
npc.setIsInvul(true);
npc.setInvul(true);
}
return null;
}
@@ -521,13 +521,13 @@ public class MerrySquashmas extends LongTimeEvent
if ((attacker.getActiveWeaponItem() != null) && CHRONO_LIST.contains(attacker.getActiveWeaponItem().getId()))
{
ChronoText(npc);
npc.setIsInvul(false);
npc.setInvul(false);
npc.getStatus().reduceHp(10, attacker);
}
else
{
noChronoText(npc);
npc.setIsInvul(true);
npc.setInvul(true);
}
}

View File

@@ -503,11 +503,11 @@ public class SquashEvent extends LongTimeEvent
@Override
public String onSpawn(Npc npc)
{
npc.setIsImmobilized(true);
npc.setImmobilized(true);
npc.disableCoreAI(true);
if (LARGE_SQUASH_LIST.contains(npc.getId()))
{
npc.setIsInvul(true);
npc.setInvul(true);
}
return null;
}
@@ -520,13 +520,13 @@ public class SquashEvent extends LongTimeEvent
if ((attacker.getActiveWeaponItem() != null) && CHRONO_LIST.contains(attacker.getActiveWeaponItem().getId()))
{
ChronoText(npc);
npc.setIsInvul(false);
npc.setInvul(false);
npc.getStatus().reduceHp(10, attacker);
}
else
{
noChronoText(npc);
npc.setIsInvul(true);
npc.setInvul(true);
}
}

View File

@@ -501,11 +501,11 @@ public class WatermelonNinja extends LongTimeEvent
@Override
public String onSpawn(Npc npc)
{
npc.setIsImmobilized(true);
npc.setImmobilized(true);
npc.disableCoreAI(true);
if (LARGE_SQUASH_LIST.contains(npc.getId()))
{
npc.setIsInvul(true);
npc.setInvul(true);
}
return null;
}
@@ -518,13 +518,13 @@ public class WatermelonNinja extends LongTimeEvent
if ((attacker.getActiveWeaponItem() != null) && CHRONO_LIST.contains(attacker.getActiveWeaponItem().getId()))
{
ChronoText(npc);
npc.setIsInvul(false);
npc.setInvul(false);
npc.getStatus().reduceHp(10, attacker);
}
else
{
noChronoText(npc);
npc.setIsInvul(true);
npc.setInvul(true);
}
}

View File

@@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.html.PageBuilder;
import org.l2jmobius.gameserver.model.html.PageResult;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
@@ -972,8 +972,8 @@ public class AdminEditChar implements IAdminCommandHandler
try
{
Stats stat = null;
for (Stats stats : Stats.values())
Stat stat = null;
for (Stat stats : Stat.values())
{
if (statName.equalsIgnoreCase(stats.name()) || statName.equalsIgnoreCase(stats.getValue()))
{
@@ -1023,8 +1023,8 @@ public class AdminEditChar implements IAdminCommandHandler
}
final String statName = st.nextToken();
Stats stat = null;
for (Stats stats : Stats.values())
Stat stat = null;
for (Stat stats : Stat.values())
{
if (statName.equalsIgnoreCase(stats.name()) || statName.equalsIgnoreCase(stats.getValue()))
{

View File

@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -294,10 +294,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
final int tdmg2 = (int) (sAtk2 * dmg2);
// HP restored per 100 seconds
final double maxHp1 = npc1.getMaxHp();
final int hp1 = (int) ((npc1.getStat().getValue(Stats.REGENERATE_HP_RATE) * 100000) / Formulas.getRegeneratePeriod(npc1));
final int hp1 = (int) ((npc1.getStat().getValue(Stat.REGENERATE_HP_RATE) * 100000) / Formulas.getRegeneratePeriod(npc1));
final double maxHp2 = npc2.getMaxHp();
final int hp2 = (int) ((npc2.getStat().getValue(Stats.REGENERATE_HP_RATE) * 100000) / Formulas.getRegeneratePeriod(npc2));
final int hp2 = (int) ((npc2.getStat().getValue(Stat.REGENERATE_HP_RATE) * 100000) / Formulas.getRegeneratePeriod(npc2));
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);

View File

@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.util.BuilderUtil;
import org.l2jmobius.gameserver.util.Util;
@@ -41,7 +41,7 @@ public class AdminGmSpeed implements IAdminCommandHandler
"admin_gmspeed",
};
private static final Set<Stats> SPEED_STATS = EnumSet.of(Stats.RUN_SPEED, Stats.WALK_SPEED, Stats.SWIM_RUN_SPEED, Stats.SWIM_WALK_SPEED, Stats.FLY_RUN_SPEED, Stats.FLY_WALK_SPEED);
private static final Set<Stat> SPEED_STATS = EnumSet.of(Stat.RUN_SPEED, Stat.WALK_SPEED, Stat.SWIM_RUN_SPEED, Stat.SWIM_WALK_SPEED, Stat.FLY_RUN_SPEED, Stat.FLY_WALK_SPEED);
@Override
public boolean useAdminCommand(String command, PlayerInstance player)

View File

@@ -81,12 +81,12 @@ public class AdminInvul implements IAdminCommandHandler
String text;
if (activeChar.isInvul())
{
activeChar.setIsInvul(false);
activeChar.setInvul(false);
text = activeChar.getName() + " is now mortal.";
}
else
{
activeChar.setIsInvul(true);
activeChar.setInvul(true);
text = activeChar.getName() + " is now invulnerable.";
}
BuilderUtil.sendSysMessage(activeChar, text);

View File

@@ -143,14 +143,14 @@ public class AdminKill implements IAdminCommandHandler
if (target.isInvul())
{
targetIsInvul = true;
target.setIsInvul(false);
target.setInvul(false);
}
target.reduceCurrentHp(target.getMaxHp() + 1, activeChar, null);
if (targetIsInvul)
{
target.setIsInvul(true);
target.setInvul(true);
}
}
}

View File

@@ -261,7 +261,7 @@ public class AdminQuest implements IAdminCommandHandler
{
for (QuestTimer timer : list)
{
timers += "<tr><td colspan=\"4\"><table width=270 border=0 bgcolor=131210><tr><td width=270><font color=\"LEVEL\">" + timer.getName() + ":</font> <font color=00FF00>Active: " + timer.getIsActive() + " Repeatable: " + timer.getIsRepeating() + " Player: " + timer.getPlayer() + " Npc: " + timer.getNpc() + "</font></td></tr></table></td></tr>";
timers += "<tr><td colspan=\"4\"><table width=270 border=0 bgcolor=131210><tr><td width=270><font color=\"LEVEL\">" + timer.getName() + ":</font> <font color=00FF00>Active: " + timer.isActive() + " Repeatable: " + timer.isRepeating() + " Player: " + timer.getPlayer() + " Npc: " + timer.getNpc() + "</font></td></tr></table></td></tr>";
counter++;
if (counter > 10)
{

View File

@@ -499,9 +499,9 @@ public class AdminSkill implements IAdminCommandHandler
/**
* @param activeChar the active Game Master.
* @param val
* @param value
*/
private void adminAddSkill(PlayerInstance activeChar, String val)
private void adminAddSkill(PlayerInstance activeChar, String value)
{
final WorldObject target = activeChar.getTarget();
if ((target == null) || !target.isPlayer())
@@ -511,7 +511,7 @@ public class AdminSkill implements IAdminCommandHandler
return;
}
final PlayerInstance player = target.getActingPlayer();
final StringTokenizer st = new StringTokenizer(val);
final StringTokenizer st = new StringTokenizer(value);
if ((st.countTokens() != 1) && (st.countTokens() != 2))
{
showMainPage(activeChar);

View File

@@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.DropHolder;
import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.HtmlUtil;
import org.l2jmobius.gameserver.util.Util;
@@ -398,9 +398,9 @@ public class NpcViewMod implements IBypassHandler
int leftHeight = 0;
int rightHeight = 0;
final double dropAmountEffectBonus = player.getStat().getValue(Stats.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stats.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stats.BONUS_SPOIL_RATE, 1);
final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1);
final StringBuilder leftSb = new StringBuilder();
final StringBuilder rightSb = new StringBuilder();
String limitReachedMsg = "";

View File

@@ -68,12 +68,12 @@ public class Wear implements IBypassHandler
return false;
}
private void showWearWindow(PlayerInstance player, int val)
private void showWearWindow(PlayerInstance player, int value)
{
final ProductList buyList = BuyListData.getInstance().getBuyList(val);
final ProductList buyList = BuyListData.getInstance().getBuyList(value);
if (buyList == null)
{
LOGGER.warning("BuyList not found! BuyListId:" + val);
LOGGER.warning("BuyList not found! BuyListId:" + value);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

View File

@@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.model.holders.DropHolder;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author yksdtc
@@ -169,9 +169,9 @@ public class DropSearchBoard implements IParseBoardHandler
final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder();
final double dropAmountEffectBonus = player.getStat().getValue(Stats.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stats.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stats.BONUS_SPOIL_RATE, 1);
final double dropAmountEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
final double dropRateEffectBonus = player.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
final double spoilRateEffectBonus = player.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1);
for (int index = start; index <= end; index++)
{
final CBDropHolder cbDropHolder = list.get(index);

View File

@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange;
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
@@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
private final int _hpPercent;
private final Map<Creature, AtomicBoolean> _updates = new ConcurrentHashMap<>();
protected AbstractConditionalHpEffect(StatsSet params, Stats stat)
protected AbstractConditionalHpEffect(StatsSet params, Stat stat)
{
super(params, stat);
_hpPercent = params.getInt("hpPercent", 0);

View File

@@ -21,17 +21,17 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
*/
public class AbstractStatAddEffect extends AbstractEffect
{
private final Stats _stat;
private final Stat _stat;
protected final double _amount;
public AbstractStatAddEffect(StatsSet params, Stats stat)
public AbstractStatAddEffect(StatsSet params, Stat stat)
{
_stat = stat;
_amount = params.getDouble("amount", 0);

View File

@@ -29,25 +29,25 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.type.ArmorType;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
*/
public abstract class AbstractStatEffect extends AbstractEffect
{
protected final Stats _addStat;
protected final Stats _mulStat;
protected final Stat _addStat;
protected final Stat _mulStat;
protected final double _amount;
protected final StatModifierType _mode;
protected final List<Condition> _conditions = new ArrayList<>();
public AbstractStatEffect(StatsSet params, Stats stat)
public AbstractStatEffect(StatsSet params, Stat stat)
{
this(params, stat, stat);
}
public AbstractStatEffect(StatsSet params, Stats mulStat, Stats addStat)
public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat)
{
_addStat = addStat;
_mulStat = mulStat;

View File

@@ -21,17 +21,17 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
*/
public class AbstractStatPercentEffect extends AbstractEffect
{
private final Stats _stat;
private final Stat _stat;
protected final double _amount;
public AbstractStatPercentEffect(StatsSet params, Stats stat)
public AbstractStatPercentEffect(StatsSet params, Stat stat)
{
_stat = stat;
_amount = params.getDouble("amount", 1);

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class Accuracy extends AbstractStatEffect
{
public Accuracy(StatsSet params)
{
super(params, Stats.ACCURACY_COMBAT);
super(params, Stat.ACCURACY_COMBAT);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
@@ -26,6 +26,6 @@ public class AdditionalPotionCp extends AbstractStatAddEffect
{
public AdditionalPotionCp(StatsSet params)
{
super(params, Stats.ADDITIONAL_POTION_CP);
super(params, Stat.ADDITIONAL_POTION_CP);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
@@ -26,6 +26,6 @@ public class AdditionalPotionHp extends AbstractStatAddEffect
{
public AdditionalPotionHp(StatsSet params)
{
super(params, Stats.ADDITIONAL_POTION_HP);
super(params, Stat.ADDITIONAL_POTION_HP);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
@@ -26,6 +26,6 @@ public class AdditionalPotionMp extends AbstractStatAddEffect
{
public AdditionalPotionMp(StatsSet params)
{
super(params, Stats.ADDITIONAL_POTION_MP);
super(params, Stat.ADDITIONAL_POTION_MP);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class AreaDamage extends AbstractStatAddEffect
{
public AreaDamage(StatsSet params)
{
super(params, Stats.DAMAGE_ZONE_VULN);
super(params, Stat.DAMAGE_ZONE_VULN);
}
}

View File

@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -40,33 +40,33 @@ public class AttackAttribute extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
Stats stat = Stats.FIRE_POWER;
Stat stat = Stat.FIRE_POWER;
switch (_attribute)
{
case WATER:
{
stat = Stats.WATER_POWER;
stat = Stat.WATER_POWER;
break;
}
case WIND:
{
stat = Stats.WIND_POWER;
stat = Stat.WIND_POWER;
break;
}
case EARTH:
{
stat = Stats.EARTH_POWER;
stat = Stat.EARTH_POWER;
break;
}
case HOLY:
{
stat = Stats.HOLY_POWER;
stat = Stat.HOLY_POWER;
break;
}
case DARK:
{
stat = Stats.DARK_POWER;
stat = Stat.DARK_POWER;
break;
}
}

View File

@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -38,7 +38,7 @@ public class AttackAttributeAdd extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
Stats stat = Stats.FIRE_POWER;
Stat stat = Stat.FIRE_POWER;
AttributeType maxAttribute = AttributeType.FIRE;
int maxValue = 0;
@@ -56,27 +56,27 @@ public class AttackAttributeAdd extends AbstractEffect
{
case WATER:
{
stat = Stats.WATER_POWER;
stat = Stat.WATER_POWER;
break;
}
case WIND:
{
stat = Stats.WIND_POWER;
stat = Stat.WIND_POWER;
break;
}
case EARTH:
{
stat = Stats.EARTH_POWER;
stat = Stat.EARTH_POWER;
break;
}
case HOLY:
{
stat = Stats.HOLY_POWER;
stat = Stat.HOLY_POWER;
break;
}
case DARK:
{
stat = Stats.DARK_POWER;
stat = Stat.DARK_POWER;
break;
}
}

View File

@@ -35,12 +35,12 @@ public class BlockMove extends AbstractEffect
@Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
effected.setIsImmobilized(true);
effected.setImmobilized(true);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.setIsImmobilized(false);
effected.setImmobilized(false);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
@@ -26,6 +26,6 @@ public class BonusDropAmount extends AbstractStatPercentEffect
{
public BonusDropAmount(StatsSet params)
{
super(params, Stats.BONUS_DROP_AMOUNT);
super(params, Stat.BONUS_DROP_AMOUNT);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
@@ -26,6 +26,6 @@ public class BonusDropRate extends AbstractStatPercentEffect
{
public BonusDropRate(StatsSet params)
{
super(params, Stats.BONUS_DROP_RATE);
super(params, Stat.BONUS_DROP_RATE);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
@@ -26,6 +26,6 @@ public class BonusSpoilRate extends AbstractStatPercentEffect
{
public BonusSpoilRate(StatsSet params)
{
super(params, Stats.BONUS_SPOIL_RATE);
super(params, Stat.BONUS_SPOIL_RATE);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class Breath extends AbstractStatEffect
{
public Breath(StatsSet params)
{
super(params, Stats.BREATH);
super(params, Stat.BREATH);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class CounterPhysicalSkill extends AbstractStatAddEffect
{
public CounterPhysicalSkill(StatsSet params)
{
super(params, Stats.VENGEANCE_SKILL_PHYSICAL_DAMAGE);
super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE);
}
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -58,7 +58,7 @@ public class Cp extends AbstractEffect
int basicAmount = _amount;
if ((item != null) && (item.isPotion() || item.isElixir()))
{
basicAmount += effected.getStat().getValue(Stats.ADDITIONAL_POTION_CP, 0);
basicAmount += effected.getStat().getValue(Stat.ADDITIONAL_POTION_CP, 0);
}
double amount = 0;

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectType;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -62,7 +62,7 @@ public class CpHeal extends AbstractEffect
double amount = _power;
if ((item != null) && (item.isPotion() || item.isElixir()))
{
amount += effected.getStat().getValue(Stats.ADDITIONAL_POTION_CP, 0);
amount += effected.getStat().getValue(Stat.ADDITIONAL_POTION_CP, 0);
}
// Prevents overheal and negative amount

View File

@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* Cp Heal Over Time effect implementation.
@@ -56,7 +56,7 @@ public class CpHealOverTime extends AbstractEffect
double power = _power;
if ((item != null) && (item.isPotion() || item.isElixir()))
{
power += effected.getStat().getValue(Stats.ADDITIONAL_POTION_CP, 0) / getTicks();
power += effected.getStat().getValue(Stat.ADDITIONAL_POTION_CP, 0) / getTicks();
}
cp += power * getTicksMultiplier();

View File

@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -59,7 +59,7 @@ public class CpHealPercent extends AbstractEffect
amount = full ? effected.getMaxCp() : (effected.getMaxCp() * power) / 100.0;
if ((item != null) && (item.isPotion() || item.isElixir()))
{
amount += effected.getStat().getValue(Stats.ADDITIONAL_POTION_CP, 0);
amount += effected.getStat().getValue(Stat.ADDITIONAL_POTION_CP, 0);
}
// Prevents overheal and negative amount

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class CpRegen extends AbstractStatEffect
{
public CpRegen(StatsSet params)
{
super(params, Stats.REGENERATE_CP_RATE);
super(params, Stat.REGENERATE_CP_RATE);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class CriticalDamage extends AbstractStatEffect
{
public CriticalDamage(StatsSet params)
{
super(params, Stats.CRITICAL_DAMAGE, Stats.CRITICAL_DAMAGE_ADD);
super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD);
}
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.util.MathUtil;
/**
@@ -42,12 +42,12 @@ public class CriticalDamagePosition extends AbstractEffect
@Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul);
effected.getStat().mergePositionTypeValue(Stat.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::div);
effected.getStat().mergePositionTypeValue(Stat.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::div);
}
}

View File

@@ -19,7 +19,7 @@ package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -29,7 +29,7 @@ public class CriticalRate extends AbstractConditionalHpEffect
public CriticalRate(StatsSet params)
{
super(params, Stats.CRITICAL_RATE);
super(params, Stat.CRITICAL_RATE);
}
@Override

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.util.MathUtil;
/**
@@ -42,12 +42,12 @@ public class CriticalRatePositionBonus extends AbstractEffect
@Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul);
effected.getStat().mergePositionTypeValue(Stat.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::div);
effected.getStat().mergePositionTypeValue(Stat.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::div);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class CubicMastery extends AbstractStatAddEffect
{
public CubicMastery(StatsSet params)
{
super(params, Stats.MAX_CUBIC);
super(params, Stat.MAX_CUBIC);
}
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* An effect that changes damage taken from an attack.<br>
@@ -55,12 +55,12 @@ public class DamageByAttack extends AbstractEffect
{
case PK:
{
target.getStat().mergeAdd(Stats.PVP_DAMAGE_TAKEN, _value);
target.getStat().mergeAdd(Stat.PVP_DAMAGE_TAKEN, _value);
break;
}
case ENEMY_ALL:
{
target.getStat().mergeAdd(Stats.PVE_DAMAGE_TAKEN, _value);
target.getStat().mergeAdd(Stat.PVE_DAMAGE_TAKEN, _value);
break;
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class DamageShield extends AbstractStatAddEffect
{
public DamageShield(StatsSet params)
{
super(params, Stats.REFLECT_DAMAGE_PERCENT);
super(params, Stat.REFLECT_DAMAGE_PERCENT);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class DamageShieldResist extends AbstractStatAddEffect
{
public DamageShieldResist(StatsSet params)
{
super(params, Stats.REFLECT_DAMAGE_PERCENT_DEFENSE);
super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE);
}
}

View File

@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -40,33 +40,33 @@ public class DefenceAttribute extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
Stats stat = Stats.FIRE_RES;
Stat stat = Stat.FIRE_RES;
switch (_attribute)
{
case WATER:
{
stat = Stats.WATER_RES;
stat = Stat.WATER_RES;
break;
}
case WIND:
{
stat = Stats.WIND_RES;
stat = Stat.WIND_RES;
break;
}
case EARTH:
{
stat = Stats.EARTH_RES;
stat = Stat.EARTH_RES;
break;
}
case HOLY:
{
stat = Stats.HOLY_RES;
stat = Stat.HOLY_RES;
break;
}
case DARK:
{
stat = Stats.DARK_RES;
stat = Stat.DARK_RES;
break;
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class DefenceCriticalDamage extends AbstractStatEffect
{
public DefenceCriticalDamage(StatsSet params)
{
super(params, Stats.DEFENCE_CRITICAL_DAMAGE, Stats.DEFENCE_CRITICAL_DAMAGE_ADD);
super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class DefenceCriticalRate extends AbstractStatEffect
{
public DefenceCriticalRate(StatsSet params)
{
super(params, Stats.DEFENCE_CRITICAL_RATE, Stats.DEFENCE_CRITICAL_RATE_ADD);
super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class DefenceMagicCriticalDamage extends AbstractStatEffect
{
public DefenceMagicCriticalDamage(StatsSet params)
{
super(params, Stats.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stats.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD);
super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class DefenceMagicCriticalRate extends AbstractStatEffect
{
public DefenceMagicCriticalRate(StatsSet params)
{
super(params, Stats.DEFENCE_MAGIC_CRITICAL_RATE, Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD);
super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD);
}
}

View File

@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -137,22 +137,22 @@ public class EnergyAttack extends AbstractEffect
{
if (attacker.isChargedShot(ShotType.SOULSHOTS))
{
ssmod = 2 * attacker.getStat().getValue(Stats.SHOTS_BONUS); // 2.04 for dual weapon?
ssmod = 2 * attacker.getStat().getValue(Stat.SHOTS_BONUS); // 2.04 for dual weapon?
}
else if (attacker.isChargedShot(ShotType.BLESSED_SOULSHOTS))
{
ssmod = 4 * attacker.getStat().getValue(Stats.SHOTS_BONUS);
ssmod = 4 * attacker.getStat().getValue(Stat.SHOTS_BONUS);
}
}
// ...................________Initial Damage_________...__Charges Additional Damage__...____________________________________
// ATTACK CALCULATION ((77 * ((pAtk * lvlMod) + power) * (1 + (0.1 * chargesConsumed)) / pdef) * skillPower) + skillPowerAdd
// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0))) / defence;
final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power + effector.getStat().getValue(Stat.SKILL_POWER_ADD, 0))) / defence;
damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * weaknessMod * attributeMod * energyChargesBoost * pvpPveMod;
}
damage = Math.max(0, damage * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1));
damage = Math.max(0, damage * effector.getStat().getValue(Stat.PHYSICAL_SKILL_POWER, 1));
effector.doAttack(damage, effected, skill, false, false, critical, false);
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.ExStorageMaxCount;
/**
@@ -42,33 +42,33 @@ public class EnlargeSlot extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
Stats stat = Stats.INVENTORY_NORMAL;
Stat stat = Stat.INVENTORY_NORMAL;
switch (_type)
{
case TRADE_BUY:
{
stat = Stats.TRADE_BUY;
stat = Stat.TRADE_BUY;
break;
}
case TRADE_SELL:
{
stat = Stats.TRADE_SELL;
stat = Stat.TRADE_SELL;
break;
}
case RECIPE_DWARVEN:
{
stat = Stats.RECIPE_DWARVEN;
stat = Stat.RECIPE_DWARVEN;
break;
}
case RECIPE_COMMON:
{
stat = Stats.RECIPE_COMMON;
stat = Stat.RECIPE_COMMON;
break;
}
case STORAGE_PRIVATE:
{
stat = Stats.STORAGE_PRIVATE;
stat = Stat.STORAGE_PRIVATE;
break;
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class ExpModify extends AbstractStatAddEffect
{
public ExpModify(StatsSet params)
{
super(params, Stats.BONUS_EXP);
super(params, Stat.BONUS_EXP);
}
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
@@ -45,12 +45,12 @@ public class FatalBlowRate extends AbstractEffect
{
case DIFF:
{
effector.getStat().mergeAdd(Stats.BLOW_RATE, _amount);
effector.getStat().mergeAdd(Stat.BLOW_RATE, _amount);
break;
}
case PER:
{
effector.getStat().mergeMul(Stats.BLOW_RATE, (_amount / 100) + 1);
effector.getStat().mergeMul(Stat.BLOW_RATE, (_amount / 100) + 1);
break;
}
}
@@ -63,12 +63,12 @@ public class FatalBlowRate extends AbstractEffect
{
case DIFF:
{
effector.getStat().mergeAdd(Stats.BLOW_RATE, _amount * -1);
effector.getStat().mergeAdd(Stat.BLOW_RATE, _amount * -1);
break;
}
case PER:
{
effector.getStat().mergeMul(Stats.BLOW_RATE, ((_amount / 100) + 1) * -1);
effector.getStat().mergeMul(Stat.BLOW_RATE, ((_amount / 100) + 1) * -1);
break;
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
@@ -26,6 +26,6 @@ public class FishingExpSpBonus extends AbstractStatPercentEffect
{
public FishingExpSpBonus(StatsSet params)
{
super(params, Stats.FISHING_EXP_SP_BONUS);
super(params, Stat.FISHING_EXP_SP_BONUS);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class FocusEnergy extends AbstractStatAddEffect
{
public FocusEnergy(StatsSet params)
{
super(params, Stats.MAX_MOMENTUM);
super(params, Stat.MAX_MOMENTUM);
}
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -50,7 +50,7 @@ public class FocusMaxMomentum extends AbstractEffect
{
final PlayerInstance player = effected.getActingPlayer();
final int count = (int) effected.getStat().getValue(Stats.MAX_MOMENTUM, 0);
final int count = (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 0);
player.setCharges(count);

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -58,7 +58,7 @@ public class FocusMomentum extends AbstractEffect
final PlayerInstance player = effected.getActingPlayer();
final int currentCharges = player.getCharges();
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stats.MAX_MOMENTUM, 0));
final int maxCharges = Math.min(_maxCharges, (int) effected.getStat().getValue(Stat.MAX_MOMENTUM, 0));
if (currentCharges >= maxCharges)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
/**
@@ -53,7 +53,7 @@ public class FocusSouls extends AbstractEffect
}
final PlayerInstance target = effected.getActingPlayer();
final int maxSouls = (int) target.getStat().getValue(Stats.MAX_SOULS, 0);
final int maxSouls = (int) target.getStat().getValue(Stat.MAX_SOULS, 0);
if (maxSouls > 0)
{
final int amount = _charge;

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class GetDamageLimit extends AbstractStatAddEffect
{
public GetDamageLimit(StatsSet params)
{
super(params, Stats.DAMAGE_LIMIT);
super(params, Stat.DAMAGE_LIMIT);
}
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -51,7 +51,7 @@ public class GetMomentum extends AbstractEffect
if (effected.isPlayer())
{
final PlayerInstance player = effected.getActingPlayer();
final int maxCharge = (int) player.getStat().getValue(Stats.MAX_MOMENTUM, 0);
final int maxCharge = (int) player.getStat().getValue(Stat.MAX_MOMENTUM, 0);
final int newCharge = Math.min(player.getCharges() + 1, maxCharge);
player.setCharges(newCharge);

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class HateAttack extends AbstractStatPercentEffect
{
public HateAttack(StatsSet params)
{
super(params, Stats.HATE_ATTACK);
super(params, Stat.HATE_ATTACK);
}
}

View File

@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.CrystalType;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExMagicAttackInfo;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -73,14 +73,14 @@ public class Heal extends AbstractEffect
double amount = _power;
if ((item != null) && (item.isPotion() || item.isElixir()))
{
amount += effected.getStat().getValue(Stats.ADDITIONAL_POTION_HP, 0);
amount += effected.getStat().getValue(Stat.ADDITIONAL_POTION_HP, 0);
}
double staticShotBonus = 0;
double mAtkMul = 1;
final boolean sps = skill.isMagic() && effector.isChargedShot(ShotType.SPIRITSHOTS);
final boolean bss = skill.isMagic() && effector.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
final double shotsBonus = effector.getStat().getValue(Stats.SHOTS_BONUS);
final double shotsBonus = effector.getStat().getValue(Stat.SHOTS_BONUS);
if (((sps || bss) && (effector.isPlayer() && effector.getActingPlayer().isMageClass())) || effector.isSummon())
{
staticShotBonus = skill.getMpConsume(); // static bonus for spiritshots
@@ -108,8 +108,8 @@ public class Heal extends AbstractEffect
if (!skill.isStatic())
{
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= effected.getStat().getValue(Stat.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stat.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill))

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw, Mobius
@@ -26,6 +26,6 @@ public class HealEffect extends AbstractStatEffect
{
public HealEffect(StatsSet params)
{
super(params, Stats.HEAL_EFFECT, Stats.HEAL_EFFECT_ADD);
super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD);
}
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.AbnormalType;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.ExRegenMax;
/**
@@ -58,7 +58,7 @@ public class HealOverTime extends AbstractEffect
double power = _power;
if ((item != null) && (item.isPotion() || item.isElixir()))
{
power += effected.getStat().getValue(Stats.ADDITIONAL_POTION_HP, 0) / getTicks();
power += effected.getStat().getValue(Stat.ADDITIONAL_POTION_HP, 0) / getTicks();
}
hp += power * getTicksMultiplier();
@@ -76,7 +76,7 @@ public class HealOverTime extends AbstractEffect
double power = _power;
if ((item != null) && (item.isPotion() || item.isElixir()))
{
final double bonus = effected.getStat().getValue(Stats.ADDITIONAL_POTION_HP, 0);
final double bonus = effected.getStat().getValue(Stat.ADDITIONAL_POTION_HP, 0);
if (bonus > 0)
{
power += bonus / getTicks();

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectType;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -66,7 +66,7 @@ public class HealPercent extends AbstractEffect
amount = full ? effected.getMaxHp() : (effected.getMaxHp() * power) / 100.0;
if ((item != null) && (item.isPotion() || item.isElixir()))
{
amount += effected.getStat().getValue(Stats.ADDITIONAL_POTION_HP, 0);
amount += effected.getStat().getValue(Stat.ADDITIONAL_POTION_HP, 0);
}
// Prevents overheal

View File

@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
@@ -30,7 +30,7 @@ public class HitAtNight extends AbstractStatEffect
{
public HitAtNight(StatsSet params)
{
super(params, Stats.HIT_AT_NIGHT);
super(params, Stat.HIT_AT_NIGHT);
}
@Override

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class HitNumber extends AbstractStatEffect
{
public HitNumber(StatsSet params)
{
super(params, Stats.ATTACK_COUNT_MAX);
super(params, Stat.ATTACK_COUNT_MAX);
}
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -58,7 +58,7 @@ public class Hp extends AbstractEffect
int basicAmount = _amount;
if ((item != null) && (item.isPotion() || item.isElixir()))
{
basicAmount += effected.getStat().getValue(Stats.ADDITIONAL_POTION_HP, 0);
basicAmount += effected.getStat().getValue(Stat.ADDITIONAL_POTION_HP, 0);
}
double amount = 0;

View File

@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.CrystalType;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExMagicAttackInfo;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -75,7 +75,7 @@ public class HpCpHeal extends AbstractEffect
double mAtkMul = 1;
final boolean sps = skill.isMagic() && effector.isChargedShot(ShotType.SPIRITSHOTS);
final boolean bss = skill.isMagic() && effector.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
final double shotsBonus = effector.getStat().getValue(Stats.SHOTS_BONUS);
final double shotsBonus = effector.getStat().getValue(Stat.SHOTS_BONUS);
if (((sps || bss) && (effector.isPlayer() && effector.getActingPlayer().isMageClass())) || effector.isSummon())
{
@@ -104,8 +104,8 @@ public class HpCpHeal extends AbstractEffect
if (!skill.isStatic())
{
amount += staticShotBonus + Math.sqrt(mAtkMul * effector.getMAtk());
amount *= effected.getStat().getValue(Stats.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stats.HEAL_EFFECT_ADD, 0);
amount *= effected.getStat().getValue(Stat.HEAL_EFFECT, 1);
amount += effected.getStat().getValue(Stat.HEAL_EFFECT_ADD, 0);
amount *= (item == null) && effector.isPlayable() ? Config.PLAYER_HEALING_SKILL_MULTIPLIERS.getOrDefault(effector.getActingPlayer().getClassId(), 1f) : 1;
// Heal critic, since CT2.3 Gracia Final
if (skill.isMagic() && (Formulas.calcCrit(skill.getMagicCriticalRate(), effector, effected, skill) || effector.isAffected(EffectFlag.HPCPHEAL_CRITICAL)))

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class HpRegen extends AbstractStatEffect
{
public HpRegen(StatsSet params)
{
super(params, Stats.REGENERATE_HP_RATE);
super(params, Stat.REGENERATE_HP_RATE);
}
}

View File

@@ -36,7 +36,7 @@ public class ImmobilePetBuff extends AbstractEffect
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.setIsImmobilized(false);
effected.setImmobilized(false);
}
@Override
@@ -44,7 +44,7 @@ public class ImmobilePetBuff extends AbstractEffect
{
if (effected.isSummon() && effector.isPlayer() && (((Summon) effected).getOwner() == effector))
{
effected.setIsImmobilized(true);
effected.setImmobilized(true);
}
}
}

View File

@@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -37,6 +37,6 @@ public class InstantKillResist extends AbstractEffect
@Override
public void pump(Creature effected, Skill skill)
{
effected.getStat().mergeAdd(Stats.INSTANT_KILL_RESIST, _amount);
effected.getStat().mergeAdd(Stat.INSTANT_KILL_RESIST, _amount);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class JewelSlot extends AbstractStatAddEffect
{
public JewelSlot(StatsSet params)
{
super(params, Stats.BROOCH_JEWELS);
super(params, Stat.BROOCH_JEWELS);
}
}

View File

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -82,7 +82,7 @@ public class Lethal extends AbstractEffect
final double chanceMultiplier = Formulas.calcAttributeBonus(effector, effected, skill) * Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), false);
// Calculate instant kill resistance first.
if (Rnd.get(100) < effected.getStat().getValue(Stats.INSTANT_KILL_RESIST, 0))
if (Rnd.get(100) < effected.getStat().getValue(Stat.INSTANT_KILL_RESIST, 0))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK);
sm.addString(effected.getName());

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class LimitCp extends AbstractStatEffect
{
public LimitCp(StatsSet params)
{
super(params, Stats.MAX_RECOVERABLE_CP);
super(params, Stat.MAX_RECOVERABLE_CP);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class LimitHp extends AbstractStatEffect
{
public LimitHp(StatsSet params)
{
super(params, Stats.MAX_RECOVERABLE_HP);
super(params, Stat.MAX_RECOVERABLE_HP);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class LimitMp extends AbstractStatEffect
{
public LimitMp(StatsSet params)
{
super(params, Stats.MAX_RECOVERABLE_MP);
super(params, Stat.MAX_RECOVERABLE_MP);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class MAtk extends AbstractStatEffect
{
public MAtk(StatsSet params)
{
super(params, Stats.MAGIC_ATTACK);
super(params, Stat.MAGIC_ATTACK);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class MagicAccuracy extends AbstractStatEffect
{
public MagicAccuracy(StatsSet params)
{
super(params, Stats.ACCURACY_MAGIC);
super(params, Stat.ACCURACY_MAGIC);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class MagicCriticalDamage extends AbstractStatEffect
{
public MagicCriticalDamage(StatsSet params)
{
super(params, Stats.MAGIC_CRITICAL_DAMAGE, Stats.MAGIC_CRITICAL_DAMAGE_ADD);
super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class MagicCriticalRate extends AbstractStatEffect
{
public MagicCriticalRate(StatsSet params)
{
super(params, Stats.MAGIC_CRITICAL_RATE);
super(params, Stat.MAGIC_CRITICAL_RATE);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class MagicalAbnormalResist extends AbstractStatAddEffect
{
public MagicalAbnormalResist(StatsSet params)
{
super(params, Stats.ABNORMAL_RESIST_MAGICAL);
super(params, Stat.ABNORMAL_RESIST_MAGICAL);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class MagicalAttackSpeed extends AbstractStatEffect
{
public MagicalAttackSpeed(StatsSet params)
{
super(params, Stats.MAGIC_ATTACK_SPEED);
super(params, Stat.MAGIC_ATTACK_SPEED);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class MagicalDefence extends AbstractStatEffect
{
public MagicalDefence(StatsSet params)
{
super(params, Stats.MAGICAL_DEFENCE);
super(params, Stat.MAGICAL_DEFENCE);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class MagicalEvasion extends AbstractStatEffect
{
public MagicalEvasion(StatsSet params)
{
super(params, Stats.MAGIC_EVASION_RATE);
super(params, Stat.MAGIC_EVASION_RATE);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Mobius
@@ -26,6 +26,6 @@ public class MagicalSkillPower extends AbstractStatEffect
{
public MagicalSkillPower(StatsSet params)
{
super(params, Stats.MAGICAL_SKILL_POWER, Stats.SKILL_POWER_ADD);
super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD);
}
}

View File

@@ -17,7 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author Sdw
@@ -26,6 +26,6 @@ public class ManaCharge extends AbstractStatAddEffect
{
public ManaCharge(StatsSet params)
{
super(params, Stats.MANA_CHARGE);
super(params, Stat.MANA_CHARGE);
}
}

Some files were not shown because too many files have changed in this diff Show More