Minor code cleanup.
Thanks to nasseka.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user