Minor code cleanup.

Thanks to nasseka.
This commit is contained in:
MobiusDevelopment
2022-02-01 00:19:29 +00:00
parent 29e0e749e3
commit a15695b7fa
600 changed files with 1013 additions and 1013 deletions

View File

@@ -71,7 +71,7 @@ public class Cp extends AbstractEffect
}
case PER:
{
amount = Math.min((effected.getMaxCp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
amount = Math.min((effected.getMaxCp() * basicAmount) / 100, Math.max(0, effected.getMaxRecoverableCp() - effected.getCurrentCp()));
break;
}
}

View File

@@ -76,7 +76,7 @@ public class Hp extends AbstractEffect
}
case PER:
{
amount = Math.min((effected.getMaxHp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
amount = Math.min((effected.getMaxHp() * basicAmount) / 100, Math.max(0, effected.getMaxRecoverableHp() - effected.getCurrentHp()));
break;
}
}

View File

@@ -71,7 +71,7 @@ public class Mp extends AbstractEffect
}
case PER:
{
amount = Math.min((effected.getMaxMp() * basicAmount) / 100.0, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
amount = Math.min((effected.getMaxMp() * basicAmount) / 100, Math.max(0, effected.getMaxRecoverableMp() - effected.getCurrentMp()));
break;
}
}

View File

@@ -107,7 +107,7 @@ public class Q00329_CuriosityOfADwarf extends Quest
{
if (rnd < drop.getCount())
{
giveItemRandomly(killer, npc, drop.getId(), 1, 0, 1.0, true);
giveItemRandomly(killer, npc, drop.getId(), 1, 0, 1, true);
break;
}
}

View File

@@ -122,7 +122,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
else
{
final int itemCount = ((getRandom(100) < MOB2.get(npcId)) ? 2 : 1);
giveItemRandomly(qs.getPlayer(), npc, ALLIGATOR_TOOTH, itemCount, 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, ALLIGATOR_TOOTH, itemCount, 0, 1, true);
}
}
return super.onKill(npc, player, isSummon);

View File

@@ -200,11 +200,11 @@ public class Q00355_FamilyHonor extends Quest
final int random = getRandom(1000);
if (random < info.getFirstChance())
{
giveItemRandomly(killer, npc, GALFREDO_ROMERS_BUST, 1, 0, 1.0, true);
giveItemRandomly(killer, npc, GALFREDO_ROMERS_BUST, 1, 0, 1, true);
}
else if (random < info.getSecondChance())
{
giveItemRandomly(killer, npc, SCULPTOR_BERONA, 1, 0, 1.0, true);
giveItemRandomly(killer, npc, SCULPTOR_BERONA, 1, 0, 1, true);
}
return super.onKill(npc, killer, isSummon);
}

View File

@@ -122,7 +122,7 @@ public class Q00369_CollectorOfJewels extends Quest
final QuestState qs = getQuestState(luckyPlayer, false);
final int itemCount = (qs.isMemoState(1) ? 50 : 200);
final int cond = (qs.isMemoState(1) ? 2 : 4);
if (giveItemRandomly(luckyPlayer, npc, item.getId(), item.getCount(), itemCount, 1.0, true) //
if (giveItemRandomly(luckyPlayer, npc, item.getId(), item.getCount(), itemCount, 1, true) //
&& (getQuestItemsCount(luckyPlayer, FLARE_SHARD, FREEZING_SHARD) >= (itemCount * 2)))
{
qs.setCond(cond);

View File

@@ -135,7 +135,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
final Player luckyPlayer = getRandomPartyMember(player, npc);
if (luckyPlayer != null)
{
giveItemRandomly(luckyPlayer, npc, SPELLBOOK_PAGE, 1, 0, 1.0, true);
giveItemRandomly(luckyPlayer, npc, SPELLBOOK_PAGE, 1, 0, 1, true);
}
}
}

View File

@@ -1420,7 +1420,7 @@ public class Formulas
}
case SHIELD_DEFENSE_PERFECT_BLOCK:
{
return 1.;
return 1;
}
}

View File

@@ -40,7 +40,7 @@ public class MAttackSpeedFinalizer implements IStatFunction
baseValue *= Config.CHAMPION_SPD_ATK;
}
final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.;
final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
baseValue *= witBonus;
return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE);
}

View File

@@ -43,7 +43,7 @@ public class MCritRateFinalizer implements IStatFunction
}
final double physicalBonus = creature.getStat().getMul(Stat.MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE, 0) * creature.getStat().getCriticalHit();
final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.;
final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
return validateValue(creature, Stat.defaultValue(creature, stat, (baseValue * witBonus * 10) + physicalBonus), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
}

View File

@@ -84,7 +84,7 @@ public class MDefenseFinalizer implements IStatFunction
baseValue *= Config.RAID_MDEFENCE_MULTIPLIER;
}
final double bonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.;
final double bonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1;
baseValue *= bonus * creature.getLevelMod();
return defaultValue(creature, stat, baseValue);
}

View File

@@ -40,7 +40,7 @@ public class MaxCpFinalizer implements IStatFunction
{
baseValue = player.getTemplate().getBaseCpMax(player.getLevel());
}
final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.;
final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1;
baseValue *= conBonus;
return Stat.defaultValue(creature, stat, baseValue);
}

View File

@@ -54,7 +54,7 @@ public class MaxHpFinalizer implements IStatFunction
}
}
final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.;
final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1;
baseValue *= conBonus;
return defaultValue(creature, stat, baseValue);

View File

@@ -52,7 +52,7 @@ public class MaxMpFinalizer implements IStatFunction
}
}
final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.;
final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1;
baseValue *= menBonus;
return defaultValue(creature, stat, baseValue);

View File

@@ -38,7 +38,7 @@ public class PAttackSpeedFinalizer implements IStatFunction
{
baseValue *= Config.CHAMPION_SPD_ATK;
}
final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.;
final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
baseValue *= dexBonus;
return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE);
}

View File

@@ -41,7 +41,7 @@ public class PCriticalRateFinalizer implements IStatFunction
// Enchanted legs bonus
baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
}
final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.;
final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
}

View File

@@ -34,6 +34,6 @@ public class VampiricChanceFinalizer implements IStatFunction
final double amount = creature.getStat().getValue(Stat.ABSORB_DAMAGE_PERCENT, 0) * 100;
final double vampiricSum = creature.getStat().getVampiricSum();
return amount > 0 ? Stat.defaultValue(creature, stat, Math.min(1.0, vampiricSum / amount / 100)) : 0;
return amount > 0 ? Stat.defaultValue(creature, stat, Math.min(1, vampiricSum / amount / 100)) : 0;
}
}