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

@@ -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;
}
}

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

@@ -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);
}

View File

@@ -274,7 +274,7 @@ public class Q00216_TrialOfTheGuildsman extends Quest
if (count > 0)
{
giveItemRandomly(qs.getPlayer(), npc, AMBER_BEAD, count, 70, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, AMBER_BEAD, count, 70, 1, true);
}
}
break;

View File

@@ -184,7 +184,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, PUNCHERS_SHARD, 1, 10, 1.0, true) && (getQuestItemsCount(killer, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
if (giveItemRandomly(killer, npc, PUNCHERS_SHARD, 1, 10, 1, true) && (getQuestItemsCount(killer, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
{
if (i0 >= 9)
{
@@ -201,7 +201,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, NOBLE_ANTS_FEELER, 1, 10, 1.0, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
if (giveItemRandomly(killer, npc, NOBLE_ANTS_FEELER, 1, 10, 1, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
{
if (i0 >= 9)
{
@@ -218,7 +218,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, DEAD_SEEKER_FANG, 1, 10, 1.0, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
if (giveItemRandomly(killer, npc, DEAD_SEEKER_FANG, 1, 10, 1, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
{
if (i0 >= 9)
{
@@ -235,7 +235,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, EXCUROS_SKIN, 1, 3, 1.0, true) && (getQuestItemsCount(killer, KRATORS_SHARD, LAKINS_MACE, GRANDIS_SKIN, TIMAK_ORCS_BELT) == 12))
if (giveItemRandomly(killer, npc, EXCUROS_SKIN, 1, 3, 1, true) && (getQuestItemsCount(killer, KRATORS_SHARD, LAKINS_MACE, GRANDIS_SKIN, TIMAK_ORCS_BELT) == 12))
{
if (i0 >= 5)
{
@@ -252,7 +252,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, KRATORS_SHARD, 1, 3, 1.0, true) && (getQuestItemsCount(killer, EXCUROS_SKIN, LAKINS_MACE, GRANDIS_SKIN, TIMAK_ORCS_BELT) == 12))
if (giveItemRandomly(killer, npc, KRATORS_SHARD, 1, 3, 1, true) && (getQuestItemsCount(killer, EXCUROS_SKIN, LAKINS_MACE, GRANDIS_SKIN, TIMAK_ORCS_BELT) == 12))
{
if (i0 >= 5)
{
@@ -269,7 +269,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, DRONES_CHITIN, 1, 10, 1.0, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
if (giveItemRandomly(killer, npc, DRONES_CHITIN, 1, 10, 1, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
{
if (i0 >= 9)
{
@@ -286,7 +286,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, OVERLORD_NECKLACE, 1, 10, 1.0, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
if (giveItemRandomly(killer, npc, OVERLORD_NECKLACE, 1, 10, 1, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
{
if (i0 >= 9)
{
@@ -303,7 +303,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, FETTERED_SOULS_CHAIN, 1, 10, 1.0, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
if (giveItemRandomly(killer, npc, FETTERED_SOULS_CHAIN, 1, 10, 1, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
{
if (i0 >= 9)
{
@@ -320,7 +320,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, GRANDIS_SKIN, 1, 3, 1.0, true) && (getQuestItemsCount(killer, EXCUROS_SKIN, KRATORS_SHARD, LAKINS_MACE, TIMAK_ORCS_BELT) == 12))
if (giveItemRandomly(killer, npc, GRANDIS_SKIN, 1, 3, 1, true) && (getQuestItemsCount(killer, EXCUROS_SKIN, KRATORS_SHARD, LAKINS_MACE, TIMAK_ORCS_BELT) == 12))
{
if (i0 >= 5)
{
@@ -337,7 +337,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, ENCHANTED_EYE_MEAT, 1, 10, 1.0, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
if (giveItemRandomly(killer, npc, ENCHANTED_EYE_MEAT, 1, 10, 1, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
{
if (i0 >= 9)
{
@@ -354,7 +354,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, CHIEDS_AMULET, 1, 10, 1.0, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
if (giveItemRandomly(killer, npc, CHIEDS_AMULET, 1, 10, 1, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING, TAMRIN_ORCS_ARROW) == 90))
{
if (i0 >= 9)
{
@@ -371,7 +371,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, TIMAK_ORCS_BELT, 1, 3, 1.0, true) && (getQuestItemsCount(killer, EXCUROS_SKIN, KRATORS_SHARD, LAKINS_MACE, GRANDIS_SKIN) == 12))
if (giveItemRandomly(killer, npc, TIMAK_ORCS_BELT, 1, 3, 1, true) && (getQuestItemsCount(killer, EXCUROS_SKIN, KRATORS_SHARD, LAKINS_MACE, GRANDIS_SKIN) == 12))
{
if (i0 >= 5)
{
@@ -388,7 +388,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, TAMRIN_ORCS_RING, 1, 10, 1.0, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_ARROW) == 90))
if (giveItemRandomly(killer, npc, TAMRIN_ORCS_RING, 1, 10, 1, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_ARROW) == 90))
{
if (i0 >= 9)
{
@@ -405,7 +405,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, TAMRIN_ORCS_ARROW, 1, 10, 1.0, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING) == 90))
if (giveItemRandomly(killer, npc, TAMRIN_ORCS_ARROW, 1, 10, 1, true) && (getQuestItemsCount(killer, PUNCHERS_SHARD, NOBLE_ANTS_FEELER, DRONES_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOULS_CHAIN, CHIEDS_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORCS_RING) == 90))
{
if (i0 >= 9)
{
@@ -422,7 +422,7 @@ public class Q00222_TestOfTheDuelist extends Quest
{
final int i0 = qs.getMemoStateEx(1);
qs.setMemoStateEx(1, i0 + 1);
if (giveItemRandomly(killer, npc, LAKINS_MACE, 1, 3, 1.0, true) && (getQuestItemsCount(killer, EXCUROS_SKIN, KRATORS_SHARD, GRANDIS_SKIN, TIMAK_ORCS_BELT) == 12))
if (giveItemRandomly(killer, npc, LAKINS_MACE, 1, 3, 1, true) && (getQuestItemsCount(killer, EXCUROS_SKIN, KRATORS_SHARD, GRANDIS_SKIN, TIMAK_ORCS_BELT) == 12))
{
if (i0 >= 5)
{

View File

@@ -715,7 +715,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_5TH_LIST))
{
giveItemRandomly(killer, npc, WINGS_OF_DRONEANT, 2, 30, 1.0, true);
giveItemRandomly(killer, npc, WINGS_OF_DRONEANT, 2, 30, 1, true);
}
break;
}
@@ -723,7 +723,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_5TH_LIST))
{
giveItemRandomly(killer, npc, FANGS_OF_WYRM, 3, 30, 1.0, true);
giveItemRandomly(killer, npc, FANGS_OF_WYRM, 3, 30, 1, true);
}
break;
}
@@ -732,7 +732,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_4TH_LIST))
{
giveItemRandomly(killer, npc, TALONS_OF_TYRANT, 3, 30, 1.0, true);
giveItemRandomly(killer, npc, TALONS_OF_TYRANT, 3, 30, 1, true);
}
break;
}
@@ -742,7 +742,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_3RD_LIST))
{
giveItemRandomly(killer, npc, BREKAORC_TOTEM, 1, 30, 1.0, true);
giveItemRandomly(killer, npc, BREKAORC_TOTEM, 1, 30, 1, true);
}
break;
}
@@ -751,7 +751,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_3RD_LIST))
{
giveItemRandomly(killer, npc, BREKAORC_TOTEM, 2, 30, 1.0, true);
giveItemRandomly(killer, npc, BREKAORC_TOTEM, 2, 30, 1, true);
}
break;
}
@@ -759,7 +759,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_3RD_LIST))
{
giveItemRandomly(killer, npc, CRIMSON_BLOODSTONE, 6, 30, 1.0, true);
giveItemRandomly(killer, npc, CRIMSON_BLOODSTONE, 6, 30, 1, true);
}
break;
}
@@ -767,7 +767,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_4TH_LIST))
{
giveItemRandomly(killer, npc, TUSK_OF_WINDSUS, 3, 30, 1.0, true);
giveItemRandomly(killer, npc, TUSK_OF_WINDSUS, 3, 30, 1, true);
}
break;
}
@@ -775,7 +775,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_1ST_LIST))
{
giveItemRandomly(killer, npc, SAC_OF_REDSPORES, 2, 30, 1.0, true);
giveItemRandomly(killer, npc, SAC_OF_REDSPORES, 2, 30, 1, true);
}
break;
}
@@ -783,7 +783,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_2ND_LIST))
{
giveItemRandomly(killer, npc, SHARDS_OF_MANASHEN, 2, 30, 1.0, true);
giveItemRandomly(killer, npc, SHARDS_OF_MANASHEN, 2, 30, 1, true);
}
break;
}
@@ -794,7 +794,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_1ST_LIST))
{
giveItemRandomly(killer, npc, LETOLIZARDMAN_AMULET, 1, 30, 1.0, true);
giveItemRandomly(killer, npc, LETOLIZARDMAN_AMULET, 1, 30, 1, true);
}
break;
}
@@ -803,7 +803,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_1ST_LIST))
{
giveItemRandomly(killer, npc, LETOLIZARDMAN_AMULET, 2, 30, 1.0, true);
giveItemRandomly(killer, npc, LETOLIZARDMAN_AMULET, 2, 30, 1, true);
}
break;
}
@@ -811,7 +811,7 @@ public class Q00230_TestOfTheSummoner extends Quest
{
if (!hasQuestItems(killer, GALATEAS_LETTER) && hasQuestItems(killer, LARAS_2ND_LIST))
{
giveItemRandomly(killer, npc, KARULBUGBEAR_TOTEM, 2, 30, 1.0, true);
giveItemRandomly(killer, npc, KARULBUGBEAR_TOTEM, 2, 30, 1, true);
}
break;
}

View File

@@ -268,7 +268,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
{
if (hasQuestItems(killer, ORIMS_CONTRACT))
{
giveItemRandomly(killer, npc, PORTAS_EYE, 2, 10, 1.0, true);
giveItemRandomly(killer, npc, PORTAS_EYE, 2, 10, 1, true);
}
break;
}
@@ -276,7 +276,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
{
if (hasQuestItems(killer, ORIMS_CONTRACT))
{
giveItemRandomly(killer, npc, EXCUROS_SCALE, 5, 10, 1.0, true);
giveItemRandomly(killer, npc, EXCUROS_SCALE, 5, 10, 1, true);
}
break;
}
@@ -284,7 +284,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
{
if (hasQuestItems(killer, ORIMS_CONTRACT))
{
giveItemRandomly(killer, npc, MORDEOS_TALON, 5, 10, 1.0, true);
giveItemRandomly(killer, npc, MORDEOS_TALON, 5, 10, 1, true);
}
break;
}
@@ -324,7 +324,7 @@ public class Q00233_TestOfTheWarSpirit extends Quest
case TAMLIN_ORC:
case TAMLIN_ORC_ARCHER:
{
if (hasQuestItems(killer, VENDETTA_TOTEM) && giveItemRandomly(killer, npc, TAMLIN_ORC_HEAD, 1, 13, 1.0, true))
if (hasQuestItems(killer, VENDETTA_TOTEM) && giveItemRandomly(killer, npc, TAMLIN_ORC_HEAD, 1, 13, 1, true))
{
qs.setCond(4, true);
}

View File

@@ -93,7 +93,7 @@ public class Q00266_PleasOfPixies extends Quest
{
if (chance < mob.getId())
{
if (giveItemRandomly(killer, npc, PREDATORS_FANG, mob.getCount(), 100, 1.0, true))
if (giveItemRandomly(killer, npc, PREDATORS_FANG, mob.getCount(), 100, 1, true))
{
qs.setCond(2);
}

View File

@@ -117,14 +117,14 @@ public class Q00292_BrigandsSweep extends Quest
final int chance = getRandom(10);
if (chance > 5)
{
giveItemRandomly(killer, npc, MOB_ITEM_DROP.get(npc.getId()), 1, 0, 1.0, true);
giveItemRandomly(killer, npc, MOB_ITEM_DROP.get(npc.getId()), 1, 0, 1, true);
}
else if (qs.isCond(1) && (chance > 4) && !hasQuestItems(killer, SUSPICIOUS_CONTRACT))
{
final long memos = getQuestItemsCount(killer, SUSPICIOUS_MEMO);
if (memos < 3)
{
if (giveItemRandomly(killer, npc, SUSPICIOUS_MEMO, 1, 3, 1.0, false))
if (giveItemRandomly(killer, npc, SUSPICIOUS_MEMO, 1, 3, 1, false))
{
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItems(killer, SUSPICIOUS_CONTRACT, 1);

View File

@@ -85,7 +85,7 @@ public class Q00294_CovertBusiness extends Quest
count++;
if (chance > i)
{
if (giveItemRandomly(killer, npc, BAT_FANG, count, 100, 1.0, true))
if (giveItemRandomly(killer, npc, BAT_FANG, count, 100, 1, true))
{
qs.setCond(2);
}

View File

@@ -65,7 +65,7 @@ public class Q00295_DreamingOfTheSkies extends Quest
public String onKill(Npc npc, Player killer, boolean isSummon)
{
final QuestState qs = getQuestState(killer, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, killer, true) && giveItemRandomly(killer, npc, FLOATING_STONE, (getRandom(100) > 25) ? 1 : 2, 50, 1.0, true))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, killer, true) && giveItemRandomly(killer, npc, FLOATING_STONE, (getRandom(100) > 25) ? 1 : 2, 50, 1, true))
{
qs.setCond(2);
}

View File

@@ -205,7 +205,7 @@ public class Q00325_GrimCollector extends Quest
{
if (rnd < drop.getChance())
{
giveItemRandomly(killer, npc, drop.getId(), 1, 0, 1.0, true);
giveItemRandomly(killer, npc, drop.getId(), 1, 0, 1, true);
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

@@ -68,13 +68,13 @@ public class Q00416_PathOfTheOrcShaman extends Quest
private static final Map<Integer, ItemChanceHolder> MOBS = new HashMap<>();
static
{
MOBS.put(20415, new ItemChanceHolder(FIRST_FIERY_EGG, 1.0, 1)); // scarlet_salamander
MOBS.put(20478, new ItemChanceHolder(KASHA_BLADE_SPIDER_HUSK, 1.0, 1)); // kasha_blade_spider
MOBS.put(20479, new ItemChanceHolder(KASHA_BEAR_PELT, 1.0, 1)); // kasha_bear
MOBS.put(20335, new ItemChanceHolder(GRIZZLY_BLOOD, 1.0, 6)); // grizzly_bear
MOBS.put(20038, new ItemChanceHolder(DURKA_PARASITE, 1.0, 9)); // poison_spider
MOBS.put(20043, new ItemChanceHolder(DURKA_PARASITE, 1.0, 9)); // bind_poison_spider
MOBS.put(27056, new ItemChanceHolder(DURKA_PARASITE, 1.0, 9)); // durka_spirit
MOBS.put(20415, new ItemChanceHolder(FIRST_FIERY_EGG, 1, 1)); // scarlet_salamander
MOBS.put(20478, new ItemChanceHolder(KASHA_BLADE_SPIDER_HUSK, 1, 1)); // kasha_blade_spider
MOBS.put(20479, new ItemChanceHolder(KASHA_BEAR_PELT, 1, 1)); // kasha_bear
MOBS.put(20335, new ItemChanceHolder(GRIZZLY_BLOOD, 1, 6)); // grizzly_bear
MOBS.put(20038, new ItemChanceHolder(DURKA_PARASITE, 1, 9)); // poison_spider
MOBS.put(20043, new ItemChanceHolder(DURKA_PARASITE, 1, 9)); // bind_poison_spider
MOBS.put(27056, new ItemChanceHolder(DURKA_PARASITE, 1, 9)); // durka_spirit
}
public Q00416_PathOfTheOrcShaman()

View File

@@ -409,7 +409,7 @@ public class Q00417_PathOfTheScavenger extends Quest
{
if (firstAttacker && ((Attackable) npc).isSpoiled() && hasQuestItems(killer, BEAR_PICTURE))
{
if (giveItemRandomly(killer, npc, HONEY_JAR, 1, 5, 50.0, true))
if (giveItemRandomly(killer, npc, HONEY_JAR, 1, 5, 50, true))
{
qs.setCond(6);
}
@@ -421,7 +421,7 @@ public class Q00417_PathOfTheScavenger extends Quest
{
if (firstAttacker && ((Attackable) npc).isSpoiled() && hasQuestItems(killer, TARANTULA_PICTURE))
{
if (giveItemRandomly(killer, npc, BEAD, 1, 20, 50.0, true))
if (giveItemRandomly(killer, npc, BEAD, 1, 20, 50, true))
{
qs.setCond(8);
}

View File

@@ -135,7 +135,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
}
else
{
giveItemRandomly(qs.getPlayer(), npc, DINOSAUR_EGG, 1, 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, DINOSAUR_EGG, 1, 0, 1, true);
}
return super.onKill(npc, killer, isSummon);
}