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

Proper syntax for several methods and values.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/CommonUtil.java
View File

@@ -576,13 +576,13 @@ public class CommonUtil
}
/**
* @param val
* @param value
* @param format
* @return
*/
public static String formatDouble(double val, String format)
public static String formatDouble(double value, String format)
{
final DecimalFormat formatter = new DecimalFormat(format, new DecimalFormatSymbols(Locale.ENGLISH));
return formatter.format(val);
return formatter.format(value);
}
}

12
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/RecipeController.java
View File

@@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.CommonSkill;
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.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
@@ -199,7 +199,7 @@ public class RecipeController
_skillLevel = _player.getSkillLevel(_skillId);
_skill = _player.getKnownSkill(_skillId);
_player.setIsCrafting(true);
_player.setCrafting(true);
if (_player.isAlikeDead())
{
@@ -291,7 +291,7 @@ public class RecipeController
updateCurMp();
updateCurLoad();
_player.setIsCrafting(false);
_player.setCrafting(false);
_isValid = true;
}
@@ -439,7 +439,7 @@ public class RecipeController
// update load and mana bar of craft window
updateCurMp();
_activeMakers.remove(_player.getObjectId());
_player.setIsCrafting(false);
_player.setCrafting(false);
_target.sendItemList(false);
}
@@ -655,7 +655,7 @@ public class RecipeController
private void abort()
{
updateMakeInfo(false);
_player.setIsCrafting(false);
_player.setCrafting(false);
_activeMakers.remove(_player.getObjectId());
}
@@ -769,7 +769,7 @@ public class RecipeController
// Added multiplication of Creation speed with XP/SP gain slower crafting -> more XP,
// faster crafting -> less XP you can use ALT_GAME_CREATION_XP_RATE/SP to modify XP/SP gained (default = 1)
_player.addExpAndSp((int) _player.getStat().getValue(Stats.EXPSP_RATE, _exp * Config.ALT_GAME_CREATION_XP_RATE * Config.ALT_GAME_CREATION_SPEED), (int) _player.getStat().getValue(Stats.EXPSP_RATE, _sp * Config.ALT_GAME_CREATION_SP_RATE * Config.ALT_GAME_CREATION_SPEED));
_player.addExpAndSp((int) _player.getStat().getValue(Stat.EXPSP_RATE, _exp * Config.ALT_GAME_CREATION_XP_RATE * Config.ALT_GAME_CREATION_SPEED), (int) _player.getStat().getValue(Stat.EXPSP_RATE, _sp * Config.ALT_GAME_CREATION_SP_RATE * Config.ALT_GAME_CREATION_SPEED));
}
updateMakeInfo(true); // success
}

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -597,7 +597,7 @@ public class AttackableAI extends CreatureAI
if (!npc.isInsideRadius2D(x1, y1, 0, range))
{
npc.setisReturningToSpawnPoint(true);
npc.setReturningToSpawnPoint(true);
}
else
{

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java
View File

@@ -662,7 +662,7 @@ public class CreatureAI extends AbstractAI
if (getActor().isAttackable())
{
((Attackable) getActor()).setisReturningToSpawnPoint(false);
((Attackable) getActor()).setReturningToSpawnPoint(false);
}
clientStoppedMoving();

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
View File

@@ -185,9 +185,9 @@ public class DoppelgangerAI extends CreatureAI
}
}
public void setStartFollowController(boolean val)
public void setStartFollowController(boolean value)
{
_startFollow = val;
_startFollow = value;
}
@Override

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/SummonAI.java
View File

@@ -319,9 +319,9 @@ public class SummonAI extends PlayableAI implements Runnable
}
}
public void setStartFollowController(boolean val)
public void setStartFollowController(boolean value)
{
_startFollow = val;
_startFollow = value;
}
@Override

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
View File

@@ -227,7 +227,7 @@ public class OfflineTradersTable
if (isSellBuff)
{
player.setIsSellingBuffs(true);
player.setSellingBuffs(true);
}
player.spawnMe(player.getX(), player.getY(), player.getZ());

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
View File

@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.model.ArmorSet;
import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.stats.BaseStats;
import org.l2jmobius.gameserver.model.stats.BaseStat;
/**
* Loads armor set bonuses.
@@ -138,7 +138,7 @@ public class ArmorSetsData implements IXmlReader
forEach(innerSetNode, b -> "stat".equals(b.getNodeName()), node ->
{
final NamedNodeMap attrs = node.getAttributes();
set.addStatsBonus(parseEnum(attrs, BaseStats.class, "type"), parseInteger(attrs, "val"));
set.addStatsBonus(parseEnum(attrs, BaseStat.class, "type"), parseInteger(attrs, "val"));
});
break;
}

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java
View File

@@ -258,7 +258,7 @@ public class RecipeData implements IXmlReader
if ((recipeList == null) || (recipeList.getRecipes().length == 0))
{
player.sendMessage("No recipe for: " + id);
player.setIsCrafting(false);
player.setCrafting(false);
return null;
}
return recipeList;

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBase.java
View File

@@ -140,7 +140,7 @@ import org.l2jmobius.gameserver.model.items.type.ArmorType;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
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.model.stats.functions.FuncTemplate;
/**
@@ -244,7 +244,7 @@ public abstract class DocumentBase
protected void attachFunc(Node n, Object template, String functionName, Condition attachCond)
{
final Stats stat = Stats.valueOfXml(n.getAttributes().getNamedItem("stat").getNodeValue());
final Stat stat = Stat.valueOfXml(n.getAttributes().getNamedItem("stat").getNodeValue());
int order = -1;
final Node orderNode = n.getAttributes().getNamedItem("order");
if (orderNode != null)

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.holders.ItemSkillHolder;
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.model.stats.functions.FuncTemplate;
/**
@@ -142,7 +142,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader
{
if ("stat".equalsIgnoreCase(b.getNodeName()))
{
final Stats type = Stats.valueOfXml(b.getAttributes().getNamedItem("type").getNodeValue());
final Stat type = Stat.valueOfXml(b.getAttributes().getNamedItem("type").getNodeValue());
final double value = Double.parseDouble(b.getTextContent());
_currentItem.item.addFunctionTemplate(new FuncTemplate(null, null, "add", 0x00, type, value));
}

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java
View File

@@ -176,7 +176,7 @@ public class InstanceManager implements IXmlReader
{
final NamedNodeMap attrs = innerNode.getAttributes();
template.allowPlayerSummon(parseBoolean(attrs, "allowPlayerSummon", false));
template.setIsPvP(parseBoolean(attrs, "isPvP", false));
template.setPvP(parseBoolean(attrs, "isPvP", false));
break;
}
case "rates":

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
View File

@@ -119,7 +119,7 @@ public class SellBuffsManager implements IXmlReader
public void startSellBuffs(PlayerInstance player, String title)
{
player.sitDown();
player.setIsSellingBuffs(true);
player.setSellingBuffs(true);
player.setPrivateStoreType(PrivateStoreType.PACKAGE_SELL);
player.getSellList().setTitle(title);
player.getSellList().setPackaged(true);
@@ -130,7 +130,7 @@ public class SellBuffsManager implements IXmlReader
public void stopSellBuffs(PlayerInstance player)
{
player.setIsSellingBuffs(false);
player.setSellingBuffs(false);
player.setPrivateStoreType(PrivateStoreType.NONE);
player.standUp();
player.broadcastUserInfo();

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
View File

@@ -201,7 +201,7 @@ public class SiegeGuardManager
npc.setHeading(pos.getHeading());
npc.spawnMe(pos.getX(), pos.getY(), (pos.getZ() + 20));
npc.scheduleDespawn(3000);
npc.setIsImmobilized(holder.isStationary());
npc.setImmobilized(holder.isStationary());
}
}
@@ -343,7 +343,7 @@ public class SiegeGuardManager
continue;
}
spawn.getLastSpawn().setIsImmobilized(holder.isStationary());
spawn.getLastSpawn().setImmobilized(holder.isStationary());
}
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ArmorSet.java
View File

@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.stats.BaseStats;
import org.l2jmobius.gameserver.model.stats.BaseStat;
/**
* @author UnAfraid
@@ -44,7 +44,7 @@ public class ArmorSet
private final Set<Integer> _optionalItems = new LinkedHashSet<>();
private final List<ArmorsetSkillHolder> _skills = new ArrayList<>();
private final Map<BaseStats, Double> _stats = new LinkedHashMap<>();
private final Map<BaseStat, Double> _stats = new LinkedHashMap<>();
private static final int[] ARMORSET_SLOTS = new int[]
{
@@ -147,7 +147,7 @@ public class ArmorSet
* @param stat
* @param value
*/
public void addStatsBonus(BaseStats stat, double value)
public void addStatsBonus(BaseStat stat, double value)
{
_stats.putIfAbsent(stat, value);
}
@@ -156,7 +156,7 @@ public class ArmorSet
* @param stat
* @return the stats bonus value or 0 if doesn't exists
*/
public double getStatsBonus(BaseStats stat)
public double getStatsBonus(BaseStat stat)
{
return _stats.getOrDefault(stat, 0d);
}

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/BlockList.java
View File

@@ -153,9 +153,9 @@ public class BlockList
return blockList.isBlockAll() || blockList.isInBlockList(targetId);
}
private void setBlockAll(boolean state)
private void setBlockAll(boolean value)
{
_owner.setMessageRefusal(state);
_owner.setMessageRefusal(value);
}
private List<Integer> getBlockList()

12
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java
View File

@@ -48,7 +48,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
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.ExAskModifyPartyLooting;
import org.l2jmobius.gameserver.network.serverpackets.ExCloseMPCC;
@@ -144,11 +144,11 @@ public class Party extends AbstractPlayerGroup
/**
* Set invitation process flag and store time for expiration. <br>
* Happens when a player joins party or declines to join.
* @param val the pending invitation state to set
* @param value the pending invitation state to set
*/
public void setPendingInvitation(boolean val)
public void setPendingInvitation(boolean value)
{
_pendingInvitation = val;
_pendingInvitation = value;
_pendingInviteTimeout = GameTimeController.getInstance().getGameTicks() + (PlayerInstance.REQUEST_TIMEOUT * GameTimeController.TICKS_PER_SECOND);
}
@@ -874,8 +874,8 @@ public class Party extends AbstractPlayerGroup
final double preCalculation = (sqLevel / sqLevelSum) * penalty;
// Add the XP/SP points to the requested party member
double exp = member.getStat().getValue(Stats.EXPSP_RATE, xpReward * preCalculation);
final double sp = member.getStat().getValue(Stats.EXPSP_RATE, spReward * preCalculation);
double exp = member.getStat().getValue(Stat.EXPSP_RATE, xpReward * preCalculation);
final double sp = member.getStat().getValue(Stat.EXPSP_RATE, spReward * preCalculation);
exp = calculateExpSpPartyCutoff(member.getActingPlayer(), topLvl, exp, sp, target.useVitalityRate());
if (exp > 0)

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/PetData.java
View File

@@ -163,11 +163,11 @@ public class PetData
}
/**
* @param val synchronizes level with master or not.
* @param value synchronizes level with master or not.
*/
public void setSyncLevel(boolean val)
public void setSyncLevel(boolean value)
{
_syncLevel = val;
_syncLevel = value;
}
// SKILS

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/PetLevelData.java
View File

@@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.model;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* Stats definition for each pet level.
@@ -195,7 +195,7 @@ public class PetLevelData
* @param stat movement type
* @return the base riding speed of given movement type.
*/
public double getSpeedOnRide(Stats stat)
public double getSpeedOnRide(Stat stat)
{
switch (stat)
{

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SeedProduction.java
View File

@@ -61,14 +61,14 @@ public class SeedProduction
_amount.set(amount);
}
public boolean decreaseAmount(long val)
public boolean decreaseAmount(long value)
{
long current;
long next;
do
{
current = _amount.get();
next = current - val;
next = current - value;
if (next < 0)
{
return false;

14
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/TeleportLocation.java
View File

@@ -70,19 +70,19 @@ public class TeleportLocation
}
/**
* @param val
* @param value
*/
public void setIsForNoble(boolean val)
public void setForNoble(boolean value)
{
_forNoble = val;
_forNoble = value;
}
/**
* @param val
* @param value
*/
public void setItemId(int val)
public void setItemId(int value)
{
_itemId = val;
_itemId = value;
}
/**
@@ -128,7 +128,7 @@ public class TeleportLocation
/**
* @return
*/
public boolean getIsForNoble()
public boolean isForNoble()
{
return _forNoble;
}

30
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WalkInfo.java
View File

@@ -138,11 +138,11 @@ public class WalkInfo
}
/**
* @param val
* @param value
*/
public void setBlocked(boolean val)
public void setBlocked(boolean value)
{
_blocked = val;
_blocked = value;
}
/**
@@ -154,11 +154,11 @@ public class WalkInfo
}
/**
* @param val
* @param value
*/
public void setSuspended(boolean val)
public void setSuspended(boolean value)
{
_suspended = val;
_suspended = value;
}
/**
@@ -170,11 +170,11 @@ public class WalkInfo
}
/**
* @param val
* @param value
*/
public void setStoppedByAttack(boolean val)
public void setStoppedByAttack(boolean value)
{
_stoppedByAttack = val;
_stoppedByAttack = value;
}
/**
@@ -194,11 +194,11 @@ public class WalkInfo
}
/**
* @param val
* @param value
*/
public void setLastAction(long val)
public void setLastAction(long value)
{
_lastActionTime = val;
_lastActionTime = value;
}
/**
@@ -210,11 +210,11 @@ public class WalkInfo
}
/**
* @param val walking check task.
* @param task walking check task.
*/
public void setWalkCheckTask(ScheduledFuture<?> val)
public void setWalkCheckTask(ScheduledFuture<?> task)
{
_walkCheckTask = val;
_walkCheckTask = task;
}
@Override

24
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -73,7 +73,7 @@ import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.CommonSkill;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.skills.SkillCaster;
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.CreatureSay;
import org.l2jmobius.gameserver.network.serverpackets.ExMagicAttackInfo;
@@ -124,7 +124,7 @@ public class Attackable extends Npc
{
super(template);
setInstanceType(InstanceType.Attackable);
setIsInvul(false);
setInvul(false);
_mustGiveExpSp = true;
}
@@ -156,7 +156,7 @@ public class Attackable extends Npc
return _isReturningToSpawnPoint;
}
public void setisReturningToSpawnPoint(boolean value)
public void setReturningToSpawnPoint(boolean value)
{
_isReturningToSpawnPoint = value;
}
@@ -176,9 +176,9 @@ public class Attackable extends Npc
return _seeThroughSilentMove;
}
public void setSeeThroughSilentMove(boolean val)
public void setSeeThroughSilentMove(boolean value)
{
_seeThroughSilentMove = val;
_seeThroughSilentMove = value;
}
/**
@@ -497,8 +497,8 @@ public class Attackable extends Npc
// Distribute the Exp and SP between the PlayerInstance and its Summon
if (!attacker.isDead())
{
exp = attacker.getStat().getValue(Stats.EXPSP_RATE, exp) * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(attacker.getClassId(), 1f);
sp = attacker.getStat().getValue(Stats.EXPSP_RATE, sp) * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(attacker.getClassId(), 1f);
exp = attacker.getStat().getValue(Stat.EXPSP_RATE, exp) * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(attacker.getClassId(), 1f);
sp = attacker.getStat().getValue(Stat.EXPSP_RATE, sp) * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(attacker.getClassId(), 1f);
attacker.addExpAndSp(exp, sp, useVitalityRate());
if (exp > 0)
@@ -665,7 +665,7 @@ public class Attackable extends Npc
if (skill == null)
{
hateValue *= attacker.getStat().getValue(Stats.HATE_ATTACK, 1);
hateValue *= attacker.getStat().getValue(Stat.HATE_ATTACK, 1);
}
addDamageHate(attacker, damage, (int) hateValue);
@@ -1700,12 +1700,12 @@ public class Attackable extends Npc
/**
* Set this Npc as a Minion instance.
* @param val
* @param value
*/
public void setIsRaidMinion(boolean val)
public void setIsRaidMinion(boolean value)
{
_isRaid = val;
_isRaidMinion = val;
_isRaid = value;
_isRaidMinion = value;
}
@Override

80
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -128,11 +128,11 @@ import org.l2jmobius.gameserver.model.skills.SkillCaster;
import org.l2jmobius.gameserver.model.skills.SkillCastingType;
import org.l2jmobius.gameserver.model.skills.SkillChannelized;
import org.l2jmobius.gameserver.model.skills.SkillChannelizer;
import org.l2jmobius.gameserver.model.stats.BaseStats;
import org.l2jmobius.gameserver.model.stats.BaseStat;
import org.l2jmobius.gameserver.model.stats.BasicPropertyResist;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.MoveType;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.model.zone.ZoneRegion;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -346,7 +346,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
}
setIsInvul(true);
setInvul(true);
}
public EffectList getEffectList()
@@ -589,7 +589,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return;
}
spawnMe(getX(), getY(), getZ());
setIsTeleporting(false);
setTeleporting(false);
EventDispatcher.getInstance().notifyEventAsync(new OnCreatureTeleported(this), this);
}
@@ -766,7 +766,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
abortCast();
setTarget(null);
setIsTeleporting(true);
setTeleporting(true);
getAI().setIntention(AI_INTENTION_ACTIVE);
@@ -1198,8 +1198,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599).
int attackCountMax = (int) _stat.getValue(Stats.ATTACK_COUNT_MAX, 1);
if ((attackCountMax > 1) && (_stat.getValue(Stats.PHYSICAL_POLEARM_TARGET_SINGLE, 0) <= 0))
int attackCountMax = (int) _stat.getValue(Stat.ATTACK_COUNT_MAX, 1);
if ((attackCountMax > 1) && (_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) <= 0))
{
final double headingAngle = Util.convertHeadingToDegree(getHeading());
final int maxRadius = _stat.getPhysicalAttackRadius();
@@ -1593,7 +1593,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// now reset currentHp to zero
setCurrentHp(0);
setIsDead(true);
setDead(true);
}
EventDispatcher.getInstance().notifyEvent(new OnCreatureDeath(killer, this), this);
EventDispatcher.getInstance().notifyEvent(new OnCreatureKilled(killer, this), killer);
@@ -1702,7 +1702,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (!_isTeleporting)
{
setIsPendingRevive(false);
setIsDead(false);
setDead(false);
if ((Config.RESPAWN_RESTORE_CP > 0) && (_status.getCurrentCp() < (_stat.getMaxCp() * Config.RESPAWN_RESTORE_CP)))
{
@@ -1880,7 +1880,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _isDead;
}
public void setIsDead(boolean value)
public void setDead(boolean value)
{
_isDead = value;
}
@@ -1890,7 +1890,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _isImmobilized;
}
public void setIsImmobilized(boolean value)
public void setImmobilized(boolean value)
{
_isImmobilized = value;
}
@@ -1928,7 +1928,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Set the overloaded status of the Creature is overloaded (if True, the PlayerInstance can't take more item).
* @param value
*/
public void setIsOverloaded(boolean value)
public void setOverloaded(boolean value)
{
_isOverloaded = value;
}
@@ -2016,7 +2016,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _isRunning;
}
private final void setIsRunning(boolean value)
private final void setRunning(boolean value)
{
if (_isRunning == value)
{
@@ -2064,7 +2064,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
/** Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others PlayerInstance. */
public void setRunning()
{
setIsRunning(true);
setRunning(true);
}
public boolean hasBlockActions()
@@ -2087,14 +2087,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _isTeleporting;
}
public void setIsTeleporting(boolean value)
public void setTeleporting(boolean value)
{
_isTeleporting = value;
}
public void setIsInvul(boolean b)
public void setInvul(boolean value)
{
_isInvul = b;
_isInvul = value;
}
@Override
@@ -2148,7 +2148,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return _isFlying;
}
public void setIsFlying(boolean mode)
public void setFlying(boolean mode)
{
_isFlying = mode;
}
@@ -2281,7 +2281,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/
public void setWalking()
{
setIsRunning(false);
setRunning(false);
}
/**
@@ -2533,7 +2533,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
public int geoPathGty;
}
public void broadcastModifiedStats(Set<Stats> changed)
public void broadcastModifiedStats(Set<Stat> changed)
{
if (!isSpawned())
{
@@ -2575,7 +2575,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
info = new UserInfo(getActingPlayer(), false);
info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
}
for (Stats stat : changed)
for (Stat stat : changed)
{
if (info != null)
{
@@ -4156,7 +4156,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
*/
public double getRandomDamageMultiplier()
{
final int random = (int) _stat.getValue(Stats.RANDOM_DAMAGE);
final int random = (int) _stat.getValue(Stat.RANDOM_DAMAGE);
return (1 + ((double) Rnd.get(-random, random) / 100));
}
@@ -4389,7 +4389,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// RearDamage effect bonus.
if (isBehind(target))
{
damage *= _stat.getValue(Stats.REAR_DAMAGE_RATE, 1);
damage *= _stat.getValue(Stat.REAR_DAMAGE_RATE, 1);
}
// Counterattacks happen before damage received.
@@ -4398,7 +4398,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
Formulas.calcCounterAttack(this, target, skill, true);
// Shield Deflect Magic: Reflect all damage on caster.
if (skill.isMagic() && (target.getStat().getValue(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0) > Rnd.get(100)))
if (skill.isMagic() && (target.getStat().getValue(Stat.VENGEANCE_SKILL_MAGIC_DAMAGE, 0) > Rnd.get(100)))
{
reduceCurrentHp(damage, target, skill, isDOT, directlyToHp, critical, true);
return;
@@ -4415,7 +4415,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
int reflectedDamage = 0;
// Reduce HP of the target and calculate reflection damage to reduce HP of attacker if necessary
final double reflectPercent = target.getStat().getValue(Stats.REFLECT_DAMAGE_PERCENT, 0) - getStat().getValue(Stats.REFLECT_DAMAGE_PERCENT_DEFENSE, 0);
final double reflectPercent = target.getStat().getValue(Stat.REFLECT_DAMAGE_PERCENT, 0) - getStat().getValue(Stat.REFLECT_DAMAGE_PERCENT_DEFENSE, 0);
if (reflectPercent > 0)
{
reflectedDamage = (int) ((reflectPercent / 100.) * damage);
@@ -4436,8 +4436,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
final boolean isPvP = isPlayable() && target.isPlayable();
if (!isPvP || Config.VAMPIRIC_ATTACK_AFFECTS_PVP)
{
final double absorbHpPercent = getStat().getValue(Stats.ABSORB_DAMAGE_PERCENT, 0) * target.getStat().getValue(Stats.ABSORB_DAMAGE_DEFENCE, 1);
if ((absorbHpPercent > 0) && (Rnd.nextDouble() < _stat.getValue(Stats.ABSORB_DAMAGE_CHANCE)))
final double absorbHpPercent = getStat().getValue(Stat.ABSORB_DAMAGE_PERCENT, 0) * target.getStat().getValue(Stat.ABSORB_DAMAGE_DEFENCE, 1);
if ((absorbHpPercent > 0) && (Rnd.nextDouble() < _stat.getValue(Stat.ABSORB_DAMAGE_CHANCE)))
{
int absorbDamage = (int) Math.min(absorbHpPercent * damage, _stat.getMaxRecoverableHp() - _status.getCurrentHp());
absorbDamage = Math.min(absorbDamage, (int) target.getCurrentHp());
@@ -4451,7 +4451,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Absorb MP from the damage inflicted.
if (!isPvP || Config.MP_VAMPIRIC_ATTACK_AFFECTS_PVP)
{
final double absorbMpPercent = _stat.getValue(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0);
final double absorbMpPercent = _stat.getValue(Stat.ABSORB_MANA_DAMAGE_PERCENT, 0);
if (absorbMpPercent > 0)
{
int absorbDamage = (int) Math.min((absorbMpPercent / 100.) * damage, _stat.getMaxRecoverableMp() - _status.getCurrentMp());
@@ -4503,7 +4503,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
}
final double damageCap = _stat.getValue(Stats.DAMAGE_LIMIT);
final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
if (damageCap > 0)
{
value = Math.min(value, damageCap);
@@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{
if (attacker.isPlayable())
{
value *= (100 + _stat.getValue(Stats.PVP_DAMAGE_TAKEN)) / 100;
value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100;
}
else
{
value *= (100 + _stat.getValue(Stats.PVE_DAMAGE_TAKEN)) / 100;
value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100;
}
}
@@ -4631,8 +4631,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{
// Weight Limit = (CON Modifier*69000) * Skills
// Source http://l2p.bravehost.com/weightlimit.html (May 2007)
final double baseLoad = Math.floor(BaseStats.CON.calcBonus(this) * 69000 * Config.ALT_WEIGHT_LIMIT);
return (int) _stat.getValue(Stats.WEIGHT_LIMIT, baseLoad);
final double baseLoad = Math.floor(BaseStat.CON.calcBonus(this) * 69000 * Config.ALT_WEIGHT_LIMIT);
return (int) _stat.getValue(Stat.WEIGHT_LIMIT, baseLoad);
}
return 0;
}
@@ -4641,7 +4641,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{
if (isPlayer() || isPet())
{
return (int) _stat.getValue(Stats.WEIGHT_PENALTY, 1);
return (int) _stat.getValue(Stat.WEIGHT_PENALTY, 1);
}
return 0;
}
@@ -4696,9 +4696,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
abortAttack();
}
public void disableCoreAI(boolean val)
public void disableCoreAI(boolean value)
{
_AIdisabled = val;
_AIdisabled = value;
}
public boolean isCoreAIDisabled()
@@ -4766,9 +4766,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
_exceptions = masks;
}
public void setLethalable(boolean val)
public void setLethalable(boolean value)
{
_lethalable = val;
_lethalable = value;
}
public boolean isLethalable()
@@ -4817,9 +4817,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
/**
* Dummy method overriden in {@link PlayerInstance}
* @param val
* @param value
*/
public void setCanRevive(boolean val)
public void setCanRevive(boolean value)
{
}

62
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java
View File

@@ -182,7 +182,7 @@ public class Npc extends Creature
_currentCollisionHeight = getTemplate().getfCollisionHeight();
_currentCollisionRadius = getTemplate().getfCollisionRadius();
setIsFlying(template.isFlying());
setFlying(template.isFlying());
initStatusUpdateCache();
}
@@ -211,11 +211,11 @@ public class Npc extends Creature
/**
* Switches random Animation state into val.
* @param val needed state of random animation
* @param value needed state of random animation
*/
public void setRandomAnimation(boolean val)
public void setRandomAnimation(boolean value)
{
_isRandomAnimationEnabled = val;
_isRandomAnimationEnabled = value;
}
/**
@@ -646,21 +646,21 @@ public class Npc extends Creature
* <li>if the file doesn't exist on the server : <B>data/html/npcdefault.htm</B> (message : "I have nothing to say to you")</li>
* </ul>
* @param npcId The Identifier of the NpcInstance whose text must be display
* @param val The number of the page to display
* @param value The number of the page to display
* @param player The player that speaks to this NPC
* @return the pathfile of the selected HTML file in function of the npcId and of the page number.
*/
public String getHtmlPath(int npcId, int val, PlayerInstance player)
public String getHtmlPath(int npcId, int value, PlayerInstance player)
{
String pom = "";
if (val == 0)
if (value == 0)
{
pom = Integer.toString(npcId);
}
else
{
pom = npcId + "-" + val;
pom = npcId + "-" + value;
}
final String temp = "data/html/default/" + pom + ".htm";
@@ -715,9 +715,9 @@ public class Npc extends Creature
* <li>Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet</li>
* </ul>
* @param player The PlayerInstance that talk with the NpcInstance
* @param val The number of the page of the NpcInstance to display
* @param value The number of the page of the NpcInstance to display
*/
public void showChatWindow(PlayerInstance player, int val)
public void showChatWindow(PlayerInstance player, int value)
{
if (!_isTalkable)
{
@@ -757,7 +757,7 @@ public class Npc extends Creature
}
}
if (getTemplate().isType("Auctioneer") && (val == 0))
if (getTemplate().isType("Auctioneer") && (value == 0))
{
return;
}
@@ -775,7 +775,7 @@ public class Npc extends Creature
}
else
{
filename = (getHtmlPath(npcId, val, player));
filename = (getHtmlPath(npcId, value, player));
}
break;
}
@@ -791,7 +791,7 @@ public class Npc extends Creature
}
else
{
filename = (getHtmlPath(npcId, val, player));
filename = (getHtmlPath(npcId, value, player));
}
break;
}
@@ -803,7 +803,7 @@ public class Npc extends Creature
}
else
{
filename = (getHtmlPath(npcId, val, player));
filename = (getHtmlPath(npcId, value, player));
}
break;
}
@@ -814,7 +814,7 @@ public class Npc extends Creature
return;
}
// Get the text of the selected HTML file in function of the npcId and of the page number
filename = (getHtmlPath(npcId, val, player));
filename = (getHtmlPath(npcId, value, player));
break;
}
}
@@ -1058,7 +1058,7 @@ public class Npc extends Creature
public void onRespawn()
{
// Make it alive
setIsDead(false);
setDead(false);
// Stop all effects and recalculate stats without broadcasting.
getEffectList().stopAllEffects(false);
@@ -1309,18 +1309,18 @@ public class Npc extends Creature
return getTemplate().getAIType();
}
public void setDisplayEffect(int val)
public void setDisplayEffect(int value)
{
if (val != _displayEffect)
if (value != _displayEffect)
{
_displayEffect = val;
broadcastPacket(new ExChangeNpcState(getObjectId(), val));
_displayEffect = value;
broadcastPacket(new ExChangeNpcState(getObjectId(), value));
}
}
public boolean hasDisplayEffect(int val)
public boolean hasDisplayEffect(int value)
{
return _displayEffect == val;
return _displayEffect == value;
}
public int getDisplayEffect()
@@ -1416,21 +1416,21 @@ public class Npc extends Creature
/**
* Short wrapper for backward compatibility. Stores script value
* @param val value to store
* @param value value to store
*/
public void setScriptValue(int val)
public void setScriptValue(int value)
{
getVariables().set("SCRIPT_VAL", val);
getVariables().set("SCRIPT_VAL", value);
}
/**
* Short wrapper for backward compatibility.
* @param val value to store
* @param value value to store
* @return {@code true} if stored script value equals given value, {@code false} otherwise
*/
public boolean isScriptValue(int val)
public boolean isScriptValue(int value)
{
return getVariables().getInt("SCRIPT_VAL") == val;
return getVariables().getInt("SCRIPT_VAL") == value;
}
/**
@@ -1599,11 +1599,11 @@ public class Npc extends Creature
/**
* Sets if the players can talk with this npc or not
* @param val {@code true} if the players can talk, {@code false} otherwise
* @param value {@code true} if the players can talk, {@code false} otherwise
*/
public void setIsTalkable(boolean val)
public void setTalkable(boolean value)
{
_isTalkable = val;
_isTalkable = value;
}
/**

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Playable.java
View File

@@ -63,14 +63,14 @@ public abstract class Playable extends Creature
{
super(objectId, template);
setInstanceType(InstanceType.Playable);
setIsInvul(false);
setInvul(false);
}
public Playable(CreatureTemplate template)
{
super(template);
setInstanceType(InstanceType.Playable);
setIsInvul(false);
setInvul(false);
}
@Override
@@ -115,7 +115,7 @@ public abstract class Playable extends Creature
}
// now reset currentHp to zero
setCurrentHp(0);
setIsDead(true);
setDead(true);
}
abortAttack();

22
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java
View File

@@ -411,7 +411,7 @@ public abstract class Summon extends Playable
if (isSpawned() && !isDead())
{
// Prevent adding effects while unsummoning.
setIsInvul(true);
setInvul(true);
abortAttack();
abortCast();
@@ -488,9 +488,9 @@ public abstract class Summon extends Playable
_attackRange = (range < 36) ? 36 : range;
}
public void setFollowStatus(boolean state)
public void setFollowStatus(boolean value)
{
_follow = state;
_follow = value;
if (_follow)
{
getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner);
@@ -528,7 +528,7 @@ public abstract class Summon extends Playable
return null;
}
public void setRestoreSummon(boolean val)
public void setRestoreSummon(boolean value)
{
}
@@ -701,9 +701,9 @@ public abstract class Summon extends Playable
}
@Override
public void setIsImmobilized(boolean value)
public void setImmobilized(boolean value)
{
super.setIsImmobilized(value);
super.setImmobilized(value);
if (value)
{
@@ -817,18 +817,18 @@ public abstract class Summon extends Playable
return _owner;
}
public void updateAndBroadcastStatus(int val)
public void updateAndBroadcastStatus(int value)
{
if (_owner == null)
{
return;
}
sendPacket(new PetInfo(this, val));
sendPacket(new PetInfo(this, value));
sendPacket(new PetStatusUpdate(this));
if (isSpawned())
{
broadcastNpcInfo(val);
broadcastNpcInfo(value);
}
final Party party = _owner.getParty();
if (party != null)
@@ -837,7 +837,7 @@ public abstract class Summon extends Playable
}
}
public void broadcastNpcInfo(int val)
public void broadcastNpcInfo(int value)
{
World.getInstance().forEachVisibleObject(this, PlayerInstance.class, player ->
{
@@ -846,7 +846,7 @@ public abstract class Summon extends Playable
return;
}
player.sendPacket(new ExPetInfo(this, player, val));
player.sendPacket(new ExPetInfo(this, player, value));
});
}

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Tower.java
View File

@@ -31,7 +31,7 @@ public abstract class Tower extends Npc
public Tower(NpcTemplate template)
{
super(template);
setIsInvul(false);
setInvul(false);
}
@Override

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Vehicle.java
View File

@@ -60,7 +60,7 @@ public abstract class Vehicle extends Creature
{
super(template);
setInstanceType(InstanceType.Vehicle);
setIsFlying(true);
setFlying(true);
}
public boolean isBoat()
@@ -343,7 +343,7 @@ public abstract class Vehicle extends Creature
stopMove(null);
}
setIsTeleporting(true);
setTeleporting(true);
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);

1
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/ControllableMobInstance.java
View File

@@ -66,6 +66,7 @@ public class ControllableMobInstance extends MonsterInstance
return _isInvul;
}
@Override
public void setInvul(boolean isInvul)
{
_isInvul = isInvul;

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DecoyInstance.java
View File

@@ -49,7 +49,7 @@ public class DecoyInstance extends Creature
setInstanceType(InstanceType.DecoyInstance);
_owner = owner;
setXYZInvisible(owner.getX(), owner.getY(), owner.getZ());
setIsInvul(false);
setInvul(false);
_totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime;
final int hateSpamSkillId = 5272;

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java
View File

@@ -99,7 +99,7 @@ public class DefenderInstance extends Attackable
}
if (!isInsideRadius2D(getSpawn(), 40))
{
setisReturningToSpawnPoint(true);
setReturningToSpawnPoint(true);
clearAggroList();
if (hasAI())

16
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java
View File

@@ -61,7 +61,7 @@ public class DoorInstance extends Creature
{
super(template);
setInstanceType(InstanceType.DoorInstance);
setIsInvul(false);
setInvul(false);
setLethalable(false);
_open = template.isOpenByDefault();
_isAttackableDoor = template.isAttackable();
@@ -224,7 +224,7 @@ public class DoorInstance extends Creature
}
}
public boolean getIsAttackableDoor()
public boolean isAttackableDoor()
{
return _isAttackableDoor;
}
@@ -234,14 +234,14 @@ public class DoorInstance extends Creature
return _isInverted;
}
public boolean getIsShowHp()
public boolean isShowHp()
{
return getTemplate().isShowHp();
}
public void setIsAttackableDoor(boolean val)
public void setIsAttackableDoor(boolean value)
{
_isAttackableDoor = val;
_isAttackableDoor = value;
}
public int getDamage()
@@ -274,11 +274,11 @@ public class DoorInstance extends Creature
public boolean isEnemy()
{
if ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getZone().isActive() && getIsShowHp())
if ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getZone().isActive() && isShowHp())
{
return true;
}
else if ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getZone().isActive() && getIsShowHp())
else if ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getZone().isActive() && isShowHp())
{
return true;
}
@@ -297,7 +297,7 @@ public class DoorInstance extends Creature
{
return true;
}
else if (!getIsShowHp())
else if (!isShowHp())
{
return false;
}

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/EffectPointInstance.java
View File

@@ -32,7 +32,7 @@ public class EffectPointInstance extends Npc
{
super(template);
setInstanceType(InstanceType.EffectPointInstance);
setIsInvul(false);
setInvul(false);
_owner = owner == null ? null : owner.getActingPlayer();
if (owner != null)
{

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java
View File

@@ -36,17 +36,17 @@ public class FishermanInstance extends MerchantInstance
}
@Override
public String getHtmlPath(int npcId, int val, PlayerInstance player)
public String getHtmlPath(int npcId, int value, PlayerInstance player)
{
String pom = "";
if (val == 0)
if (value == 0)
{
pom = Integer.toString(npcId);
}
else
{
pom = npcId + "-" + val;
pom = npcId + "-" + value;
}
return "data/html/fisherman/" + pom + ".htm";

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FlameTowerInstance.java
View File

@@ -54,7 +54,7 @@ public class FlameTowerInstance extends Tower
return super.deleteMe();
}
public void enableZones(boolean state)
public void enableZones(boolean value)
{
if ((_zoneList != null) && (_upgradeLevel != 0))
{
@@ -64,7 +64,7 @@ public class FlameTowerInstance extends Tower
final ZoneType zone = ZoneManager.getInstance().getZoneById(_zoneList.get(i));
if (zone != null)
{
zone.setEnabled(state);
zone.setEnabled(value);
}
}
}

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FlyTerrainObjectInstance.java
View File

@@ -27,7 +27,7 @@ public class FlyTerrainObjectInstance extends Npc
{
super(template);
setInstanceType(InstanceType.FlyTerrainObjectInstance);
setIsFlying(true);
setFlying(true);
}
@Override

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
View File

@@ -97,7 +97,7 @@ public class FortCommanderInstance extends DefenderInstance
{
if (!isInsideRadius2D(getSpawn(), 200))
{
setisReturningToSpawnPoint(true);
setReturningToSpawnPoint(true);
clearAggroList();
if (hasAI())
@@ -162,9 +162,9 @@ public class FortCommanderInstance extends DefenderInstance
}
}
void setCanTalk(boolean val)
void setCanTalk(boolean value)
{
_canTalk = val;
_canTalk = value;
}
private boolean canTalk()

12
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortLogisticsInstance.java
View File

@@ -182,19 +182,19 @@ public class FortLogisticsInstance extends MerchantInstance
showMessageWindow(player, 0);
}
private void showMessageWindow(PlayerInstance player, int val)
private void showMessageWindow(PlayerInstance player, int value)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
String filename;
if (val == 0)
if (value == 0)
{
filename = "data/html/fortress/logistics.htm";
}
else
{
filename = "data/html/fortress/logistics-" + val + ".htm";
filename = "data/html/fortress/logistics-" + value + ".htm";
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
@@ -213,17 +213,17 @@ public class FortLogisticsInstance extends MerchantInstance
}
@Override
public String getHtmlPath(int npcId, int val, PlayerInstance player)
public String getHtmlPath(int npcId, int value, PlayerInstance player)
{
String pom = "";
if (val == 0)
if (value == 0)
{
pom = "logistics";
}
else
{
pom = "logistics-" + val;
pom = "logistics-" + value;
}
return "data/html/fortress/" + pom + ".htm";

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java
View File

@@ -57,9 +57,9 @@ public class FriendlyNpcInstance extends Attackable
}
@Override
public void setAutoAttackable(boolean state)
public void setAutoAttackable(boolean value)
{
_isAutoAttackable = state;
_isAutoAttackable = value;
}
@Override
@@ -149,16 +149,16 @@ public class FriendlyNpcInstance extends Attackable
}
@Override
public String getHtmlPath(int npcId, int val, PlayerInstance player)
public String getHtmlPath(int npcId, int value, PlayerInstance player)
{
String pom = "";
if (val == 0)
if (value == 0)
{
pom = Integer.toString(npcId);
}
else
{
pom = npcId + "-" + val;
pom = npcId + "-" + value;
}
return "data/html/default/" + pom + ".htm";
}

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/GrandBossInstance.java
View File

@@ -58,9 +58,9 @@ public class GrandBossInstance extends MonsterInstance
return false;
}
public void setUseRaidCurse(boolean val)
public void setUseRaidCurse(boolean value)
{
_useRaidCurse = val;
_useRaidCurse = value;
}
@Override

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
View File

@@ -106,19 +106,19 @@ public class GuardInstance extends Attackable
* <li>if page number > 0 : <B>data/html/guard/12006-1.htm</B> (npcId-page number)</li>
* </ul>
* @param npcId The Identifier of the NpcInstance whose text must be display
* @param val The number of the page to display
* @param value The number of the page to display
*/
@Override
public String getHtmlPath(int npcId, int val, PlayerInstance player)
public String getHtmlPath(int npcId, int value, PlayerInstance player)
{
String pom = "";
if (val == 0)
if (value == 0)
{
pom = Integer.toString(npcId);
}
else
{
pom = npcId + "-" + val;
pom = npcId + "-" + value;
}
return "data/html/guard/" + pom + ".htm";
}

18
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java
View File

@@ -49,38 +49,38 @@ public class MerchantInstance extends NpcInstance
}
@Override
public String getHtmlPath(int npcId, int val, PlayerInstance player)
public String getHtmlPath(int npcId, int value, PlayerInstance player)
{
String pom;
if (val == 0)
if (value == 0)
{
pom = Integer.toString(npcId);
}
else
{
pom = npcId + "-" + val;
pom = npcId + "-" + value;
}
return "data/html/merchant/" + pom + ".htm";
}
public void showBuyWindow(PlayerInstance player, int val)
public void showBuyWindow(PlayerInstance player, int value)
{
showBuyWindow(player, val, true);
showBuyWindow(player, value, true);
}
public void showBuyWindow(PlayerInstance player, int val, boolean applyCastleTax)
public void showBuyWindow(PlayerInstance player, int value, boolean applyCastleTax)
{
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;
}
if (!buyList.isNpcAllowed(getId()))
{
LOGGER.warning("Npc not allowed in BuyList! BuyListId:" + val + " NpcId:" + getId());
LOGGER.warning("Npc not allowed in BuyList! BuyListId:" + value + " NpcId:" + getId());
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/MonsterInstance.java
View File

@@ -150,9 +150,9 @@ public class MonsterInstance extends Attackable
_master = leader;
}
public void enableMinions(boolean b)
public void enableMinions(boolean value)
{
_enableMinions = b;
_enableMinions = value;
}
public boolean hasMinions()

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
View File

@@ -37,7 +37,7 @@ public class NpcInstance extends Npc
{
super(template);
setInstanceType(InstanceType.NpcInstance);
setIsInvul(false);
setInvul(false);
}
@Override

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/ObservationInstance.java
View File

@@ -34,28 +34,28 @@ public class ObservationInstance extends Npc
}
@Override
public void showChatWindow(PlayerInstance player, int val)
public void showChatWindow(PlayerInstance player, int value)
{
String filename = null;
if (isInsideRadius2D(-79884, 86529, 0, 50) || isInsideRadius2D(-78858, 111358, 0, 50) || isInsideRadius2D(-76973, 87136, 0, 50) || isInsideRadius2D(-75850, 111968, 0, 50))
{
if (val == 0)
if (value == 0)
{
filename = "data/html/observation/" + getId() + "-Oracle.htm";
}
else
{
filename = "data/html/observation/" + getId() + "-Oracle-" + val + ".htm";
filename = "data/html/observation/" + getId() + "-Oracle-" + value + ".htm";
}
}
else if (val == 0)
else if (value == 0)
{
filename = "data/html/observation/" + getId() + ".htm";
}
else
{
filename = "data/html/observation/" + getId() + "-" + val + ".htm";
filename = "data/html/observation/" + getId() + "-" + value + ".htm";
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());

14
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
View File

@@ -875,7 +875,7 @@ public class PetInstance extends Summon
pet.getStatus().setCurrentCp(pet.getMaxCp());
if (rset.getDouble("curHp") < 1)
{
pet.setIsDead(true);
pet.setDead(true);
pet.stopHpMpRegeneration();
}
@@ -891,9 +891,9 @@ public class PetInstance extends Summon
}
@Override
public void setRestoreSummon(boolean val)
public void setRestoreSummon(boolean value)
{
_restoreSummon = val;
_restoreSummon = value;
}
@Override
@@ -1302,22 +1302,22 @@ public class PetInstance extends Summon
if (newWeightPenalty > 0)
{
addSkill(SkillData.getInstance().getSkill(4270, newWeightPenalty));
setIsOverloaded(getCurrentLoad() >= maxLoad);
setOverloaded(getCurrentLoad() >= maxLoad);
}
else
{
removeSkill(getKnownSkill(4270), true);
setIsOverloaded(false);
setOverloaded(false);
}
}
}
}
@Override
public void updateAndBroadcastStatus(int val)
public void updateAndBroadcastStatus(int value)
{
refreshOverloaded();
super.updateAndBroadcastStatus(val);
super.updateAndBroadcastStatus(value);
}
@Override

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PetManagerInstance.java
View File

@@ -30,17 +30,17 @@ public class PetManagerInstance extends MerchantInstance
}
@Override
public String getHtmlPath(int npcId, int val, PlayerInstance player)
public String getHtmlPath(int npcId, int value, PlayerInstance player)
{
String pom = "";
if (val == 0)
if (value == 0)
{
pom = Integer.toString(npcId);
}
else
{
pom = npcId + "-" + val;
pom = npcId + "-" + value;
}
return "data/html/petmanager/" + pom + ".htm";

182
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -259,10 +259,10 @@ import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.skills.SkillCaster;
import org.l2jmobius.gameserver.model.skills.SkillCastingType;
import org.l2jmobius.gameserver.model.skills.targets.TargetType;
import org.l2jmobius.gameserver.model.stats.BaseStats;
import org.l2jmobius.gameserver.model.stats.BaseStat;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.MoveType;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.model.variables.AccountVariables;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.model.zone.ZoneId;
@@ -600,7 +600,7 @@ public class PlayerInstance extends Playable
/** Hennas */
private final Henna[] _henna = new Henna[4];
private final Map<BaseStats, Integer> _hennaBaseStats = new ConcurrentHashMap<>();
private final Map<BaseStat, Integer> _hennaBaseStats = new ConcurrentHashMap<>();
private final Map<Integer, ScheduledFuture<?>> _hennaRemoveSchedules = new ConcurrentHashMap<>(4);
/** The Pet of the PlayerInstance */
@@ -865,9 +865,9 @@ public class PlayerInstance extends Playable
return _isSellingBuffs;
}
public void setIsSellingBuffs(boolean val)
public void setSellingBuffs(boolean value)
{
_isSellingBuffs = val;
_isSellingBuffs = value;
}
public List<SellBuffHolder> getSellingBuffs()
@@ -1263,7 +1263,7 @@ public class PlayerInstance extends Playable
return _isCrafting;
}
public void setIsCrafting(boolean isCrafting)
public void setCrafting(boolean isCrafting)
{
_isCrafting = isCrafting;
}
@@ -1643,16 +1643,16 @@ public class PlayerInstance extends Playable
/**
* Set the siege Side of the PlayerInstance.
* @param val
* @param value
*/
public void setSiegeSide(int val)
public void setSiegeSide(int value)
{
_siegeSide = val;
_siegeSide = value;
}
public boolean isRegisteredOnThisSiegeField(int val)
public boolean isRegisteredOnThisSiegeField(int value)
{
return (_siegeSide != val) && ((_siegeSide < 81) || (_siegeSide > 89));
return (_siegeSide != value) && ((_siegeSide < 81) || (_siegeSide > 89));
}
public int getSiegeSide()
@@ -2106,12 +2106,12 @@ public class PlayerInstance extends Playable
if ((newWeightPenalty > 0) && !_dietMode)
{
addSkill(SkillData.getInstance().getSkill(CommonSkill.WEIGHT_PENALTY.getId(), newWeightPenalty));
setIsOverloaded(getCurrentLoad() > maxLoad);
setOverloaded(getCurrentLoad() > maxLoad);
}
else
{
removeSkill(getKnownSkill(4270), false, true);
setIsOverloaded(false);
setOverloaded(false);
}
if (broadcast)
{
@@ -2725,9 +2725,9 @@ public class PlayerInstance extends Playable
}
/* Enable or disable minimap on Hellbound */
public void setMinimapAllowed(boolean b)
public void setMinimapAllowed(boolean value)
{
_minimapAllowed = b;
_minimapAllowed = value;
}
/**
@@ -2861,11 +2861,11 @@ public class PlayerInstance extends Playable
/**
* Set _waitTypeSitting to given value
* @param state
* @param value
*/
public void setIsSitting(boolean state)
public void setSitting(boolean value)
{
_waitTypeSitting = state;
_waitTypeSitting = value;
}
/**
@@ -2887,7 +2887,7 @@ public class PlayerInstance extends Playable
if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing())
{
breakAttack();
setIsSitting(true);
setSitting(true);
getAI().setIntention(CtrlIntention.AI_INTENTION_REST);
broadcastPacket(new ChangeWaitType(this, ChangeWaitType.WT_SITTING));
// Schedule a sit down task to wait for the animation to finish
@@ -5370,15 +5370,15 @@ public class PlayerInstance extends Playable
{
if (killer.isRaid())
{
percentLost *= getStat().getValue(Stats.REDUCE_EXP_LOST_BY_RAID, 1);
percentLost *= getStat().getValue(Stat.REDUCE_EXP_LOST_BY_RAID, 1);
}
else if (killer.isMonster())
{
percentLost *= getStat().getValue(Stats.REDUCE_EXP_LOST_BY_MOB, 1);
percentLost *= getStat().getValue(Stat.REDUCE_EXP_LOST_BY_MOB, 1);
}
else if (killer.isPlayable())
{
percentLost *= getStat().getValue(Stats.REDUCE_EXP_LOST_BY_PVP, 1);
percentLost *= getStat().getValue(Stat.REDUCE_EXP_LOST_BY_PVP, 1);
}
}
@@ -6758,7 +6758,7 @@ public class PlayerInstance extends Playable
if (currentHp < 0.5)
{
player.setIsDead(true);
player.setDead(true);
player.stopHpMpRegeneration();
}
@@ -6890,7 +6890,7 @@ public class PlayerInstance extends Playable
{
final SubClass subClass = new SubClass();
subClass.setClassId(rset.getInt("class_id"));
subClass.setIsDualClass(rset.getBoolean("dual_class"));
subClass.setDualClassActive(rset.getBoolean("dual_class"));
subClass.setVitalityPoints(rset.getInt("vitality_points"));
subClass.setLevel(rset.getByte("level"));
subClass.setExp(rset.getLong("exp"));
@@ -8034,7 +8034,7 @@ public class PlayerInstance extends Playable
continue;
}
for (Entry<BaseStats, Integer> entry : henna.getBaseStats().entrySet())
for (Entry<BaseStat, Integer> entry : henna.getBaseStats().entrySet())
{
_hennaBaseStats.merge(entry.getKey(), entry.getValue(), Integer::sum);
}
@@ -8081,7 +8081,7 @@ public class PlayerInstance extends Playable
* @param stat
* @return the henna bonus of specified base stat
*/
public int getHennaValue(BaseStats stat)
public int getHennaValue(BaseStat stat)
{
return _hennaBaseStats.getOrDefault(stat, 0);
}
@@ -8089,7 +8089,7 @@ public class PlayerInstance extends Playable
/**
* @return map of all henna base stats bonus
*/
public Map<BaseStats, Integer> getHennaBaseStats()
public Map<BaseStat, Integer> getHennaBaseStats()
{
return _hennaBaseStats;
}
@@ -8605,7 +8605,7 @@ public class PlayerInstance extends Playable
{
case NONE: // None
{
setIsFlying(false);
setFlying(false);
break;
}
case STRIDER: // Strider
@@ -8618,7 +8618,7 @@ public class PlayerInstance extends Playable
}
case WYVERN: // Wyvern
{
setIsFlying(true);
setFlying(true);
break;
}
}
@@ -8702,12 +8702,12 @@ public class PlayerInstance extends Playable
/**
* Disable the Inventory and create a new task to enable it after 1.5s.
* @param val
* @param value
*/
public void setInventoryBlockingStatus(boolean val)
public void setInventoryBlockingStatus(boolean value)
{
_inventoryDisable = val;
if (val)
_inventoryDisable = value;
if (value)
{
ThreadPool.schedule(new InventoryEnableTask(this), 1500);
}
@@ -8997,14 +8997,14 @@ public class PlayerInstance extends Playable
sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
}
public void setObserving(boolean state)
public void setObserving(boolean value)
{
_observerMode = state;
_observerMode = value;
setTarget(null);
setBlockActions(state);
setIsInvul(state);
setInvisible(state);
if (hasAI() && !state)
setBlockActions(value);
setInvul(value);
setInvisible(value);
if (hasAI() && !value)
{
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
@@ -9074,7 +9074,7 @@ public class PlayerInstance extends Playable
_observerMode = true;
setTarget(null);
setIsInvul(true);
setInvul(true);
setInvisible(true);
setInstance(OlympiadGameManager.getInstance().getOlympiadTask(id).getStadium().getInstance());
teleToLocation(loc, false);
@@ -9095,7 +9095,7 @@ public class PlayerInstance extends Playable
if (!isGM())
{
setInvisible(false);
setIsInvul(false);
setInvul(false);
}
if (hasAI())
{
@@ -9123,7 +9123,7 @@ public class PlayerInstance extends Playable
if (!isGM())
{
setInvisible(false);
setIsInvul(false);
setInvul(false);
}
if (hasAI())
{
@@ -9173,9 +9173,9 @@ public class PlayerInstance extends Playable
_teleportType = type;
}
public void setRace(int i, int val)
public void setRace(int i, int value)
{
_race[i] = val;
_race[i] = value;
}
public int getRace(int i)
@@ -9286,14 +9286,14 @@ public class PlayerInstance extends Playable
sendSkillList();
}
public void setIsInOlympiadMode(boolean b)
public void setInOlympiadMode(boolean value)
{
_inOlympiadMode = b;
_inOlympiadMode = value;
}
public void setIsOlympiadStart(boolean b)
public void setOlympiadStart(boolean value)
{
_OlympiadStart = b;
_OlympiadStart = value;
}
public boolean isOlympiadStart()
@@ -9340,7 +9340,7 @@ public class PlayerInstance extends Playable
* Sets up the duel state using a non 0 duelId.
* @param duelId 0=not in a duel
*/
public void setIsInDuel(int duelId)
public void setInDuel(int duelId)
{
if (duelId > 0)
{
@@ -9561,7 +9561,7 @@ public class PlayerInstance extends Playable
newClass.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS);
if (isDualClass)
{
newClass.setIsDualClass(true);
newClass.setDualClassActive(true);
newClass.setExp(ExperienceData.getInstance().getExpForLevel(Config.BASE_DUALCLASS_LEVEL));
newClass.setLevel(Config.BASE_DUALCLASS_LEVEL);
}
@@ -9722,11 +9722,11 @@ public class PlayerInstance extends Playable
return isInCategory(CategoryType.SIXTH_CLASS_GROUP);
}
public void setDualClass(int classIndex)
public void setDualClassActive(int classIndex)
{
if (isSubClassActive())
{
getSubClasses().get(_classIndex).setIsDualClass(true);
getSubClasses().get(_classIndex).setDualClassActive(true);
}
}
@@ -10037,7 +10037,7 @@ public class PlayerInstance extends Playable
{
if (!isDead() && (_taskWater == null))
{
final int timeinwater = (int) getStat().getValue(Stats.BREATH, 60000);
final int timeinwater = (int) getStat().getValue(Stat.BREATH, 60000);
sendPacket(new SetupGauge(getObjectId(), 2, timeinwater));
_taskWater = ThreadPool.scheduleAtFixedRate(new WaterTask(this), timeinwater, 1000);
@@ -10397,14 +10397,14 @@ public class PlayerInstance extends Playable
}
@Override
public void setIsTeleporting(boolean teleport)
public void setTeleporting(boolean teleport)
{
setIsTeleporting(teleport, true);
setTeleporting(teleport, true);
}
public void setIsTeleporting(boolean teleport, boolean useWatchDog)
public void setTeleporting(boolean teleport, boolean useWatchDog)
{
super.setIsTeleporting(teleport);
super.setTeleporting(teleport);
if (!useWatchDog)
{
return;
@@ -10852,7 +10852,7 @@ public class PlayerInstance extends Playable
try
{
setIsTeleporting(false);
setTeleporting(false);
}
catch (Exception e)
{
@@ -11149,7 +11149,7 @@ public class PlayerInstance extends Playable
{
ivlim = Config.INVENTORY_MAXIMUM_NO_DWARF;
}
ivlim += (int) getStat().getValue(Stats.INVENTORY_NORMAL, 0);
ivlim += (int) getStat().getValue(Stat.INVENTORY_NORMAL, 0);
return ivlim;
}
@@ -11166,7 +11166,7 @@ public class PlayerInstance extends Playable
whlim = Config.WAREHOUSE_SLOTS_NO_DWARF;
}
whlim += (int) getStat().getValue(Stats.STORAGE_PRIVATE, 0);
whlim += (int) getStat().getValue(Stat.STORAGE_PRIVATE, 0);
return whlim;
}
@@ -11184,7 +11184,7 @@ public class PlayerInstance extends Playable
pslim = Config.MAX_PVTSTORESELL_SLOTS_OTHER;
}
pslim += (int) getStat().getValue(Stats.TRADE_SELL, 0);
pslim += (int) getStat().getValue(Stat.TRADE_SELL, 0);
return pslim;
}
@@ -11201,7 +11201,7 @@ public class PlayerInstance extends Playable
{
pblim = Config.MAX_PVTSTOREBUY_SLOTS_OTHER;
}
pblim += (int) getStat().getValue(Stats.TRADE_BUY, 0);
pblim += (int) getStat().getValue(Stat.TRADE_BUY, 0);
return pblim;
}
@@ -11209,14 +11209,14 @@ public class PlayerInstance extends Playable
public int getDwarfRecipeLimit()
{
int recdlim = Config.DWARF_RECIPE_LIMIT;
recdlim += (int) getStat().getValue(Stats.RECIPE_DWARVEN, 0);
recdlim += (int) getStat().getValue(Stat.RECIPE_DWARVEN, 0);
return recdlim;
}
public int getCommonRecipeLimit()
{
int recclim = Config.COMMON_RECIPE_LIMIT;
recclim += (int) getStat().getValue(Stats.RECIPE_COMMON, 0);
recclim += (int) getStat().getValue(Stat.RECIPE_COMMON, 0);
return recclim;
}
@@ -11459,15 +11459,15 @@ public class PlayerInstance extends Playable
if (killer.isRaid())
{
percent *= getStat().getValue(Stats.REDUCE_DEATH_PENALTY_BY_RAID, 1);
percent *= getStat().getValue(Stat.REDUCE_DEATH_PENALTY_BY_RAID, 1);
}
else if (killer.isMonster())
{
percent *= getStat().getValue(Stats.REDUCE_DEATH_PENALTY_BY_MOB, 1);
percent *= getStat().getValue(Stat.REDUCE_DEATH_PENALTY_BY_MOB, 1);
}
else if (killer.isPlayable())
{
percent *= getStat().getValue(Stats.REDUCE_DEATH_PENALTY_BY_PVP, 1);
percent *= getStat().getValue(Stat.REDUCE_DEATH_PENALTY_BY_PVP, 1);
}
if ((killer.isNpc() && ((Npc) killer).getTemplate().isDeathPenalty()) || (Rnd.get(1, 100) <= ((Config.DEATH_PENALTY_CHANCE) * percent)))
@@ -11904,9 +11904,9 @@ public class PlayerInstance extends Playable
}
}
public void setIsInSiege(boolean b)
public void setInSiege(boolean value)
{
_isInSiege = b;
_isInSiege = value;
}
public boolean isInSiege()
@@ -11917,7 +11917,7 @@ public class PlayerInstance extends Playable
/**
* @param isInHideoutSiege sets the value of {@link #_isInHideoutSiege}.
*/
public void setIsInHideoutSiege(boolean isInHideoutSiege)
public void setInHideoutSiege(boolean isInHideoutSiege)
{
_isInHideoutSiege = isInHideoutSiege;
}
@@ -12611,24 +12611,24 @@ public class PlayerInstance extends Playable
return _clientHeading;
}
public void setClientX(int val)
public void setClientX(int value)
{
_clientX = val;
_clientX = value;
}
public void setClientY(int val)
public void setClientY(int value)
{
_clientY = val;
_clientY = value;
}
public void setClientZ(int val)
public void setClientZ(int value)
{
_clientZ = val;
_clientZ = value;
}
public void setClientHeading(int val)
public void setClientHeading(int value)
{
_clientHeading = val;
_clientHeading = value;
}
/**
@@ -13058,9 +13058,9 @@ public class PlayerInstance extends Playable
return _recoTwoHoursGiven;
}
public void setRecoTwoHoursGiven(boolean val)
public void setRecoTwoHoursGiven(boolean value)
{
_recoTwoHoursGiven = val;
_recoTwoHoursGiven = value;
}
public void setPremiumStatus(boolean premiumStatus)
@@ -13175,12 +13175,12 @@ public class PlayerInstance extends Playable
/**
* This method can prevent from displaying 'To Village' button upon death.
* @param val
* @param value
*/
@Override
public void setCanRevive(boolean val)
public void setCanRevive(boolean value)
{
_canRevive = val;
_canRevive = value;
}
public boolean isOnCustomEvent()
@@ -13350,11 +13350,11 @@ public class PlayerInstance extends Playable
/**
* Set true/false if character got Charm of Courage
* @param val true/false
* @param value true/false
*/
public void setCharmOfCourage(boolean val)
public void setCharmOfCourage(boolean value)
{
_hasCharmOfCourage = val;
_hasCharmOfCourage = value;
}
/**
@@ -13515,7 +13515,7 @@ public class PlayerInstance extends Playable
*/
public int getWorldChatPoints()
{
return (int) getStat().getValue(Stats.WORLD_CHAT_POINTS, Config.WORLD_CHAT_POINTS_PER_DAY);
return (int) getStat().getValue(Stat.WORLD_CHAT_POINTS, Config.WORLD_CHAT_POINTS_PER_DAY);
}
/**
@@ -13583,7 +13583,7 @@ public class PlayerInstance extends Playable
*/
public int getMaxSummonPoints()
{
return (int) getStat().getValue(Stats.MAX_SUMMON_POINTS, 0);
return (int) getStat().getValue(Stat.MAX_SUMMON_POINTS, 0);
}
/**
@@ -13907,9 +13907,9 @@ public class PlayerInstance extends Playable
return _trueHero;
}
public void setTrueHero(boolean val)
public void setTrueHero(boolean value)
{
_trueHero = val;
_trueHero = value;
}
public int getFactionPoints(Faction faction)
@@ -13970,7 +13970,7 @@ public class PlayerInstance extends Playable
public boolean tryLuck()
{
if (((Rnd.nextDouble() * 100) < (BaseStats.LUC.getValue(getLUC()) * Config.LUCKY_CHANCE_MULTIPLIER)) && !hasSkillReuse(CommonSkill.LUCKY_CLOVER.getSkill().getReuseHashCode()))
if (((Rnd.nextDouble() * 100) < (BaseStat.LUC.getValue(getLUC()) * Config.LUCKY_CHANCE_MULTIPLIER)) && !hasSkillReuse(CommonSkill.LUCKY_CLOVER.getSkill().getReuseHashCode()))
{
SkillCaster.triggerCast(this, this, CommonSkill.LUCKY_CLOVER.getSkill());
sendPacket(SystemMessageId.LADY_LUCK_SMILES_UPON_YOU);

20
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/RaceManagerInstance.java
View File

@@ -387,7 +387,7 @@ public class RaceManagerInstance extends Npc
player.sendPacket(ActionFailed.STATIC_PACKET);
}
public void showBuyTicket(PlayerInstance player, int val)
public void showBuyTicket(PlayerInstance player, int value)
{
if (_state != ACCEPTING_BETS)
{
@@ -399,7 +399,7 @@ public class RaceManagerInstance extends Npc
String search;
String replace;
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
if (val < 10)
if (value < 10)
{
filename = getHtmlPath(npcId, 2, player);
html.setFile(player, filename);
@@ -410,17 +410,17 @@ public class RaceManagerInstance extends Npc
html.replace(search, MonsterRace.getInstance().getMonsters()[i].getTemplate().getName());
}
search = "No1";
if (val == 0)
if (value == 0)
{
html.replace(search, "");
}
else
{
html.replace(search, Integer.toString(val));
player.setRace(0, val);
html.replace(search, Integer.toString(value));
player.setRace(0, value);
}
}
else if (val < 20)
else if (value < 20)
{
if (player.getRace(0) == 0)
{
@@ -433,17 +433,17 @@ public class RaceManagerInstance extends Npc
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
html.replace(search, replace);
search = "0adena";
if (val == 10)
if (value == 10)
{
html.replace(search, "");
}
else
{
html.replace(search, Integer.toString(_cost[val - 11]));
player.setRace(1, val - 10);
html.replace(search, Integer.toString(_cost[value - 11]));
player.setRace(1, value - 10);
}
}
else if (val == 20)
else if (value == 20)
{
if ((player.getRace(0) == 0) || (player.getRace(1) == 0))
{

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/RaidBossInstance.java
View File

@@ -67,9 +67,9 @@ public class RaidBossInstance extends MonsterInstance
return Config.RAIDBOSS_USE_VITALITY;
}
public void setUseRaidCurse(boolean val)
public void setUseRaidCurse(boolean value)
{
_useRaidCurse = val;
_useRaidCurse = value;
}
@Override

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/ServitorInstance.java
View File

@@ -226,9 +226,9 @@ public class ServitorInstance extends Summon implements Runnable
}
@Override
public void setRestoreSummon(boolean val)
public void setRestoreSummon(boolean value)
{
_restoreSummon = val;
_restoreSummon = value;
}
@Override

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java
View File

@@ -66,7 +66,7 @@ public class SiegeFlagInstance extends Npc
sc.addFlag(this);
_isAdvanced = advanced;
getStatus();
setIsInvul(false);
setInvul(false);
}
@Override
@@ -177,9 +177,9 @@ public class SiegeFlagInstance extends Npc
}
}
void setCanTalk(boolean val)
void setCanTalk(boolean value)
{
_canTalk = val;
_canTalk = value;
}
private boolean canTalk()

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java
View File

@@ -169,10 +169,10 @@ public class TeleporterInstance extends Npc
}
@Override
public String getHtmlPath(int npcId, int val, PlayerInstance player)
public String getHtmlPath(int npcId, int value, PlayerInstance player)
{
String pom;
if (val == 0)
if (value == 0)
{
pom = String.valueOf(npcId);
if ((player != null) && QUEST_RECOMENDATIONS.containsKey(npcId))
@@ -196,7 +196,7 @@ public class TeleporterInstance extends Npc
}
else
{
pom = (npcId + "-" + val);
pom = (npcId + "-" + value);
}
return "data/html/teleporter/" + pom + ".htm";
}

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
View File

@@ -68,7 +68,7 @@ public class TrapInstance extends Npc
setInstanceType(InstanceType.TrapInstance);
setInstanceById(instanceId);
setName(template.getName());
setIsInvul(false);
setInvul(false);
_owner = null;
_isTriggered = false;
_skill = getParameters().getObject("trap_skill", SkillHolder.class);
@@ -364,9 +364,9 @@ public class TrapInstance extends Npc
return _hasLifeTime;
}
public void setHasLifeTime(boolean val)
public void setHasLifeTime(boolean value)
{
_hasLifeTime = val;
_hasLifeTime = value;
}
public int getRemainingTime()

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@@ -74,17 +74,17 @@ public class VillageMasterInstance extends NpcInstance
}
@Override
public String getHtmlPath(int npcId, int val, PlayerInstance player)
public String getHtmlPath(int npcId, int value, PlayerInstance player)
{
String pom = "";
if (val == 0)
if (value == 0)
{
pom = Integer.toString(npcId);
}
else
{
pom = npcId + "-" + val;
pom = npcId + "-" + value;
}
return "data/html/villagemaster/" + pom + ".htm";

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java
View File

@@ -46,17 +46,17 @@ public class WarehouseInstance extends NpcInstance
}
@Override
public String getHtmlPath(int npcId, int val, PlayerInstance player)
public String getHtmlPath(int npcId, int value, PlayerInstance player)
{
String pom = "";
if (val == 0)
if (value == 0)
{
pom = Integer.toString(npcId);
}
else
{
pom = npcId + "-" + val;
pom = npcId + "-" + value;
}
return "data/html/warehouse/" + pom + ".htm";

198
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.skills.SkillConditionScope;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.MoveType;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.StatsHolder;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.model.stats.StatHolder;
import org.l2jmobius.gameserver.model.stats.TraitType;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.util.MathUtil;
@@ -61,16 +61,16 @@ public class CreatureStat
private int _maxBuffCount = Config.BUFFS_MAX_AMOUNT;
private double _vampiricSum = 0;
private final Map<Stats, Double> _statsAdd = new EnumMap<>(Stats.class);
private final Map<Stats, Double> _statsMul = new EnumMap<>(Stats.class);
private final Map<Stats, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
private final Map<Integer, LinkedList<Double>> _skillEvasionStat = new ConcurrentHashMap<>();
private final Map<Stats, Map<Position, Double>> _positionStats = new ConcurrentHashMap<>();
private final Deque<StatsHolder> _additionalAdd = new ConcurrentLinkedDeque<>();
private final Deque<StatsHolder> _additionalMul = new ConcurrentLinkedDeque<>();
private final Map<Stats, Double> _fixedValue = new ConcurrentHashMap<>();
private final Map<Stat, Map<Position, Double>> _positionStats = new ConcurrentHashMap<>();
private final Deque<StatHolder> _additionalAdd = new ConcurrentLinkedDeque<>();
private final Deque<StatHolder> _additionalMul = new ConcurrentLinkedDeque<>();
private final Map<Stat, Double> _fixedValue = new ConcurrentHashMap<>();
private final float[] _attackTraitValues = new float[TraitType.values().length];
private final float[] _defenceTraitValues = new float[TraitType.values().length];
@@ -99,22 +99,22 @@ public class CreatureStat
*/
public int getAccuracy()
{
return (int) getValue(Stats.ACCURACY_COMBAT);
return (int) getValue(Stat.ACCURACY_COMBAT);
}
public int getCpRegen()
{
return (int) getValue(Stats.REGENERATE_CP_RATE);
return (int) getValue(Stat.REGENERATE_CP_RATE);
}
public int getHpRegen()
{
return (int) getValue(Stats.REGENERATE_HP_RATE);
return (int) getValue(Stat.REGENERATE_HP_RATE);
}
public int getMpRegen()
{
return (int) getValue(Stats.REGENERATE_MP_RATE);
return (int) getValue(Stat.REGENERATE_MP_RATE);
}
/**
@@ -122,7 +122,7 @@ public class CreatureStat
*/
public int getMagicAccuracy()
{
return (int) getValue(Stats.ACCURACY_MAGIC);
return (int) getValue(Stat.ACCURACY_MAGIC);
}
public Creature getActiveChar()
@@ -148,7 +148,7 @@ public class CreatureStat
*/
public int getCON()
{
return (int) getValue(Stats.STAT_CON);
return (int) getValue(Stat.STAT_CON);
}
/**
@@ -157,7 +157,7 @@ public class CreatureStat
*/
public double getCriticalDmg(double init)
{
return getValue(Stats.CRITICAL_DAMAGE, init);
return getValue(Stat.CRITICAL_DAMAGE, init);
}
/**
@@ -165,7 +165,7 @@ public class CreatureStat
*/
public int getCriticalHit()
{
return (int) getValue(Stats.CRITICAL_RATE);
return (int) getValue(Stat.CRITICAL_RATE);
}
/**
@@ -173,7 +173,7 @@ public class CreatureStat
*/
public int getDEX()
{
return (int) getValue(Stats.STAT_DEX);
return (int) getValue(Stat.STAT_DEX);
}
/**
@@ -181,7 +181,7 @@ public class CreatureStat
*/
public int getEvasionRate()
{
return (int) getValue(Stats.EVASION_RATE);
return (int) getValue(Stat.EVASION_RATE);
}
/**
@@ -189,7 +189,7 @@ public class CreatureStat
*/
public int getMagicEvasionRate()
{
return (int) getValue(Stats.MAGIC_EVASION_RATE);
return (int) getValue(Stat.MAGIC_EVASION_RATE);
}
public long getExp()
@@ -207,7 +207,7 @@ public class CreatureStat
*/
public int getINT()
{
return (int) getValue(Stats.STAT_INT);
return (int) getValue(Stat.STAT_INT);
}
public byte getLevel()
@@ -228,7 +228,7 @@ public class CreatureStat
{
if (skill != null)
{
return (int) getValue(Stats.MAGIC_ATTACK_RANGE, skill.getCastRange());
return (int) getValue(Stat.MAGIC_ATTACK_RANGE, skill.getCastRange());
}
return _creature.getTemplate().getBaseAttackRange();
@@ -236,32 +236,32 @@ public class CreatureStat
public int getMaxCp()
{
return (int) getValue(Stats.MAX_CP);
return (int) getValue(Stat.MAX_CP);
}
public int getMaxRecoverableCp()
{
return (int) getValue(Stats.MAX_RECOVERABLE_CP, getMaxCp());
return (int) getValue(Stat.MAX_RECOVERABLE_CP, getMaxCp());
}
public int getMaxHp()
{
return (int) getValue(Stats.MAX_HP);
return (int) getValue(Stat.MAX_HP);
}
public int getMaxRecoverableHp()
{
return (int) getValue(Stats.MAX_RECOVERABLE_HP, getMaxHp());
return (int) getValue(Stat.MAX_RECOVERABLE_HP, getMaxHp());
}
public int getMaxMp()
{
return (int) getValue(Stats.MAX_MP);
return (int) getValue(Stat.MAX_MP);
}
public int getMaxRecoverableMp()
{
return (int) getValue(Stats.MAX_RECOVERABLE_MP, getMaxMp());
return (int) getValue(Stat.MAX_RECOVERABLE_MP, getMaxMp());
}
/**
@@ -271,7 +271,7 @@ public class CreatureStat
*/
public int getMAtk()
{
return (int) getValue(Stats.MAGIC_ATTACK);
return (int) getValue(Stat.MAGIC_ATTACK);
}
/**
@@ -279,7 +279,7 @@ public class CreatureStat
*/
public int getMAtkSpd()
{
return (int) getValue(Stats.MAGIC_ATTACK_SPEED);
return (int) getValue(Stat.MAGIC_ATTACK_SPEED);
}
/**
@@ -287,7 +287,7 @@ public class CreatureStat
*/
public int getMCriticalHit()
{
return (int) getValue(Stats.MAGIC_CRITICAL_RATE);
return (int) getValue(Stat.MAGIC_CRITICAL_RATE);
}
/**
@@ -296,7 +296,7 @@ public class CreatureStat
*/
public int getMDef()
{
return (int) getValue(Stats.MAGICAL_DEFENCE);
return (int) getValue(Stat.MAGICAL_DEFENCE);
}
/**
@@ -304,17 +304,17 @@ public class CreatureStat
*/
public int getMEN()
{
return (int) getValue(Stats.STAT_MEN);
return (int) getValue(Stat.STAT_MEN);
}
public int getLUC()
{
return (int) getValue(Stats.STAT_LUC);
return (int) getValue(Stat.STAT_LUC);
}
public int getCHA()
{
return (int) getValue(Stats.STAT_CHA);
return (int) getValue(Stat.STAT_CHA);
}
public double getMovementSpeedMultiplier()
@@ -322,11 +322,11 @@ public class CreatureStat
double baseSpeed;
if (_creature.isInsideZone(ZoneId.WATER))
{
baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stats.SWIM_RUN_SPEED : Stats.SWIM_WALK_SPEED, 0);
baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.SWIM_RUN_SPEED : Stat.SWIM_WALK_SPEED, 0);
}
else
{
baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stats.RUN_SPEED : Stats.WALK_SPEED, 0);
baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.RUN_SPEED : Stat.WALK_SPEED, 0);
}
return getMoveSpeed() * (1. / baseSpeed);
}
@@ -336,7 +336,7 @@ public class CreatureStat
*/
public double getRunSpeed()
{
return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stats.SWIM_RUN_SPEED : Stats.RUN_SPEED);
return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED);
}
/**
@@ -344,7 +344,7 @@ public class CreatureStat
*/
public double getWalkSpeed()
{
return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stats.SWIM_WALK_SPEED : Stats.WALK_SPEED);
return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED);
}
/**
@@ -352,7 +352,7 @@ public class CreatureStat
*/
public double getSwimRunSpeed()
{
return getValue(Stats.SWIM_RUN_SPEED);
return getValue(Stat.SWIM_RUN_SPEED);
}
/**
@@ -360,7 +360,7 @@ public class CreatureStat
*/
public double getSwimWalkSpeed()
{
return getValue(Stats.SWIM_WALK_SPEED);
return getValue(Stat.SWIM_WALK_SPEED);
}
/**
@@ -380,7 +380,7 @@ public class CreatureStat
*/
public int getPAtk()
{
return (int) getValue(Stats.PHYSICAL_ATTACK);
return (int) getValue(Stat.PHYSICAL_ATTACK);
}
/**
@@ -388,7 +388,7 @@ public class CreatureStat
*/
public int getPAtkSpd()
{
return (int) getValue(Stats.PHYSICAL_ATTACK_SPEED);
return (int) getValue(Stat.PHYSICAL_ATTACK_SPEED);
}
/**
@@ -396,7 +396,7 @@ public class CreatureStat
*/
public int getPDef()
{
return (int) getValue(Stats.PHYSICAL_DEFENCE);
return (int) getValue(Stat.PHYSICAL_DEFENCE);
}
/**
@@ -404,7 +404,7 @@ public class CreatureStat
*/
public int getPhysicalAttackRange()
{
return (int) getValue(Stats.PHYSICAL_ATTACK_RANGE);
return (int) getValue(Stat.PHYSICAL_ATTACK_RANGE);
}
public int getPhysicalAttackRadius()
@@ -422,7 +422,7 @@ public class CreatureStat
*/
public double getWeaponReuseModifier()
{
return getValue(Stats.ATK_REUSE, 1);
return getValue(Stat.ATK_REUSE, 1);
}
/**
@@ -430,7 +430,7 @@ public class CreatureStat
*/
public int getShldDef()
{
return (int) getValue(Stats.SHIELD_DEFENCE);
return (int) getValue(Stat.SHIELD_DEFENCE);
}
public long getSp()
@@ -448,7 +448,7 @@ public class CreatureStat
*/
public int getSTR()
{
return (int) getValue(Stats.STAT_STR);
return (int) getValue(Stat.STAT_STR);
}
/**
@@ -456,7 +456,7 @@ public class CreatureStat
*/
public int getWIT()
{
return (int) getValue(Stats.STAT_WIT);
return (int) getValue(Stat.STAT_WIT);
}
/**
@@ -534,27 +534,27 @@ public class CreatureStat
{
case FIRE:
{
return (int) getValue(Stats.FIRE_POWER);
return (int) getValue(Stat.FIRE_POWER);
}
case WATER:
{
return (int) getValue(Stats.WATER_POWER);
return (int) getValue(Stat.WATER_POWER);
}
case WIND:
{
return (int) getValue(Stats.WIND_POWER);
return (int) getValue(Stat.WIND_POWER);
}
case EARTH:
{
return (int) getValue(Stats.EARTH_POWER);
return (int) getValue(Stat.EARTH_POWER);
}
case HOLY:
{
return (int) getValue(Stats.HOLY_POWER);
return (int) getValue(Stat.HOLY_POWER);
}
case DARK:
{
return (int) getValue(Stats.DARK_POWER);
return (int) getValue(Stat.DARK_POWER);
}
default:
{
@@ -569,31 +569,31 @@ public class CreatureStat
{
case FIRE:
{
return (int) getValue(Stats.FIRE_RES);
return (int) getValue(Stat.FIRE_RES);
}
case WATER:
{
return (int) getValue(Stats.WATER_RES);
return (int) getValue(Stat.WATER_RES);
}
case WIND:
{
return (int) getValue(Stats.WIND_RES);
return (int) getValue(Stat.WIND_RES);
}
case EARTH:
{
return (int) getValue(Stats.EARTH_RES);
return (int) getValue(Stat.EARTH_RES);
}
case HOLY:
{
return (int) getValue(Stats.HOLY_RES);
return (int) getValue(Stat.HOLY_RES);
}
case DARK:
{
return (int) getValue(Stats.DARK_RES);
return (int) getValue(Stat.DARK_RES);
}
default:
{
return (int) getValue(Stats.BASE_ATTRIBUTE_RES);
return (int) getValue(Stat.BASE_ATTRIBUTE_RES);
}
}
}
@@ -772,28 +772,28 @@ public class CreatureStat
/**
* Merges the stat's value with the values within the map of adds
* @param stat
* @param val
* @param value
*/
public void mergeAdd(Stats stat, double val)
public void mergeAdd(Stat stat, double value)
{
_statsAdd.merge(stat, val, stat::functionAdd);
_statsAdd.merge(stat, value, stat::functionAdd);
}
/**
* Merges the stat's value with the values within the map of muls
* @param stat
* @param val
* @param value
*/
public void mergeMul(Stats stat, double val)
public void mergeMul(Stat stat, double value)
{
_statsMul.merge(stat, val, stat::functionMul);
_statsMul.merge(stat, value, stat::functionMul);
}
/**
* @param stat
* @return the add value
*/
public double getAdd(Stats stat)
public double getAdd(Stat stat)
{
return getAdd(stat, 0d);
}
@@ -803,7 +803,7 @@ public class CreatureStat
* @param defaultValue
* @return the add value
*/
public double getAdd(Stats stat, double defaultValue)
public double getAdd(Stat stat, double defaultValue)
{
_lock.readLock().lock();
try
@@ -820,7 +820,7 @@ public class CreatureStat
* @param stat
* @return the mul value
*/
public double getMul(Stats stat)
public double getMul(Stat stat)
{
return getMul(stat, 1d);
}
@@ -830,7 +830,7 @@ public class CreatureStat
* @param defaultValue
* @return the mul value
*/
public double getMul(Stats stat, double defaultValue)
public double getMul(Stat stat, double defaultValue)
{
_lock.readLock().lock();
try
@@ -848,7 +848,7 @@ public class CreatureStat
* @param baseValue
* @return the final value of the stat
*/
public double getValue(Stats stat, double baseValue)
public double getValue(Stat stat, double baseValue)
{
final Double fixedValue = _fixedValue.get(stat);
return fixedValue != null ? fixedValue : stat.finalize(_creature, OptionalDouble.of(baseValue));
@@ -858,7 +858,7 @@ public class CreatureStat
* @param stat
* @return the final value of the stat
*/
public double getValue(Stats stat)
public double getValue(Stat stat)
{
final Double fixedValue = _fixedValue.get(stat);
return fixedValue != null ? fixedValue : stat.finalize(_creature, OptionalDouble.empty());
@@ -871,7 +871,7 @@ public class CreatureStat
_vampiricSum = 0;
// Initialize default values
for (Stats stat : Stats.values())
for (Stat stat : Stat.values())
{
if (stat.getResetAddValue() != 0)
{
@@ -891,8 +891,8 @@ public class CreatureStat
public void recalculateStats(boolean broadcast)
{
// Copy old data before wiping it out
final Map<Stats, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
final Map<Stats, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
_lock.writeLock().lock();
try
@@ -945,8 +945,8 @@ public class CreatureStat
if (broadcast)
{
// Calculate the difference between old and new stats
final Set<Stats> changed = new HashSet<>();
for (Stats stat : Stats.values())
final Set<Stat> changed = new HashSet<>();
for (Stat stat : Stat.values())
{
if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()) != adds.getOrDefault(stat, stat.getResetAddValue()))
{
@@ -979,22 +979,22 @@ public class CreatureStat
}
}
public double getPositionTypeValue(Stats stat, Position position)
public double getPositionTypeValue(Stat stat, Position position)
{
return _positionStats.getOrDefault(stat, Collections.emptyMap()).getOrDefault(position, 1d);
}
public void mergePositionTypeValue(Stats stat, Position position, double value, BiFunction<? super Double, ? super Double, ? extends Double> func)
public void mergePositionTypeValue(Stat stat, Position position, double value, BiFunction<? super Double, ? super Double, ? extends Double> func)
{
_positionStats.computeIfAbsent(stat, key -> new ConcurrentHashMap<>()).merge(position, value, func);
}
public double getMoveTypeValue(Stats stat, MoveType type)
public double getMoveTypeValue(Stat stat, MoveType type)
{
return _moveTypeStats.getOrDefault(stat, Collections.emptyMap()).getOrDefault(type, 0d);
}
public void mergeMoveTypeValue(Stats stat, MoveType type, double value)
public void mergeMoveTypeValue(Stat stat, MoveType type, double value)
{
_moveTypeStats.computeIfAbsent(stat, key -> new ConcurrentHashMap<>()).merge(type, value, MathUtil::add);
}
@@ -1078,9 +1078,9 @@ public class CreatureStat
* @param condition
* @return
*/
public boolean addAdditionalStat(Stats stat, double value, BiPredicate<Creature, StatsHolder> condition)
public boolean addAdditionalStat(Stat stat, double value, BiPredicate<Creature, StatHolder> condition)
{
return _additionalAdd.add(new StatsHolder(stat, value, condition));
return _additionalAdd.add(new StatHolder(stat, value, condition));
}
/**
@@ -1089,9 +1089,9 @@ public class CreatureStat
* @param value
* @return
*/
public boolean addAdditionalStat(Stats stat, double value)
public boolean addAdditionalStat(Stat stat, double value)
{
return _additionalAdd.add(new StatsHolder(stat, value));
return _additionalAdd.add(new StatHolder(stat, value));
}
/**
@@ -1099,12 +1099,12 @@ public class CreatureStat
* @param value
* @return {@code true} if 'add' was removed, {@code false} in case there wasn't such stat and value
*/
public boolean removeAddAdditionalStat(Stats stat, double value)
public boolean removeAddAdditionalStat(Stat stat, double value)
{
final Iterator<StatsHolder> it = _additionalAdd.iterator();
final Iterator<StatHolder> it = _additionalAdd.iterator();
while (it.hasNext())
{
final StatsHolder holder = it.next();
final StatHolder holder = it.next();
if ((holder.getStat() == stat) && (holder.getValue() == value))
{
it.remove();
@@ -1121,9 +1121,9 @@ public class CreatureStat
* @param condition
* @return
*/
public boolean mulAdditionalStat(Stats stat, double value, BiPredicate<Creature, StatsHolder> condition)
public boolean mulAdditionalStat(Stat stat, double value, BiPredicate<Creature, StatHolder> condition)
{
return _additionalMul.add(new StatsHolder(stat, value, condition));
return _additionalMul.add(new StatHolder(stat, value, condition));
}
/**
@@ -1132,9 +1132,9 @@ public class CreatureStat
* @param value
* @return {@code true}
*/
public boolean mulAdditionalStat(Stats stat, double value)
public boolean mulAdditionalStat(Stat stat, double value)
{
return _additionalMul.add(new StatsHolder(stat, value));
return _additionalMul.add(new StatHolder(stat, value));
}
/**
@@ -1142,12 +1142,12 @@ public class CreatureStat
* @param value
* @return {@code true} if 'mul' was removed, {@code false} in case there wasn't such stat and value
*/
public boolean removeMulAdditionalStat(Stats stat, double value)
public boolean removeMulAdditionalStat(Stat stat, double value)
{
final Iterator<StatsHolder> it = _additionalMul.iterator();
final Iterator<StatHolder> it = _additionalMul.iterator();
while (it.hasNext())
{
final StatsHolder holder = it.next();
final StatHolder holder = it.next();
if ((holder.getStat() == stat) && (holder.getValue() == value))
{
it.remove();
@@ -1162,7 +1162,7 @@ public class CreatureStat
* @param value
* @return true if the there wasn't previously set fixed value, {@code false} otherwise
*/
public boolean addFixedValue(Stats stat, Double value)
public boolean addFixedValue(Stat stat, Double value)
{
return _fixedValue.put(stat, value) == null;
}
@@ -1171,7 +1171,7 @@ public class CreatureStat
* @param stat
* @return {@code true} if fixed value is removed, {@code false} otherwise
*/
public boolean removeFixedValue(Stats stat)
public boolean removeFixedValue(Stat stat)
{
return _fixedValue.remove(stat) != null;
}

12
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
View File

@@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.model.skills.AbnormalType;
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.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillList;
@@ -480,7 +480,7 @@ public class PlayerStat extends PlayableStat
public double getVitalityExpBonus()
{
return (getVitalityPoints() > 0) ? getValue(Stats.VITALITY_EXP_RATE, Config.RATE_VITALITY_EXP_MULTIPLIER) : 1.0;
return (getVitalityPoints() > 0) ? getValue(Stat.VITALITY_EXP_RATE, Config.RATE_VITALITY_EXP_MULTIPLIER) : 1.0;
}
public void setVitalityPoints(int value)
@@ -555,7 +555,7 @@ public class PlayerStat extends PlayableStat
if (points < 0) // vitality consumed
{
final int stat = (int) getValue(Stats.VITALITY_CONSUME_RATE, 1);
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
if (stat == 0)
{
@@ -606,7 +606,7 @@ public class PlayerStat extends PlayableStat
vitality = getVitalityExpBonus();
// Bonus exp from skills
bonusExp = 1 + (getValue(Stats.BONUS_EXP, 0) / 100);
bonusExp = 1 + (getValue(Stat.BONUS_EXP, 0) / 100);
if (vitality > 1.0)
{
@@ -638,7 +638,7 @@ public class PlayerStat extends PlayableStat
vitality = getVitalityExpBonus();
// Bonus sp from skills
bonusSp = 1 + (getValue(Stats.BONUS_SP, 0) / 100);
bonusSp = 1 + (getValue(Stat.BONUS_SP, 0) / 100);
if (vitality > 1.0)
{
@@ -666,7 +666,7 @@ public class PlayerStat extends PlayableStat
*/
public int getBroochJewelSlots()
{
return (int) getValue(Stats.BROOCH_JEWELS, 0);
return (int) getValue(Stat.BROOCH_JEWELS, 0);
}
@Override

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java
View File

@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange;
import org.l2jmobius.gameserver.model.skills.AbnormalType;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
public class CreatureStatus
{
@@ -388,8 +388,8 @@ public class CreatureStatus
// Modify the current HP/MP of the Creature and broadcast Server->Client packet StatusUpdate
if (!_creature.isDead() && ((_currentHp < _creature.getMaxRecoverableHp()) || (_currentMp < _creature.getMaxRecoverableMp())))
{
final double newHp = _currentHp + _creature.getStat().getValue(Stats.REGENERATE_HP_RATE);
final double newMp = _currentMp + _creature.getStat().getValue(Stats.REGENERATE_MP_RATE);
final double newHp = _currentHp + _creature.getStat().getValue(Stat.REGENERATE_HP_RATE);
final double newMp = _currentMp + _creature.getStat().getValue(Stat.REGENERATE_MP_RATE);
setCurrentHpMp(newHp, newMp);
}
else

16
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
View File

@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag;
import org.l2jmobius.gameserver.model.entity.Duel;
import org.l2jmobius.gameserver.model.skills.AbnormalType;
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.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -161,7 +161,7 @@ public class PlayerStatus extends PlayableStatus
final Summon summon = getActiveChar().getFirstServitor();
if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
{
tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stats.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
// Only transfer dmg up to current HP, it should not be killed
tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
@@ -173,7 +173,7 @@ public class PlayerStatus extends PlayableStatus
}
}
mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stats.MANA_SHIELD_PERCENT, 0)) / 100;
mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
if (mpDam > 0)
{
@@ -200,7 +200,7 @@ public class PlayerStatus extends PlayableStatus
{
int transferDmg = 0;
transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
if (transferDmg > 0)
{
@@ -315,7 +315,7 @@ public class PlayerStatus extends PlayableStatus
if (getActiveChar().isInOlympiadMode())
{
stopHpMpRegeneration();
getActiveChar().setIsDead(true);
getActiveChar().setDead(true);
getActiveChar().setIsPendingRevive(true);
final Summon pet = getActiveChar().getPet();
if (pet != null)
@@ -399,19 +399,19 @@ public class PlayerStatus extends PlayableStatus
// Modify the current CP of the Creature and broadcast Server->Client packet StatusUpdate
if (_currentCp < charstat.getMaxRecoverableCp())
{
setCurrentCp(_currentCp + getActiveChar().getStat().getValue(Stats.REGENERATE_CP_RATE), false);
setCurrentCp(_currentCp + getActiveChar().getStat().getValue(Stat.REGENERATE_CP_RATE), false);
}
// Modify the current HP of the Creature and broadcast Server->Client packet StatusUpdate
if (getCurrentHp() < charstat.getMaxRecoverableHp())
{
setCurrentHp(getCurrentHp() + getActiveChar().getStat().getValue(Stats.REGENERATE_HP_RATE), false);
setCurrentHp(getCurrentHp() + getActiveChar().getStat().getValue(Stat.REGENERATE_HP_RATE), false);
}
// Modify the current MP of the Creature and broadcast Server->Client packet StatusUpdate
if (getCurrentMp() < charstat.getMaxRecoverableMp())
{
setCurrentMp(getCurrentMp() + getActiveChar().getStat().getValue(Stats.REGENERATE_MP_RATE), false);
setCurrentMp(getCurrentMp() + getActiveChar().getStat().getValue(Stat.REGENERATE_MP_RATE), false);
}
getActiveChar().broadcastStatusUpdate(); // send the StatusUpdate packet

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
View File

@@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.entity.Duel;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.util.Util;
public class SummonStatus extends PlayableStatus
@@ -55,7 +55,7 @@ public class SummonStatus extends PlayableStatus
{
if ((caster != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && getActiveChar().getParty().getMembers().contains(caster))
{
int transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
int transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
if (transferDmg > 0)
{
@@ -89,7 +89,7 @@ public class SummonStatus extends PlayableStatus
}
else if ((caster != null) && (caster == getActiveChar().getOwner()) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead()) // when no party, transfer only to owner (caster)
{
int transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
int transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
if (transferDmg > 0)
{

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/StandUpTask.java
View File

@@ -37,7 +37,7 @@ public class StandUpTask implements Runnable
{
if (_player != null)
{
_player.setIsSitting(false);
_player.setSitting(false);
_player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}

184
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java
View File

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.events.ListenersContainer;
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;
/**
* Character template.
@@ -44,7 +44,7 @@ public class CreatureTemplate extends ListenersContainer
private double _fCollisionRadius;
private double _fCollisionHeight;
protected final Map<Stats, Double> _baseValues = new EnumMap<>(Stats.class);
protected final Map<Stat, Double> _baseValues = new EnumMap<>(Stat.class);
/** The creature's race. */
private Race _race;
@@ -57,65 +57,65 @@ public class CreatureTemplate extends ListenersContainer
public void set(StatsSet set)
{
// Base stats
_baseValues.put(Stats.STAT_STR, set.getDouble("baseSTR", 0));
_baseValues.put(Stats.STAT_CON, set.getDouble("baseCON", 0));
_baseValues.put(Stats.STAT_DEX, set.getDouble("baseDEX", 0));
_baseValues.put(Stats.STAT_INT, set.getDouble("baseINT", 0));
_baseValues.put(Stats.STAT_WIT, set.getDouble("baseWIT", 0));
_baseValues.put(Stats.STAT_MEN, set.getDouble("baseMEN", 0));
_baseValues.put(Stats.STAT_LUC, set.getDouble("baseLUC", 0));
_baseValues.put(Stats.STAT_CHA, set.getDouble("baseCHA", 0));
_baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0));
_baseValues.put(Stat.STAT_CON, set.getDouble("baseCON", 0));
_baseValues.put(Stat.STAT_DEX, set.getDouble("baseDEX", 0));
_baseValues.put(Stat.STAT_INT, set.getDouble("baseINT", 0));
_baseValues.put(Stat.STAT_WIT, set.getDouble("baseWIT", 0));
_baseValues.put(Stat.STAT_MEN, set.getDouble("baseMEN", 0));
_baseValues.put(Stat.STAT_LUC, set.getDouble("baseLUC", 0));
_baseValues.put(Stat.STAT_CHA, set.getDouble("baseCHA", 0));
// Max HP/MP/CP
_baseValues.put(Stats.MAX_HP, set.getDouble("baseHpMax", 0));
_baseValues.put(Stats.MAX_MP, set.getDouble("baseMpMax", 0));
_baseValues.put(Stats.MAX_CP, set.getDouble("baseCpMax", 0));
_baseValues.put(Stat.MAX_HP, set.getDouble("baseHpMax", 0));
_baseValues.put(Stat.MAX_MP, set.getDouble("baseMpMax", 0));
_baseValues.put(Stat.MAX_CP, set.getDouble("baseCpMax", 0));
// Regenerate HP/MP/CP
_baseValues.put(Stats.REGENERATE_HP_RATE, set.getDouble("baseHpReg", 0));
_baseValues.put(Stats.REGENERATE_MP_RATE, set.getDouble("baseMpReg", 0));
_baseValues.put(Stats.REGENERATE_CP_RATE, set.getDouble("baseCpReg", 0));
_baseValues.put(Stat.REGENERATE_HP_RATE, set.getDouble("baseHpReg", 0));
_baseValues.put(Stat.REGENERATE_MP_RATE, set.getDouble("baseMpReg", 0));
_baseValues.put(Stat.REGENERATE_CP_RATE, set.getDouble("baseCpReg", 0));
// Attack and Defense
_baseValues.put(Stats.PHYSICAL_ATTACK, set.getDouble("basePAtk", 0));
_baseValues.put(Stats.MAGIC_ATTACK, set.getDouble("baseMAtk", 0));
_baseValues.put(Stats.PHYSICAL_DEFENCE, set.getDouble("basePDef", 0));
_baseValues.put(Stats.MAGICAL_DEFENCE, set.getDouble("baseMDef", 0));
_baseValues.put(Stat.PHYSICAL_ATTACK, set.getDouble("basePAtk", 0));
_baseValues.put(Stat.MAGIC_ATTACK, set.getDouble("baseMAtk", 0));
_baseValues.put(Stat.PHYSICAL_DEFENCE, set.getDouble("basePDef", 0));
_baseValues.put(Stat.MAGICAL_DEFENCE, set.getDouble("baseMDef", 0));
// Attack speed
_baseValues.put(Stats.PHYSICAL_ATTACK_SPEED, set.getDouble("basePAtkSpd", 300));
_baseValues.put(Stats.MAGIC_ATTACK_SPEED, set.getDouble("baseMAtkSpd", 333));
_baseValues.put(Stat.PHYSICAL_ATTACK_SPEED, set.getDouble("basePAtkSpd", 300));
_baseValues.put(Stat.MAGIC_ATTACK_SPEED, set.getDouble("baseMAtkSpd", 333));
// Misc
_baseValues.put(Stats.SHIELD_DEFENCE, set.getDouble("baseShldDef", 0));
_baseValues.put(Stats.PHYSICAL_ATTACK_RANGE, set.getDouble("baseAtkRange", 40));
_baseValues.put(Stats.RANDOM_DAMAGE, set.getDouble("baseRndDam", 0));
_baseValues.put(Stat.SHIELD_DEFENCE, set.getDouble("baseShldDef", 0));
_baseValues.put(Stat.PHYSICAL_ATTACK_RANGE, set.getDouble("baseAtkRange", 40));
_baseValues.put(Stat.RANDOM_DAMAGE, set.getDouble("baseRndDam", 0));
// Shield and critical rates
_baseValues.put(Stats.SHIELD_DEFENCE_RATE, set.getDouble("baseShldRate", 0));
_baseValues.put(Stats.CRITICAL_RATE, set.getDouble("baseCritRate", 4));
_baseValues.put(Stats.MAGIC_CRITICAL_RATE, set.getDouble("baseMCritRate", 0));
_baseValues.put(Stat.SHIELD_DEFENCE_RATE, set.getDouble("baseShldRate", 0));
_baseValues.put(Stat.CRITICAL_RATE, set.getDouble("baseCritRate", 4));
_baseValues.put(Stat.MAGIC_CRITICAL_RATE, set.getDouble("baseMCritRate", 0));
// Breath under water
_baseValues.put(Stats.BREATH, set.getDouble("baseBreath", 100));
_baseValues.put(Stat.BREATH, set.getDouble("baseBreath", 100));
// Elemental Attributes
// Attack
_baseValues.put(Stats.FIRE_POWER, set.getDouble("baseFire", 0));
_baseValues.put(Stats.WIND_POWER, set.getDouble("baseWind", 0));
_baseValues.put(Stats.WATER_POWER, set.getDouble("baseWater", 0));
_baseValues.put(Stats.EARTH_POWER, set.getDouble("baseEarth", 0));
_baseValues.put(Stats.HOLY_POWER, set.getDouble("baseHoly", 0));
_baseValues.put(Stats.DARK_POWER, set.getDouble("baseDark", 0));
_baseValues.put(Stat.FIRE_POWER, set.getDouble("baseFire", 0));
_baseValues.put(Stat.WIND_POWER, set.getDouble("baseWind", 0));
_baseValues.put(Stat.WATER_POWER, set.getDouble("baseWater", 0));
_baseValues.put(Stat.EARTH_POWER, set.getDouble("baseEarth", 0));
_baseValues.put(Stat.HOLY_POWER, set.getDouble("baseHoly", 0));
_baseValues.put(Stat.DARK_POWER, set.getDouble("baseDark", 0));
// Defense
_baseValues.put(Stats.FIRE_RES, set.getDouble("baseFireRes", 0));
_baseValues.put(Stats.WIND_RES, set.getDouble("baseWindRes", 0));
_baseValues.put(Stats.WATER_RES, set.getDouble("baseWaterRes", 0));
_baseValues.put(Stats.EARTH_RES, set.getDouble("baseEarthRes", 0));
_baseValues.put(Stats.HOLY_RES, set.getDouble("baseHolyRes", 0));
_baseValues.put(Stats.DARK_RES, set.getDouble("baseDarkRes", 0));
_baseValues.put(Stats.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0));
_baseValues.put(Stat.FIRE_RES, set.getDouble("baseFireRes", 0));
_baseValues.put(Stat.WIND_RES, set.getDouble("baseWindRes", 0));
_baseValues.put(Stat.WATER_RES, set.getDouble("baseWaterRes", 0));
_baseValues.put(Stat.EARTH_RES, set.getDouble("baseEarthRes", 0));
_baseValues.put(Stat.HOLY_RES, set.getDouble("baseHolyRes", 0));
_baseValues.put(Stat.DARK_RES, set.getDouble("baseDarkRes", 0));
_baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0));
// Geometry
_fCollisionHeight = set.getDouble("collision_height", 0);
@@ -124,23 +124,23 @@ public class CreatureTemplate extends ListenersContainer
_collisionHeight = (int) _fCollisionHeight;
// Speed
_baseValues.put(Stats.RUN_SPEED, set.getDouble("baseRunSpd", 120));
_baseValues.put(Stats.WALK_SPEED, set.getDouble("baseWalkSpd", 50));
_baseValues.put(Stat.RUN_SPEED, set.getDouble("baseRunSpd", 120));
_baseValues.put(Stat.WALK_SPEED, set.getDouble("baseWalkSpd", 50));
// Swimming
_baseValues.put(Stats.SWIM_RUN_SPEED, set.getDouble("baseSwimRunSpd", 120));
_baseValues.put(Stats.SWIM_WALK_SPEED, set.getDouble("baseSwimWalkSpd", 50));
_baseValues.put(Stat.SWIM_RUN_SPEED, set.getDouble("baseSwimRunSpd", 120));
_baseValues.put(Stat.SWIM_WALK_SPEED, set.getDouble("baseSwimWalkSpd", 50));
// Flying
_baseValues.put(Stats.FLY_RUN_SPEED, set.getDouble("baseFlyRunSpd", 120));
_baseValues.put(Stats.FLY_WALK_SPEED, set.getDouble("baseFlyWalkSpd", 50));
_baseValues.put(Stat.FLY_RUN_SPEED, set.getDouble("baseFlyRunSpd", 120));
_baseValues.put(Stat.FLY_WALK_SPEED, set.getDouble("baseFlyWalkSpd", 50));
// Attack type
_baseAttackType = set.getEnum("baseAtkType", WeaponType.class, WeaponType.FIST);
// Basic property
_baseValues.put(Stats.ABNORMAL_RESIST_PHYSICAL, set.getDouble("physicalAbnormalResist", 10));
_baseValues.put(Stats.ABNORMAL_RESIST_MAGICAL, set.getDouble("magicAbnormalResist", 10));
_baseValues.put(Stat.ABNORMAL_RESIST_PHYSICAL, set.getDouble("physicalAbnormalResist", 10));
_baseValues.put(Stat.ABNORMAL_RESIST_MAGICAL, set.getDouble("magicAbnormalResist", 10));
}
/**
@@ -148,7 +148,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseSTR()
{
return _baseValues.getOrDefault(Stats.STAT_STR, 0d).intValue();
return _baseValues.getOrDefault(Stat.STAT_STR, 0d).intValue();
}
/**
@@ -156,7 +156,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseCON()
{
return _baseValues.getOrDefault(Stats.STAT_CON, 0d).intValue();
return _baseValues.getOrDefault(Stat.STAT_CON, 0d).intValue();
}
/**
@@ -164,7 +164,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseDEX()
{
return _baseValues.getOrDefault(Stats.STAT_DEX, 0d).intValue();
return _baseValues.getOrDefault(Stat.STAT_DEX, 0d).intValue();
}
/**
@@ -172,7 +172,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseINT()
{
return _baseValues.getOrDefault(Stats.STAT_INT, 0d).intValue();
return _baseValues.getOrDefault(Stat.STAT_INT, 0d).intValue();
}
/**
@@ -180,7 +180,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseWIT()
{
return _baseValues.getOrDefault(Stats.STAT_WIT, 0d).intValue();
return _baseValues.getOrDefault(Stat.STAT_WIT, 0d).intValue();
}
/**
@@ -188,7 +188,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseMEN()
{
return _baseValues.getOrDefault(Stats.STAT_MEN, 0d).intValue();
return _baseValues.getOrDefault(Stat.STAT_MEN, 0d).intValue();
}
/**
@@ -196,7 +196,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseLUC()
{
return _baseValues.getOrDefault(Stats.STAT_LUC, 0d).intValue();
return _baseValues.getOrDefault(Stat.STAT_LUC, 0d).intValue();
}
/**
@@ -204,7 +204,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseCHA()
{
return _baseValues.getOrDefault(Stats.STAT_CHA, 0d).intValue();
return _baseValues.getOrDefault(Stat.STAT_CHA, 0d).intValue();
}
/**
@@ -212,7 +212,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public float getBaseHpMax()
{
return _baseValues.getOrDefault(Stats.MAX_HP, 0d).floatValue();
return _baseValues.getOrDefault(Stat.MAX_HP, 0d).floatValue();
}
/**
@@ -220,7 +220,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public float getBaseCpMax()
{
return _baseValues.getOrDefault(Stats.MAX_CP, 0d).floatValue();
return _baseValues.getOrDefault(Stat.MAX_CP, 0d).floatValue();
}
/**
@@ -228,7 +228,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public float getBaseMpMax()
{
return _baseValues.getOrDefault(Stats.MAX_MP, 0d).floatValue();
return _baseValues.getOrDefault(Stat.MAX_MP, 0d).floatValue();
}
/**
@@ -236,7 +236,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public float getBaseHpReg()
{
return _baseValues.getOrDefault(Stats.REGENERATE_HP_RATE, 0d).floatValue();
return _baseValues.getOrDefault(Stat.REGENERATE_HP_RATE, 0d).floatValue();
}
/**
@@ -244,7 +244,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public float getBaseMpReg()
{
return _baseValues.getOrDefault(Stats.REGENERATE_MP_RATE, 0d).floatValue();
return _baseValues.getOrDefault(Stat.REGENERATE_MP_RATE, 0d).floatValue();
}
/**
@@ -252,7 +252,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseFire()
{
return _baseValues.getOrDefault(Stats.FIRE_POWER, 0d).intValue();
return _baseValues.getOrDefault(Stat.FIRE_POWER, 0d).intValue();
}
/**
@@ -260,7 +260,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseWind()
{
return _baseValues.getOrDefault(Stats.WIND_POWER, 0d).intValue();
return _baseValues.getOrDefault(Stat.WIND_POWER, 0d).intValue();
}
/**
@@ -268,7 +268,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseWater()
{
return _baseValues.getOrDefault(Stats.WATER_POWER, 0d).intValue();
return _baseValues.getOrDefault(Stat.WATER_POWER, 0d).intValue();
}
/**
@@ -276,7 +276,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseEarth()
{
return _baseValues.getOrDefault(Stats.EARTH_POWER, 0d).intValue();
return _baseValues.getOrDefault(Stat.EARTH_POWER, 0d).intValue();
}
/**
@@ -284,7 +284,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseHoly()
{
return _baseValues.getOrDefault(Stats.HOLY_POWER, 0d).intValue();
return _baseValues.getOrDefault(Stat.HOLY_POWER, 0d).intValue();
}
/**
@@ -292,7 +292,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseDark()
{
return _baseValues.getOrDefault(Stats.DARK_POWER, 0d).intValue();
return _baseValues.getOrDefault(Stat.DARK_POWER, 0d).intValue();
}
/**
@@ -300,7 +300,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public double getBaseFireRes()
{
return _baseValues.getOrDefault(Stats.FIRE_RES, 0d);
return _baseValues.getOrDefault(Stat.FIRE_RES, 0d);
}
/**
@@ -308,7 +308,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public double getBaseWindRes()
{
return _baseValues.getOrDefault(Stats.WIND_RES, 0d);
return _baseValues.getOrDefault(Stat.WIND_RES, 0d);
}
/**
@@ -316,7 +316,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public double getBaseWaterRes()
{
return _baseValues.getOrDefault(Stats.WATER_RES, 0d);
return _baseValues.getOrDefault(Stat.WATER_RES, 0d);
}
/**
@@ -324,7 +324,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public double getBaseEarthRes()
{
return _baseValues.getOrDefault(Stats.EARTH_RES, 0d);
return _baseValues.getOrDefault(Stat.EARTH_RES, 0d);
}
/**
@@ -332,7 +332,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public double getBaseHolyRes()
{
return _baseValues.getOrDefault(Stats.HOLY_RES, 0d);
return _baseValues.getOrDefault(Stat.HOLY_RES, 0d);
}
/**
@@ -340,7 +340,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public double getBaseDarkRes()
{
return _baseValues.getOrDefault(Stats.DARK_RES, 0d);
return _baseValues.getOrDefault(Stat.DARK_RES, 0d);
}
/**
@@ -348,7 +348,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public double getBaseElementRes()
{
return _baseValues.getOrDefault(Stats.BASE_ATTRIBUTE_RES, 0d);
return _baseValues.getOrDefault(Stat.BASE_ATTRIBUTE_RES, 0d);
}
/**
@@ -356,7 +356,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBasePAtk()
{
return _baseValues.getOrDefault(Stats.PHYSICAL_ATTACK, 0d).intValue();
return _baseValues.getOrDefault(Stat.PHYSICAL_ATTACK, 0d).intValue();
}
/**
@@ -364,7 +364,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseMAtk()
{
return _baseValues.getOrDefault(Stats.MAGIC_ATTACK, 0d).intValue();
return _baseValues.getOrDefault(Stat.MAGIC_ATTACK, 0d).intValue();
}
/**
@@ -372,7 +372,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBasePDef()
{
return _baseValues.getOrDefault(Stats.PHYSICAL_DEFENCE, 0d).intValue();
return _baseValues.getOrDefault(Stat.PHYSICAL_DEFENCE, 0d).intValue();
}
/**
@@ -380,7 +380,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseMDef()
{
return _baseValues.getOrDefault(Stats.MAGICAL_DEFENCE, 0d).intValue();
return _baseValues.getOrDefault(Stat.MAGICAL_DEFENCE, 0d).intValue();
}
/**
@@ -388,7 +388,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBasePAtkSpd()
{
return _baseValues.getOrDefault(Stats.PHYSICAL_ATTACK_SPEED, 0d).intValue();
return _baseValues.getOrDefault(Stat.PHYSICAL_ATTACK_SPEED, 0d).intValue();
}
/**
@@ -396,7 +396,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseMAtkSpd()
{
return _baseValues.getOrDefault(Stats.MAGIC_ATTACK_SPEED, 0d).intValue();
return _baseValues.getOrDefault(Stat.MAGIC_ATTACK_SPEED, 0d).intValue();
}
/**
@@ -404,7 +404,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getRandomDamage()
{
return _baseValues.getOrDefault(Stats.RANDOM_DAMAGE, 0d).intValue();
return _baseValues.getOrDefault(Stat.RANDOM_DAMAGE, 0d).intValue();
}
/**
@@ -412,7 +412,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseShldDef()
{
return _baseValues.getOrDefault(Stats.SHIELD_DEFENCE, 0d).intValue();
return _baseValues.getOrDefault(Stat.SHIELD_DEFENCE, 0d).intValue();
}
/**
@@ -420,7 +420,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseShldRate()
{
return _baseValues.getOrDefault(Stats.SHIELD_DEFENCE_RATE, 0d).intValue();
return _baseValues.getOrDefault(Stat.SHIELD_DEFENCE_RATE, 0d).intValue();
}
/**
@@ -428,7 +428,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseCritRate()
{
return _baseValues.getOrDefault(Stats.CRITICAL_RATE, 0d).intValue();
return _baseValues.getOrDefault(Stat.CRITICAL_RATE, 0d).intValue();
}
/**
@@ -436,7 +436,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseMCritRate()
{
return _baseValues.getOrDefault(Stats.MAGIC_CRITICAL_RATE, 0d).intValue();
return _baseValues.getOrDefault(Stat.MAGIC_CRITICAL_RATE, 0d).intValue();
}
/**
@@ -444,7 +444,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseBreath()
{
return _baseValues.getOrDefault(Stats.BREATH, 0d).intValue();
return _baseValues.getOrDefault(Stat.BREATH, 0d).intValue();
}
/**
@@ -452,7 +452,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseAbnormalResistPhysical()
{
return _baseValues.getOrDefault(Stats.ABNORMAL_RESIST_PHYSICAL, 0d).intValue();
return _baseValues.getOrDefault(Stat.ABNORMAL_RESIST_PHYSICAL, 0d).intValue();
}
/**
@@ -460,7 +460,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseAbnormalResistMagical()
{
return _baseValues.getOrDefault(Stats.ABNORMAL_RESIST_MAGICAL, 0d).intValue();
return _baseValues.getOrDefault(Stat.ABNORMAL_RESIST_MAGICAL, 0d).intValue();
}
/**
@@ -517,7 +517,7 @@ public class CreatureTemplate extends ListenersContainer
*/
public int getBaseAttackRange()
{
return _baseValues.getOrDefault(Stats.PHYSICAL_ATTACK_RANGE, 0d).intValue();
return _baseValues.getOrDefault(Stat.PHYSICAL_ATTACK_RANGE, 0d).intValue();
}
/**
@@ -552,7 +552,7 @@ public class CreatureTemplate extends ListenersContainer
* @param defaultValue
* @return
*/
public double getBaseValue(Stats stat, double defaultValue)
public double getBaseValue(Stat stat, double defaultValue)
{
return _baseValues.getOrDefault(stat, defaultValue);
}

56
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.interfaces.IIdentifiable;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.items.Item;
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.Util;
/**
@@ -223,12 +223,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{
case "Monster":
{
_baseValues.put(Stats.MAX_HP, getBaseHpMax() * Config.MONSTER_HP_MULTIPLIER);
_baseValues.put(Stats.MAX_MP, getBaseMpMax() * Config.MONSTER_MP_MULTIPLIER);
_baseValues.put(Stats.PHYSICAL_ATTACK, getBasePAtk() * Config.MONSTER_PATK_MULTIPLIER);
_baseValues.put(Stats.MAGIC_ATTACK, getBaseMAtk() * Config.MONSTER_MATK_MULTIPLIER);
_baseValues.put(Stats.PHYSICAL_DEFENCE, getBasePDef() * Config.MONSTER_PDEF_MULTIPLIER);
_baseValues.put(Stats.MAGICAL_DEFENCE, getBaseMDef() * Config.MONSTER_MDEF_MULTIPLIER);
_baseValues.put(Stat.MAX_HP, getBaseHpMax() * Config.MONSTER_HP_MULTIPLIER);
_baseValues.put(Stat.MAX_MP, getBaseMpMax() * Config.MONSTER_MP_MULTIPLIER);
_baseValues.put(Stat.PHYSICAL_ATTACK, getBasePAtk() * Config.MONSTER_PATK_MULTIPLIER);
_baseValues.put(Stat.MAGIC_ATTACK, getBaseMAtk() * Config.MONSTER_MATK_MULTIPLIER);
_baseValues.put(Stat.PHYSICAL_DEFENCE, getBasePDef() * Config.MONSTER_PDEF_MULTIPLIER);
_baseValues.put(Stat.MAGICAL_DEFENCE, getBaseMDef() * Config.MONSTER_MDEF_MULTIPLIER);
_aggroRange *= Config.MONSTER_AGRRO_RANGE_MULTIPLIER;
_clanHelpRange *= Config.MONSTER_CLAN_HELP_RANGE_MULTIPLIER;
break;
@@ -236,36 +236,36 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
case "RaidBoss":
case "GrandBoss":
{
_baseValues.put(Stats.MAX_HP, getBaseHpMax() * Config.RAIDBOSS_HP_MULTIPLIER);
_baseValues.put(Stats.MAX_MP, getBaseMpMax() * Config.RAIDBOSS_MP_MULTIPLIER);
_baseValues.put(Stats.PHYSICAL_ATTACK, getBasePAtk() * Config.RAIDBOSS_PATK_MULTIPLIER);
_baseValues.put(Stats.MAGIC_ATTACK, getBaseMAtk() * Config.RAIDBOSS_MATK_MULTIPLIER);
_baseValues.put(Stats.PHYSICAL_DEFENCE, getBasePDef() * Config.RAIDBOSS_PDEF_MULTIPLIER);
_baseValues.put(Stats.MAGICAL_DEFENCE, getBaseMDef() * Config.RAIDBOSS_MDEF_MULTIPLIER);
_baseValues.put(Stat.MAX_HP, getBaseHpMax() * Config.RAIDBOSS_HP_MULTIPLIER);
_baseValues.put(Stat.MAX_MP, getBaseMpMax() * Config.RAIDBOSS_MP_MULTIPLIER);
_baseValues.put(Stat.PHYSICAL_ATTACK, getBasePAtk() * Config.RAIDBOSS_PATK_MULTIPLIER);
_baseValues.put(Stat.MAGIC_ATTACK, getBaseMAtk() * Config.RAIDBOSS_MATK_MULTIPLIER);
_baseValues.put(Stat.PHYSICAL_DEFENCE, getBasePDef() * Config.RAIDBOSS_PDEF_MULTIPLIER);
_baseValues.put(Stat.MAGICAL_DEFENCE, getBaseMDef() * Config.RAIDBOSS_MDEF_MULTIPLIER);
_aggroRange *= Config.RAIDBOSS_AGRRO_RANGE_MULTIPLIER;
_clanHelpRange *= Config.RAIDBOSS_CLAN_HELP_RANGE_MULTIPLIER;
break;
}
case "Guard":
{
_baseValues.put(Stats.MAX_HP, getBaseHpMax() * Config.GUARD_HP_MULTIPLIER);
_baseValues.put(Stats.MAX_MP, getBaseMpMax() * Config.GUARD_MP_MULTIPLIER);
_baseValues.put(Stats.PHYSICAL_ATTACK, getBasePAtk() * Config.GUARD_PATK_MULTIPLIER);
_baseValues.put(Stats.MAGIC_ATTACK, getBaseMAtk() * Config.GUARD_MATK_MULTIPLIER);
_baseValues.put(Stats.PHYSICAL_DEFENCE, getBasePDef() * Config.GUARD_PDEF_MULTIPLIER);
_baseValues.put(Stats.MAGICAL_DEFENCE, getBaseMDef() * Config.GUARD_MDEF_MULTIPLIER);
_baseValues.put(Stat.MAX_HP, getBaseHpMax() * Config.GUARD_HP_MULTIPLIER);
_baseValues.put(Stat.MAX_MP, getBaseMpMax() * Config.GUARD_MP_MULTIPLIER);
_baseValues.put(Stat.PHYSICAL_ATTACK, getBasePAtk() * Config.GUARD_PATK_MULTIPLIER);
_baseValues.put(Stat.MAGIC_ATTACK, getBaseMAtk() * Config.GUARD_MATK_MULTIPLIER);
_baseValues.put(Stat.PHYSICAL_DEFENCE, getBasePDef() * Config.GUARD_PDEF_MULTIPLIER);
_baseValues.put(Stat.MAGICAL_DEFENCE, getBaseMDef() * Config.GUARD_MDEF_MULTIPLIER);
_aggroRange *= Config.GUARD_AGRRO_RANGE_MULTIPLIER;
_clanHelpRange *= Config.GUARD_CLAN_HELP_RANGE_MULTIPLIER;
break;
}
case "Defender":
{
_baseValues.put(Stats.MAX_HP, getBaseHpMax() * Config.DEFENDER_HP_MULTIPLIER);
_baseValues.put(Stats.MAX_MP, getBaseMpMax() * Config.DEFENDER_MP_MULTIPLIER);
_baseValues.put(Stats.PHYSICAL_ATTACK, getBasePAtk() * Config.DEFENDER_PATK_MULTIPLIER);
_baseValues.put(Stats.MAGIC_ATTACK, getBaseMAtk() * Config.DEFENDER_MATK_MULTIPLIER);
_baseValues.put(Stats.PHYSICAL_DEFENCE, getBasePDef() * Config.DEFENDER_PDEF_MULTIPLIER);
_baseValues.put(Stats.MAGICAL_DEFENCE, getBaseMDef() * Config.DEFENDER_MDEF_MULTIPLIER);
_baseValues.put(Stat.MAX_HP, getBaseHpMax() * Config.DEFENDER_HP_MULTIPLIER);
_baseValues.put(Stat.MAX_MP, getBaseMpMax() * Config.DEFENDER_MP_MULTIPLIER);
_baseValues.put(Stat.PHYSICAL_ATTACK, getBasePAtk() * Config.DEFENDER_PATK_MULTIPLIER);
_baseValues.put(Stat.MAGIC_ATTACK, getBaseMAtk() * Config.DEFENDER_MATK_MULTIPLIER);
_baseValues.put(Stat.PHYSICAL_DEFENCE, getBasePDef() * Config.DEFENDER_PDEF_MULTIPLIER);
_baseValues.put(Stat.MAGICAL_DEFENCE, getBaseMDef() * Config.DEFENDER_MDEF_MULTIPLIER);
_aggroRange *= Config.DEFENDER_AGRRO_RANGE_MULTIPLIER;
_clanHelpRange *= Config.DEFENDER_CLAN_HELP_RANGE_MULTIPLIER;
break;
@@ -856,7 +856,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
}
// bonus drop rate effect
rateChance *= killer.getStat().getValue(Stats.BONUS_DROP_RATE, 1);
rateChance *= killer.getStat().getValue(Stat.BONUS_DROP_RATE, 1);
// calculate if item will drop
if ((Rnd.nextDouble() * 100) < (dropItem.getChance() * rateChance))
@@ -906,7 +906,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
}
// bonus drop amount effect
rateAmount *= killer.getStat().getValue(Stats.BONUS_DROP_AMOUNT, 1);
rateAmount *= killer.getStat().getValue(Stat.BONUS_DROP_AMOUNT, 1);
// finally
return new ItemHolder(itemId, (long) (Rnd.get(dropItem.getMin(), dropItem.getMax()) * rateAmount));
@@ -932,7 +932,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
rateChance *= Config.PREMIUM_RATE_SPOIL_CHANCE;
}
// bonus drop rate effect
rateChance *= killer.getStat().getValue(Stats.BONUS_SPOIL_RATE, 1);
rateChance *= killer.getStat().getValue(Stat.BONUS_SPOIL_RATE, 1);
// calculate if item will be rewarded
if ((Rnd.nextDouble() * 100) < (dropItem.getChance() * rateChance))

16
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java
View File

@@ -104,40 +104,40 @@ public class PlayerTemplate extends CreatureTemplate
* Sets the value of level upgain parameter.
* @param paramName name of parameter
* @param level corresponding character level
* @param val value of parameter
* @param value value of parameter
*/
public void setUpgainValue(String paramName, int level, double val)
public void setUpgainValue(String paramName, int level, double value)
{
switch (paramName)
{
case "hp":
{
_baseHp[level] = (float) val;
_baseHp[level] = (float) value;
break;
}
case "mp":
{
_baseMp[level] = (float) val;
_baseMp[level] = (float) value;
break;
}
case "cp":
{
_baseCp[level] = (float) val;
_baseCp[level] = (float) value;
break;
}
case "hpRegen":
{
_baseHpReg[level] = val;
_baseHpReg[level] = value;
break;
}
case "mpRegen":
{
_baseMpReg[level] = val;
_baseMpReg[level] = value;
break;
}
case "cpRegen":
{
_baseCpReg[level] = val;
_baseCpReg[level] = value;
break;
}
}

12
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.interfaces.IIdentifiable;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.model.skills.AbnormalType;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot;
import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
@@ -244,7 +244,7 @@ public class Transform implements IIdentifiable
// Start flying.
if (isFlying())
{
creature.setIsFlying(true);
creature.setFlying(true);
}
// Get player a bit higher so he doesn't drops underground after transformation happens
@@ -356,7 +356,7 @@ public class Transform implements IIdentifiable
// Stop flying.
if (isFlying())
{
creature.setIsFlying(false);
creature.setFlying(false);
}
if (creature.isPlayer())
@@ -435,17 +435,17 @@ public class Transform implements IIdentifiable
return defaultAttackType;
}
public double getStats(Creature creature, Stats stats, double defaultValue)
public double getStats(Creature creature, Stat stat, double defaultValue)
{
double val = defaultValue;
final TransformTemplate template = getTemplate(creature);
if (template != null)
{
val = template.getStats(stats, defaultValue);
val = template.getStats(stat, defaultValue);
final TransformLevelData data = template.getData(creature.getLevel());
if (data != null)
{
val = data.getStats(stats, defaultValue);
val = data.getStats(stat, defaultValue);
}
}
return val;

22
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java
View File

@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author UnAfraid
@@ -35,26 +35,26 @@ public class TransformLevelData
{
_level = set.getInt("val");
_levelMod = set.getDouble("levelMod");
addStats(Stats.MAX_HP, set.getDouble("hp"));
addStats(Stats.MAX_MP, set.getDouble("mp"));
addStats(Stats.MAX_CP, set.getDouble("cp"));
addStats(Stats.REGENERATE_HP_RATE, set.getDouble("hpRegen"));
addStats(Stats.REGENERATE_MP_RATE, set.getDouble("mpRegen"));
addStats(Stats.REGENERATE_CP_RATE, set.getDouble("cpRegen"));
addStats(Stat.MAX_HP, set.getDouble("hp"));
addStats(Stat.MAX_MP, set.getDouble("mp"));
addStats(Stat.MAX_CP, set.getDouble("cp"));
addStats(Stat.REGENERATE_HP_RATE, set.getDouble("hpRegen"));
addStats(Stat.REGENERATE_MP_RATE, set.getDouble("mpRegen"));
addStats(Stat.REGENERATE_CP_RATE, set.getDouble("cpRegen"));
}
private void addStats(Stats stat, double val)
private void addStats(Stat stat, double value)
{
if (_stats == null)
{
_stats = new HashMap<>();
}
_stats.put(stat.ordinal(), val);
_stats.put(stat.ordinal(), value);
}
public double getStats(Stats stats, double defaultValue)
public double getStats(Stat stat, double defaultValue)
{
return _stats == null ? defaultValue : _stats.getOrDefault(stats.ordinal(), defaultValue);
return _stats == null ? defaultValue : _stats.getOrDefault(stat.ordinal(), defaultValue);
}
public int getLevel()

54
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
View File

@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.model.stats.Stats;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
/**
@@ -58,79 +58,79 @@ public class TransformTemplate
if (set.contains("range"))
{
addStats(Stats.PHYSICAL_ATTACK_RANGE, set.getDouble("range", 0));
addStats(Stat.PHYSICAL_ATTACK_RANGE, set.getDouble("range", 0));
}
if (set.contains("randomDamage"))
{
addStats(Stats.RANDOM_DAMAGE, set.getDouble("randomDamage", 0));
addStats(Stat.RANDOM_DAMAGE, set.getDouble("randomDamage", 0));
}
if (set.contains("walk"))
{
addStats(Stats.WALK_SPEED, set.getDouble("walk", 0));
addStats(Stat.WALK_SPEED, set.getDouble("walk", 0));
}
if (set.contains("run"))
{
addStats(Stats.RUN_SPEED, set.getDouble("run", 0));
addStats(Stat.RUN_SPEED, set.getDouble("run", 0));
}
if (set.contains("waterWalk"))
{
addStats(Stats.SWIM_WALK_SPEED, set.getDouble("waterWalk", 0));
addStats(Stat.SWIM_WALK_SPEED, set.getDouble("waterWalk", 0));
}
if (set.contains("waterRun"))
{
addStats(Stats.SWIM_RUN_SPEED, set.getDouble("waterRun", 0));
addStats(Stat.SWIM_RUN_SPEED, set.getDouble("waterRun", 0));
}
if (set.contains("flyWalk"))
{
addStats(Stats.FLY_WALK_SPEED, set.getDouble("flyWalk", 0));
addStats(Stat.FLY_WALK_SPEED, set.getDouble("flyWalk", 0));
}
if (set.contains("flyRun"))
{
addStats(Stats.FLY_RUN_SPEED, set.getDouble("flyRun", 0));
addStats(Stat.FLY_RUN_SPEED, set.getDouble("flyRun", 0));
}
if (set.contains("pAtk"))
{
addStats(Stats.PHYSICAL_ATTACK, set.getDouble("pAtk", 0));
addStats(Stat.PHYSICAL_ATTACK, set.getDouble("pAtk", 0));
}
if (set.contains("mAtk"))
{
addStats(Stats.MAGIC_ATTACK, set.getDouble("mAtk", 0));
addStats(Stat.MAGIC_ATTACK, set.getDouble("mAtk", 0));
}
if (set.contains("range"))
{
addStats(Stats.PHYSICAL_ATTACK_RANGE, set.getInt("range", 0));
addStats(Stat.PHYSICAL_ATTACK_RANGE, set.getInt("range", 0));
}
if (set.contains("attackSpeed"))
{
addStats(Stats.PHYSICAL_ATTACK_SPEED, set.getInt("attackSpeed", 0));
addStats(Stat.PHYSICAL_ATTACK_SPEED, set.getInt("attackSpeed", 0));
}
if (set.contains("critRate"))
{
addStats(Stats.CRITICAL_RATE, set.getInt("critRate", 0));
addStats(Stat.CRITICAL_RATE, set.getInt("critRate", 0));
}
if (set.contains("str"))
{
addStats(Stats.STAT_STR, set.getInt("str", 0));
addStats(Stat.STAT_STR, set.getInt("str", 0));
}
if (set.contains("int"))
{
addStats(Stats.STAT_INT, set.getInt("int", 0));
addStats(Stat.STAT_INT, set.getInt("int", 0));
}
if (set.contains("con"))
{
addStats(Stats.STAT_CON, set.getInt("con", 0));
addStats(Stat.STAT_CON, set.getInt("con", 0));
}
if (set.contains("dex"))
{
addStats(Stats.STAT_DEX, set.getInt("dex", 0));
addStats(Stat.STAT_DEX, set.getInt("dex", 0));
}
if (set.contains("wit"))
{
addStats(Stats.STAT_WIT, set.getInt("wit", 0));
addStats(Stat.STAT_WIT, set.getInt("wit", 0));
}
if (set.contains("men"))
{
addStats(Stats.STAT_MEN, set.getInt("men", 0));
addStats(Stat.STAT_MEN, set.getInt("men", 0));
}
if (set.contains("chest"))
@@ -183,13 +183,13 @@ public class TransformTemplate
}
}
private void addDefense(int type, int val)
private void addDefense(int type, int value)
{
if (_baseDefense == null)
{
_baseDefense = new HashMap<>();
}
_baseDefense.put(type, val);
_baseDefense.put(type, value);
}
/**
@@ -202,23 +202,23 @@ public class TransformTemplate
return (_baseDefense == null) ? defaultValue : _baseDefense.getOrDefault(type, defaultValue);
}
private void addStats(Stats stats, double val)
private void addStats(Stat stat, double value)
{
if (_baseStats == null)
{
_baseStats = new HashMap<>();
}
_baseStats.put(stats.ordinal(), val);
_baseStats.put(stat.ordinal(), value);
}
/**
* @param stats the stat value to search for.
* @param stat the Stat value to search for.
* @param defaultValue value to be used if no such stat is found.
* @return altered stat if its present, or {@code defaultValue} if no such stat is assigned to this template.
*/
public double getStats(Stats stats, double defaultValue)
public double getStats(Stat stat, double defaultValue)
{
return _baseStats == null ? defaultValue : _baseStats.getOrDefault(stats.ordinal(), defaultValue);
return _baseStats == null ? defaultValue : _baseStats.getOrDefault(stat.ordinal(), defaultValue);
}
/**

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SubClass.java
View File

@@ -119,7 +119,7 @@ public class SubClass
return _dualClass;
}
public void setIsDualClass(boolean dualClass)
public void setDualClassActive(boolean dualClass)
{
_dualClass = dualClass;
}

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/buylist/Product.java
View File

@@ -116,7 +116,7 @@ public class Product
_count.set(currentCount);
}
public boolean decreaseCount(long val)
public boolean decreaseCount(long value)
{
if (_count == null)
{
@@ -126,7 +126,7 @@ public class Product
{
_restockTask = ThreadPool.schedule(this::restock, _restockDelay);
}
final boolean result = _count.addAndGet(-val) >= 0;
final boolean result = _count.addAndGet(-value) >= 0;
save();
return result;
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -126,7 +126,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
if (player.isInDuel())
{
player.setIsInDuel(0);
player.setInDuel(0);
}
// Remember player's last location
@@ -148,7 +148,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
player.stopAllEffectsExceptThoseThatLastThroughDeath();
// Player shouldn't be able to move and is hidden
player.setIsImmobilized(true);
player.setImmobilized(true);
player.setInvisible(true);
// Same goes for summon
@@ -156,7 +156,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
{
s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.setInvisible(true);
s.setIsImmobilized(true);
s.setImmobilized(true);
});
if (player.isFlyingMounted())
@@ -259,14 +259,14 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
if (player != null)
{
player.sendPacket(SystemMessageId.THE_MATCH_HAS_STARTED_FIGHT);
player.setIsImmobilized(false);
player.setImmobilized(false);
player.setInvisible(false);
player.broadcastInfo();
player.sendPacket(new ExUserInfoAbnormalVisualEffect(player));
player.getServitors().values().forEach(s ->
{
s.setInvisible(false);
s.setIsImmobilized(false);
s.setImmobilized(false);
s.broadcastInfo();
});
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java
View File

@@ -29,11 +29,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
*/
public class ConditionPlayerCallPc extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCallPc(boolean val)
public ConditionPlayerCallPc(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -59,6 +59,6 @@ public class ConditionPlayerCallPc extends Condition
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SUMMONING_OR_TELEPORTING_IN_THIS_AREA);
canCallPlayer = false;
}
return (_val == canCallPlayer);
return (_value == canCallPlayer);
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java
View File

@@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*/
public class ConditionPlayerCanCreateBase extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanCreateBase(boolean val)
public ConditionPlayerCanCreateBase(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -48,7 +48,7 @@ public class ConditionPlayerCanCreateBase extends Condition
{
if ((effector == null) || !effector.isPlayer())
{
return !_val;
return !_value;
}
final PlayerInstance player = effector.getActingPlayer();
@@ -101,6 +101,6 @@ public class ConditionPlayerCanCreateBase extends Condition
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_HERE);
canCreateBase = false;
}
return (_val == canCreateBase);
return (_value == canCreateBase);
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java
View File

@@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
*/
public class ConditionPlayerCanCreateOutpost extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanCreateOutpost(boolean val)
public ConditionPlayerCanCreateOutpost(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -45,7 +45,7 @@ public class ConditionPlayerCanCreateOutpost extends Condition
{
if ((effector == null) || !effector.isPlayer())
{
return !_val;
return !_value;
}
final PlayerInstance player = effector.getActingPlayer();
@@ -82,6 +82,6 @@ public class ConditionPlayerCanCreateOutpost extends Condition
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_HERE);
canCreateOutpost = false;
}
return (_val == canCreateOutpost);
return (_value == canCreateOutpost);
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java
View File

@@ -27,11 +27,11 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class ConditionPlayerCanEscape extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanEscape(boolean val)
public ConditionPlayerCanEscape(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -67,6 +67,6 @@ public class ConditionPlayerCanEscape extends Condition
{
canTeleport = false;
}
return (_val == canTeleport);
return (_value == canTeleport);
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java
View File

@@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class ConditionPlayerCanRefuelAirship extends Condition
{
private final int _val;
private final int _value;
public ConditionPlayerCanRefuelAirship(int val)
public ConditionPlayerCanRefuelAirship(int value)
{
_val = val;
_value = value;
}
@Override
@@ -40,7 +40,7 @@ public class ConditionPlayerCanRefuelAirship extends Condition
{
boolean canRefuelAirship = true;
final PlayerInstance player = effector.getActingPlayer();
if ((player == null) || (player.getAirShip() == null) || !(player.getAirShip() instanceof ControllableAirShipInstance) || ((player.getAirShip().getFuel() + _val) > player.getAirShip().getMaxFuel()))
if ((player == null) || (player.getAirShip() == null) || !(player.getAirShip() instanceof ControllableAirShipInstance) || ((player.getAirShip().getFuel() + _value) > player.getAirShip().getMaxFuel()))
{
canRefuelAirship = false;
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java
View File

@@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*/
public class ConditionPlayerCanResurrect extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanResurrect(boolean val)
public ConditionPlayerCanResurrect(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -155,6 +155,6 @@ public class ConditionPlayerCanResurrect extends Condition
}
}
}
return _val == canResurrect;
return _value == canResurrect;
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java
View File

@@ -30,11 +30,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
*/
public class ConditionPlayerCanSummonPet extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanSummonPet(boolean val)
public ConditionPlayerCanSummonPet(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -62,6 +62,6 @@ public class ConditionPlayerCanSummonPet extends Condition
{
canSummon = false;
}
return (_val == canSummon);
return (_value == canSummon);
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java
View File

@@ -27,11 +27,11 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class ConditionPlayerCanSummonServitor extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanSummonServitor(boolean val)
public ConditionPlayerCanSummonServitor(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -53,6 +53,6 @@ public class ConditionPlayerCanSummonServitor extends Condition
{
canSummon = false;
}
return canSummon == _val;
return canSummon == _value;
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java
View File

@@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
*/
public class ConditionPlayerCanSummonSiegeGolem extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanSummonSiegeGolem(boolean val)
public ConditionPlayerCanSummonSiegeGolem(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -44,7 +44,7 @@ public class ConditionPlayerCanSummonSiegeGolem extends Condition
{
if ((effector == null) || !effector.isPlayer())
{
return !_val;
return !_value;
}
final PlayerInstance player = effector.getActingPlayer();
@@ -76,6 +76,6 @@ public class ConditionPlayerCanSummonSiegeGolem extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET);
canSummonSiegeGolem = false;
}
return (_val == canSummonSiegeGolem);
return (_value == canSummonSiegeGolem);
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java
View File

@@ -40,11 +40,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
*/
public class ConditionPlayerCanSweep extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanSweep(boolean val)
public ConditionPlayerCanSweep(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -84,6 +84,6 @@ public class ConditionPlayerCanSweep extends Condition
});
}
}
return (_val == canSweep.get());
return (_value == canSweep.get());
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
View File

@@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.util.Util;
*/
public class ConditionPlayerCanTakeCastle extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanTakeCastle(boolean val)
public ConditionPlayerCanTakeCastle(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -44,7 +44,7 @@ public class ConditionPlayerCanTakeCastle extends Condition
{
if ((effector == null) || !effector.isPlayer())
{
return !_val;
return !_value;
}
final PlayerInstance player = effector.getActingPlayer();
@@ -73,6 +73,6 @@ public class ConditionPlayerCanTakeCastle extends Condition
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeCastle = false;
}
return (_val == canTakeCastle);
return (_value == canTakeCastle);
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java
View File

@@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.util.Util;
*/
public class ConditionPlayerCanTakeFort extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanTakeFort(boolean val)
public ConditionPlayerCanTakeFort(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -44,7 +44,7 @@ public class ConditionPlayerCanTakeFort extends Condition
{
if ((effector == null) || !effector.isPlayer())
{
return !_val;
return !_value;
}
final PlayerInstance player = effector.getActingPlayer();
@@ -73,6 +73,6 @@ public class ConditionPlayerCanTakeFort extends Condition
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeFort = false;
}
return (_val == canTakeFort);
return (_value == canTakeFort);
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java
View File

@@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
*/
public class ConditionPlayerCanTransform extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanTransform(boolean val)
public ConditionPlayerCanTransform(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -69,6 +69,6 @@ public class ConditionPlayerCanTransform extends Condition
player.sendMessage("You cannot transform while registered on an event.");
canTransform = false;
}
return (_val == canTransform);
return (_value == canTransform);
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java
View File

@@ -29,11 +29,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
*/
public class ConditionPlayerCanUntransform extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerCanUntransform(boolean val)
public ConditionPlayerCanUntransform(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -54,6 +54,6 @@ public class ConditionPlayerCanUntransform extends Condition
player.sendPacket(SystemMessageId.YOU_ARE_TOO_HIGH_TO_PERFORM_THIS_ACTION_PLEASE_LOWER_YOUR_ALTITUDE_AND_TRY_AGAIN); // TODO: check if message is retail like.
canUntransform = false;
}
return (_val == canUntransform);
return (_value == canUntransform);
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java
View File

@@ -25,20 +25,20 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class ConditionPlayerCloakStatus extends Condition
{
private final boolean _val;
private final boolean _value;
/**
* Instantiates a new condition player cloak status.
* @param val the val
* @param value the value
*/
public ConditionPlayerCloakStatus(boolean val)
public ConditionPlayerCloakStatus(boolean value)
{
_val = val;
_value = value;
}
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
return (effector.getActingPlayer() != null) && (effector.getActingPlayer().getInventory().canEquipCloak() == _val);
return (effector.getActingPlayer() != null) && (effector.getActingPlayer().getInventory().canEquipCloak() == _value);
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java
View File

@@ -22,11 +22,11 @@ import org.l2jmobius.gameserver.model.skills.Skill;
public class ConditionPlayerDualclass extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerDualclass(boolean val)
public ConditionPlayerDualclass(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -36,6 +36,6 @@ public class ConditionPlayerDualclass extends Condition
{
return true;
}
return effector.getActingPlayer().isDualClassActive() == _val;
return effector.getActingPlayer().isDualClassActive() == _value;
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java
View File

@@ -26,20 +26,20 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class ConditionPlayerFlyMounted extends Condition
{
private final boolean _val;
private final boolean _value;
/**
* Instantiates a new condition player fly mounted.
* @param val the val
* @param value the value
*/
public ConditionPlayerFlyMounted(boolean val)
public ConditionPlayerFlyMounted(boolean value)
{
_val = val;
_value = value;
}
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
return (effector.getActingPlayer() == null) || (effector.getActingPlayer().isFlyingMounted() == _val);
return (effector.getActingPlayer() == null) || (effector.getActingPlayer().isFlyingMounted() == _value);
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java
View File

@@ -25,17 +25,17 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class ConditionPlayerImmobile extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerImmobile(boolean val)
public ConditionPlayerImmobile(boolean value)
{
_val = val;
_value = value;
}
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
final boolean isImmobile = !effector.isMovementDisabled();
return _val == isImmobile;
return _value == isImmobile;
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java
View File

@@ -25,15 +25,15 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class ConditionPlayerIsClanLeader extends Condition
{
private final boolean _val;
private final boolean _value;
/**
* Instantiates a new condition player is clan leader.
* @param val the val
* @param value the value
*/
public ConditionPlayerIsClanLeader(boolean val)
public ConditionPlayerIsClanLeader(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -43,6 +43,6 @@ public class ConditionPlayerIsClanLeader extends Condition
{
return false;
}
return (effector.getActingPlayer().isClanLeader() == _val);
return (effector.getActingPlayer().isClanLeader() == _value);
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java
View File

@@ -25,15 +25,15 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class ConditionPlayerIsHero extends Condition
{
private final boolean _val;
private final boolean _value;
/**
* Instantiates a new condition player is hero.
* @param val the val
* @param value the value
*/
public ConditionPlayerIsHero(boolean val)
public ConditionPlayerIsHero(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -43,6 +43,6 @@ public class ConditionPlayerIsHero extends Condition
{
return false;
}
return (effector.getActingPlayer().isHero() == _val);
return (effector.getActingPlayer().isHero() == _value);
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java
View File

@@ -26,17 +26,17 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
*/
public class ConditionPlayerIsInCombat extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionPlayerIsInCombat(boolean val)
public ConditionPlayerIsInCombat(boolean value)
{
_val = val;
_value = value;
}
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
final boolean isInCombat = !AttackStanceTaskManager.getInstance().hasAttackStanceTask(effector);
return _val == isInCombat;
return _value == isInCombat;
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java
View File

@@ -26,20 +26,20 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class ConditionPlayerIsPvpFlagged extends Condition
{
private final boolean _val;
private final boolean _value;
/**
* Instantiates a new condition player is PvP flagged.
* @param val the val
* @param value the value
*/
public ConditionPlayerIsPvpFlagged(boolean val)
public ConditionPlayerIsPvpFlagged(boolean value)
{
_val = val;
_value = value;
}
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
return (effector.getActingPlayer() != null) && ((effector.getActingPlayer().getPvpFlag() > 0) == _val);
return (effector.getActingPlayer() != null) && ((effector.getActingPlayer().getPvpFlag() > 0) == _value);
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java
View File

@@ -27,20 +27,20 @@ import org.l2jmobius.gameserver.model.zone.ZoneId;
*/
public class ConditionPlayerLandingZone extends Condition
{
private final boolean _val;
private final boolean _value;
/**
* Instantiates a new condition player landing zone.
* @param val the val
* @param value the value
*/
public ConditionPlayerLandingZone(boolean val)
public ConditionPlayerLandingZone(boolean value)
{
_val = val;
_value = value;
}
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
return effector.isInsideZone(ZoneId.LANDING) == _val;
return effector.isInsideZone(ZoneId.LANDING) == _value;
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java
View File

@@ -34,13 +34,13 @@ public class ConditionPlayerRangeFromNpc extends Condition
/** Radius to check. */
private final int _radius;
/** Expected value. */
private final boolean _val;
private final boolean _value;
public ConditionPlayerRangeFromNpc(int[] npcIds, int radius, boolean val)
public ConditionPlayerRangeFromNpc(int[] npcIds, int radius, boolean value)
{
_npcIds = npcIds;
_radius = radius;
_val = val;
_value = value;
}
@Override
@@ -58,6 +58,6 @@ public class ConditionPlayerRangeFromNpc extends Condition
}
}
}
return existNpc == _val;
return existNpc == _value;
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java
View File

@@ -34,13 +34,13 @@ public class ConditionPlayerRangeFromSummonedNpc extends Condition
/** Radius to check. */
private final int _radius;
/** Expected value. */
private final boolean _val;
private final boolean _value;
public ConditionPlayerRangeFromSummonedNpc(int[] npcIds, int radius, boolean val)
public ConditionPlayerRangeFromSummonedNpc(int[] npcIds, int radius, boolean value)
{
_npcIds = npcIds;
_radius = radius;
_val = val;
_value = value;
}
@Override
@@ -58,6 +58,6 @@ public class ConditionPlayerRangeFromSummonedNpc extends Condition
}
}
}
return existNpc == _val;
return existNpc == _value;
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java
View File

@@ -25,15 +25,15 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class ConditionPlayerSubclass extends Condition
{
private final boolean _val;
private final boolean _value;
/**
* Instantiates a new condition player subclass.
* @param val the val
* @param value the value
*/
public ConditionPlayerSubclass(boolean val)
public ConditionPlayerSubclass(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -43,6 +43,6 @@ public class ConditionPlayerSubclass extends Condition
{
return true;
}
return effector.getActingPlayer().isSubClassActive() == _val;
return effector.getActingPlayer().isSubClassActive() == _value;
}
}

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java
View File

@@ -25,14 +25,14 @@ import org.l2jmobius.gameserver.model.skills.Skill;
*/
public class ConditionPlayerVehicleMounted extends Condition
{
private final boolean _val;
private final boolean _value;
/**
* @param val the val
* @param value the value
*/
public ConditionPlayerVehicleMounted(boolean val)
public ConditionPlayerVehicleMounted(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -42,6 +42,6 @@ public class ConditionPlayerVehicleMounted extends Condition
{
return true;
}
return (effector.getActingPlayer().isInVehicle() == _val);
return (effector.getActingPlayer().isInVehicle() == _value);
}
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java
View File

@@ -29,11 +29,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*/
public class ConditionTargetMyPartyExceptMe extends Condition
{
private final boolean _val;
private final boolean _value;
public ConditionTargetMyPartyExceptMe(boolean val)
public ConditionTargetMyPartyExceptMe(boolean value)
{
_val = val;
_value = value;
}
@Override
@@ -57,6 +57,6 @@ public class ConditionTargetMyPartyExceptMe extends Condition
player.sendPacket(sm);
isPartyMember = false;
}
return _val == isPartyMember;
return _value == isPartyMember;
}
}

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