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;
|
||||
}
|
||||
}
|
||||
|
@@ -71,7 +71,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;
|
||||
}
|
||||
}
|
||||
|
@@ -171,7 +171,7 @@ public class Q00032_AnObviousLie extends Quest
|
||||
public String onKill(Npc npc, Player killer, boolean isSummon)
|
||||
{
|
||||
final QuestState qs = getRandomPartyMemberState(killer, 3, 3, npc);
|
||||
if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, MEDICINAL_HERB.getId(), 1, MEDICINAL_HERB.getCount(), 1.0, true))
|
||||
if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, MEDICINAL_HERB.getId(), 1, MEDICINAL_HERB.getCount(), 1, true))
|
||||
{
|
||||
qs.setCond(4);
|
||||
}
|
||||
|
@@ -162,7 +162,7 @@ public class Q00826_InSearchOfTheSecretWeapon extends Quest
|
||||
for (Player member : members)
|
||||
{
|
||||
final QuestState qs = getQuestState(member, false);
|
||||
if ((qs != null) && qs.isCond(1) && member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && giveItemRandomly(member, npc, ASHEN_CERTIFICATE, 1, 8, 1.0, true))
|
||||
if ((qs != null) && qs.isCond(1) && member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && giveItemRandomly(member, npc, ASHEN_CERTIFICATE, 1, 8, 1, true))
|
||||
{
|
||||
qs.setCond(2, true);
|
||||
}
|
||||
|
@@ -187,7 +187,7 @@ public class Q00827_EinhasadsOrder extends Quest
|
||||
for (Player member : members)
|
||||
{
|
||||
final QuestState qs = getQuestState(member, false);
|
||||
if ((qs != null) && qs.isCond(1) && member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && giveItemRandomly(member, npc, REVOLUTIONARIES_MARK_PIECE, 1, 30, 1.0, true))
|
||||
if ((qs != null) && qs.isCond(1) && member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && giveItemRandomly(member, npc, REVOLUTIONARIES_MARK_PIECE, 1, 30, 1, true))
|
||||
{
|
||||
qs.setCond(2, true);
|
||||
}
|
||||
|
@@ -153,7 +153,7 @@ public class Q00831_SayhasScheme extends Quest
|
||||
for (Player member : members)
|
||||
{
|
||||
final QuestState qs = getQuestState(member, false);
|
||||
if ((qs != null) && qs.isCond(1) && member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && giveItemRandomly(member, npc, DESTROYED_MARK_FRAGMENT, 1, 10, 1.0, true))
|
||||
if ((qs != null) && qs.isCond(1) && member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && giveItemRandomly(member, npc, DESTROYED_MARK_FRAGMENT, 1, 10, 1, true))
|
||||
{
|
||||
qs.setCond(2, true);
|
||||
}
|
||||
|
@@ -146,7 +146,7 @@ public class Q00835_PitiableMelisa extends Quest
|
||||
public void actionForEachPlayer(Player player, Npc npc, boolean isSummon)
|
||||
{
|
||||
final QuestState qs = getQuestState(player, false);
|
||||
if ((qs != null) && qs.isCond(2) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && giveItemRandomly(player, npc, ICE_CRYSTAL_SHARD, 1, 10, 1.0, true))
|
||||
if ((qs != null) && qs.isCond(2) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE) && giveItemRandomly(player, npc, ICE_CRYSTAL_SHARD, 1, 10, 1, true))
|
||||
{
|
||||
qs.setCond(3, true);
|
||||
}
|
||||
|
@@ -148,7 +148,7 @@ public class Q00926_30DaySearchOperation extends Quest
|
||||
case LOST_SOUL_DIMENSION:
|
||||
case ROAMING_VENGEANCE:
|
||||
{
|
||||
if (giveItemRandomly(killer, npc, SPIRIT_FRAGMENTS, 1, 100, 1.0, true))
|
||||
if (giveItemRandomly(killer, npc, SPIRIT_FRAGMENTS, 1, 100, 1, true))
|
||||
{
|
||||
qs.setCond(2, true);
|
||||
}
|
||||
|
@@ -192,7 +192,7 @@ public class Q00928_100DaySubjugationOperation extends Quest
|
||||
case LOST_DIMENSION_EVIL:
|
||||
case ROAMING_VENGEANCE:
|
||||
{
|
||||
if (giveItemRandomly(killer, npc, ATTACKERS_SOUL, 1, 100, 1.0, true))
|
||||
if (giveItemRandomly(killer, npc, ATTACKERS_SOUL, 1, 100, 1, true))
|
||||
{
|
||||
qs.setCond(2, true);
|
||||
}
|
||||
|
Reference in New Issue
Block a user