Proper naming for various methods and variables.
This commit is contained in:
@@ -386,8 +386,8 @@ public class Race extends Event
|
||||
|
||||
private void winRace(Player player)
|
||||
{
|
||||
final int[] _reward = _rewards[getRandom(_rewards.length - 1)];
|
||||
player.addItem("eventModRace", _reward[0], _reward[1], _npc, true);
|
||||
final int[] reward = _rewards[getRandom(_rewards.length - 1)];
|
||||
player.addItem("eventModRace", reward[0], reward[1], _npc, true);
|
||||
Broadcast.toAllOnlinePlayers(player.getName() + " is a winner!");
|
||||
eventStop();
|
||||
}
|
||||
|
@@ -80,13 +80,13 @@ public class SoulShots implements IItemHandler
|
||||
}
|
||||
|
||||
// Consume Soul shots if player has enough of them
|
||||
int SSCount = weaponItem.getSoulShotCount();
|
||||
int count = weaponItem.getSoulShotCount();
|
||||
if ((weaponItem.getReducedSoulShot() > 0) && (Rnd.get(100) < weaponItem.getReducedSoulShotChance()))
|
||||
{
|
||||
SSCount = weaponItem.getReducedSoulShot();
|
||||
count = weaponItem.getReducedSoulShot();
|
||||
}
|
||||
|
||||
if (!player.destroyItemWithoutTrace("Consume", item.getObjectId(), SSCount, null, false))
|
||||
if (!player.destroyItemWithoutTrace("Consume", item.getObjectId(), count, null, false))
|
||||
{
|
||||
if (!player.disableAutoShot(itemId))
|
||||
{
|
||||
|
@@ -965,8 +965,8 @@ public class DarkCloudMansion extends AbstractInstance
|
||||
}
|
||||
if (world.getStatus() == 4)
|
||||
{
|
||||
final DMCRoom SecondRoom = world.getParameters().getObject("SecondRoom", DMCRoom.class);
|
||||
for (DMCNpc mob : SecondRoom.npcList)
|
||||
final DMCRoom secondRoom = world.getParameters().getObject("SecondRoom", DMCRoom.class);
|
||||
for (DMCNpc mob : secondRoom.npcList)
|
||||
{
|
||||
if (mob.golem == npc)
|
||||
{
|
||||
|
@@ -443,33 +443,33 @@ public class TerritoryWarSuperClass extends Quest
|
||||
|
||||
private void handleStepsForHonor(Player player)
|
||||
{
|
||||
final QuestState _sfh = player.getQuestState(Q00176_StepsForHonor.class.getSimpleName());
|
||||
if ((_sfh != null) && _sfh.isStarted())
|
||||
final QuestState q176 = player.getQuestState(Q00176_StepsForHonor.class.getSimpleName());
|
||||
if ((q176 != null) && q176.isStarted())
|
||||
{
|
||||
final int cond = _sfh.getCond();
|
||||
final int cond = q176.getCond();
|
||||
if ((cond == 1) || (cond == 3) || (cond == 5) || (cond == 7))
|
||||
{
|
||||
final int kills = _sfh.getInt("kills") + 1;
|
||||
_sfh.set("kills", kills);
|
||||
final int kills = q176.getInt("kills") + 1;
|
||||
q176.set("kills", kills);
|
||||
if ((cond == 1) && (kills >= 9))
|
||||
{
|
||||
_sfh.setCond(2);
|
||||
_sfh.set("kills", "0");
|
||||
q176.setCond(2);
|
||||
q176.set("kills", "0");
|
||||
}
|
||||
else if ((cond == 3) && (kills >= 18))
|
||||
{
|
||||
_sfh.setCond(4);
|
||||
_sfh.set("kills", "0");
|
||||
q176.setCond(4);
|
||||
q176.set("kills", "0");
|
||||
}
|
||||
else if ((cond == 5) && (kills >= 27))
|
||||
{
|
||||
_sfh.setCond(6);
|
||||
_sfh.set("kills", "0");
|
||||
q176.setCond(6);
|
||||
q176.set("kills", "0");
|
||||
}
|
||||
else if ((cond == 7) && (kills >= 36))
|
||||
{
|
||||
_sfh.setCond(8);
|
||||
_sfh.unset("kills");
|
||||
q176.setCond(8);
|
||||
q176.unset("kills");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -2847,8 +2847,8 @@ public class Config
|
||||
ENABLE_FIND_PVP = findPvpConfig.getBoolean("EnableFindPvP", false);
|
||||
|
||||
// Load HellboundStatus config file (if exists)
|
||||
final PropertiesParser HellboundStatusConfig = new PropertiesParser(CUSTOM_HELLBOUND_STATUS_CONFIG_FILE);
|
||||
HELLBOUND_STATUS = HellboundStatusConfig.getBoolean("HellboundStatus", false);
|
||||
final PropertiesParser hellboundStatusConfig = new PropertiesParser(CUSTOM_HELLBOUND_STATUS_CONFIG_FILE);
|
||||
HELLBOUND_STATUS = hellboundStatusConfig.getBoolean("HellboundStatus", false);
|
||||
|
||||
// Load MerchantZeroSellPrice config file (if exists)
|
||||
final PropertiesParser merchantZeroSellPriceConfig = new PropertiesParser(CUSTOM_MERCHANT_ZERO_SELL_PRICE_CONFIG_FILE);
|
||||
|
Reference in New Issue
Block a user