lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor code cleanup.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java vendored
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);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java vendored
View File

@@ -296,7 +296,7 @@ public class Q00038_DragonFangs extends Quest
case LIZARDMAN_SENTINEL:
{
final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, FEATHER.getId(), 1, FEATHER.getCount(), 1.0, true))
if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, FEATHER.getId(), 1, FEATHER.getCount(), 1, true))
{
qs.setCond(2);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java vendored
View File

@@ -258,7 +258,7 @@ public class Q00103_SpiritOfCraftsman extends Quest
case SKELETON_HUNTER:
case SKELETON_HUNTER_ARCHER:
{
if (hasQuestItems(killer, CECKTINONS_VOUCHER2) && giveItemRandomly(qs.getPlayer(), npc, BONE_FRAGMENT, 1, 10, 1.0, true))
if (hasQuestItems(killer, CECKTINONS_VOUCHER2) && giveItemRandomly(qs.getPlayer(), npc, BONE_FRAGMENT, 1, 10, 1, true))
{
qs.setCond(4, true);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java vendored
View File

@@ -160,7 +160,7 @@ public class Q00175_TheWayOfTheWarrior extends Quest
else
{
final QuestState qs = getRandomPartyMemberState(player, 7, 3, npc);
if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, MUERTOS_CLAW.getId(), 1, MUERTOS_CLAW.getCount(), 1.0, true))
if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, MUERTOS_CLAW.getId(), 1, MUERTOS_CLAW.getCount(), 1, true))
{
qs.setCond(8, true);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java vendored
View File

@@ -285,7 +285,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;

30
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java vendored
View File

@@ -202,7 +202,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)
{
@@ -219,7 +219,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)
{
@@ -236,7 +236,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)
{
@@ -253,7 +253,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)
{
@@ -270,7 +270,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)
{
@@ -287,7 +287,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)
{
@@ -304,7 +304,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)
{
@@ -321,7 +321,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)
{
@@ -338,7 +338,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)
{
@@ -355,7 +355,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)
{
@@ -372,7 +372,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)
{
@@ -389,7 +389,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)
{
@@ -406,7 +406,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)
{
@@ -423,7 +423,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)
{
@@ -440,7 +440,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)
{

24
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java vendored
View File

@@ -726,7 +726,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;
}
@@ -734,7 +734,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;
}
@@ -743,7 +743,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;
}
@@ -753,7 +753,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;
}
@@ -762,7 +762,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;
}
@@ -770,7 +770,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;
}
@@ -778,7 +778,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;
}
@@ -786,7 +786,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;
}
@@ -794,7 +794,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;
}
@@ -805,7 +805,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;
}
@@ -814,7 +814,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;
}
@@ -822,7 +822,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;
}

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java vendored
View File

@@ -279,7 +279,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;
}
@@ -287,7 +287,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;
}
@@ -295,7 +295,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;
}
@@ -335,7 +335,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);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java vendored
View File

@@ -237,7 +237,7 @@ public class Q00235_MimirsElixir extends Quest
if (luckyPlayer != null)
{
final ItemChanceHolder item = MOBS.get(npc.getId());
if (giveItemRandomly(luckyPlayer, npc, item.getId(), item.getCount(), item.getCount(), 1.0, true))
if (giveItemRandomly(luckyPlayer, npc, item.getId(), item.getCount(), item.getCount(), 1, true))
{
final QuestState qs = luckyPlayer.getQuestState(getName());
qs.setMemoState((int) item.getChance());

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java vendored
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);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java vendored
View File

@@ -146,7 +146,7 @@ public class Q00278_HomeSecurity extends Quest
case 18905: // Farm Ravager (Crazy)
{
final int itemCount = (getRandom(1000) < 486) ? getRandom(6) + 1 : getRandom(5) + 1;
if (giveItemRandomly(qs.getPlayer(), npc, SEL_MAHUM_MANE, itemCount, SEL_MAHUM_MANE_COUNT, 1.0, true))
if (giveItemRandomly(qs.getPlayer(), npc, SEL_MAHUM_MANE, itemCount, SEL_MAHUM_MANE_COUNT, 1, true))
{
qs.setCond(2, true);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java vendored
View File

@@ -70,7 +70,7 @@ public class Q00291_RevengeOfTheRedbonnet 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(qs.getPlayer(), npc, BLACK_WOLF_PELT.getId(), 1, BLACK_WOLF_PELT.getCount(), 1.0, true))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, killer, true) && giveItemRandomly(qs.getPlayer(), npc, BLACK_WOLF_PELT.getId(), 1, BLACK_WOLF_PELT.getCount(), 1, true))
{
qs.setCond(2);
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java vendored
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);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java vendored
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);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java vendored
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);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java vendored
View File

@@ -202,7 +202,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;
}
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java vendored
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;
}
}

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java vendored
View File

@@ -1438,7 +1438,7 @@ public class Q00335_TheSongOfTheHunter extends Quest
{
if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_7C) && (getQuestItemsCount(qs.getPlayer(), TEMPEST_SHARD) < 40))
{
if (giveItemRandomly(qs.getPlayer(), npc, TEMPEST_SHARD, 5, 40, 1.0, true))
if (giveItemRandomly(qs.getPlayer(), npc, TEMPEST_SHARD, 5, 40, 1, true))
{
playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
}
@@ -1448,7 +1448,7 @@ public class Q00335_TheSongOfTheHunter extends Quest
if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_8C) && (getQuestItemsCount(qs.getPlayer(), TSUNAMI_SHARD) < 40))
{
if (giveItemRandomly(qs.getPlayer(), npc, TSUNAMI_SHARD, 5, 40, 1.0, true))
if (giveItemRandomly(qs.getPlayer(), npc, TSUNAMI_SHARD, 5, 40, 1, true))
{
playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
}
@@ -1458,7 +1458,7 @@ public class Q00335_TheSongOfTheHunter extends Quest
if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_10C) && (getQuestItemsCount(qs.getPlayer(), HAMADRYAD_SHARD) < 40))
{
if (giveItemRandomly(qs.getPlayer(), npc, HAMADRYAD_SHARD, 5, 40, 1.0, true))
if (giveItemRandomly(qs.getPlayer(), npc, HAMADRYAD_SHARD, 5, 40, 1, true))
{
playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
}
@@ -1468,7 +1468,7 @@ public class Q00335_TheSongOfTheHunter extends Quest
if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_3B) && (getQuestItemsCount(qs.getPlayer(), NARCISSUSS_SOULSTONE) < 40))
{
if (giveItemRandomly(qs.getPlayer(), npc, NARCISSUSS_SOULSTONE, 5, 40, 1.0, true))
if (giveItemRandomly(qs.getPlayer(), npc, NARCISSUSS_SOULSTONE, 5, 40, 1, true))
{
playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
}
@@ -1478,7 +1478,7 @@ public class Q00335_TheSongOfTheHunter extends Quest
if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_5C) && (getQuestItemsCount(qs.getPlayer(), COIN_OF_OLD_EMPIRE) < 20))
{
if (giveItemRandomly(qs.getPlayer(), npc, COIN_OF_OLD_EMPIRE, 3, 20, 1.0, true))
if (giveItemRandomly(qs.getPlayer(), npc, COIN_OF_OLD_EMPIRE, 3, 20, 1, true))
{
playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
}

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java vendored
View File

@@ -153,23 +153,23 @@ public class Q00351_BlackSwan extends Quest
final int random = getRandom(20);
if (random < 10)
{
giveItemRandomly(qs.getPlayer(), npc, LIZARD_FANG, 1, 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, LIZARD_FANG, 1, 0, 1, true);
if (getRandom(20) == 0)
{
giveItemRandomly(qs.getPlayer(), npc, BARREL_OF_LEAGUE, 1, 0, 1.0, false);
giveItemRandomly(qs.getPlayer(), npc, BARREL_OF_LEAGUE, 1, 0, 1, false);
}
}
else if (random < 15)
{
giveItemRandomly(qs.getPlayer(), npc, LIZARD_FANG, 2, 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, LIZARD_FANG, 2, 0, 1, true);
if (getRandom(20) == 0)
{
giveItemRandomly(qs.getPlayer(), npc, BARREL_OF_LEAGUE, 1, 0, 1.0, false);
giveItemRandomly(qs.getPlayer(), npc, BARREL_OF_LEAGUE, 1, 0, 1, false);
}
}
else if (getRandom(100) < MONSTER_DROP_CHANCES.get(npc.getId()))
{
giveItemRandomly(qs.getPlayer(), npc, BARREL_OF_LEAGUE, 1, 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, BARREL_OF_LEAGUE, 1, 0, 1, true);
}
return super.onKill(npc, killer, isSummon);

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java vendored
View File

@@ -129,11 +129,11 @@ public class Q00352_HelpRoodRaiseANewPet extends Quest
final int random = getRandom(100);
if (random < info.getFirstChance())
{
giveItemRandomly(killer, npc, LIENRIK_EGG1, 1, 0, 1.0, true);
giveItemRandomly(killer, npc, LIENRIK_EGG1, 1, 0, 1, true);
}
else if (random < info.getSecondChance())
{
giveItemRandomly(killer, npc, LIENRIK_EGG2, 1, 0, 1.0, true);
giveItemRandomly(killer, npc, LIENRIK_EGG2, 1, 0, 1, true);
}
return super.onKill(npc, killer, isSummon);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java vendored
View File

@@ -146,7 +146,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
else
{
final int itemCount = ((getRandom(100) < MOB2.get(npcId)) ? 2 : 1);
giveItemRandomly(player, npc, ALLIGATOR_TOOTH, itemCount, 0, 1.0, true);
giveItemRandomly(player, npc, ALLIGATOR_TOOTH, itemCount, 0, 1, true);
}
giveItemRandomly(player, npc, MYSTERIOUS_MAP_PIECE, 1, 0, 0.1, false);

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java vendored
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);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java vendored
View File

@@ -102,7 +102,7 @@ public class Q00366_SilverHairedShaman extends Quest
final Player luckyPlayer = getRandomPartyMember(player, npc);
if (luckyPlayer != null)
{
giveItemRandomly(luckyPlayer, npc, SAIRONS_SILVER_HAIR, 1, 0, 1.0, true);
giveItemRandomly(luckyPlayer, npc, SAIRONS_SILVER_HAIR, 1, 0, 1, true);
}
}
return super.onKill(npc, player, isSummon);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java vendored
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);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java vendored
View File

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

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java vendored
View File

@@ -192,11 +192,11 @@ public class Q00371_ShrieksOfGhosts extends Quest
final int random = getRandom(1000);
if (random < info.getFirstChance())
{
giveItemRandomly(qs.getPlayer(), npc, ANCIENT_ASH_URN, 1, 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, ANCIENT_ASH_URN, 1, 0, 1, true);
}
else if (random < info.getSecondChance())
{
giveItemRandomly(qs.getPlayer(), npc, ANCIENT_PORCELAIN, 1, 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, ANCIENT_PORCELAIN, 1, 0, 1, true);
}
return super.onKill(npc, killer, isSummon);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java vendored
View File

@@ -110,7 +110,7 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
final int npcId = npc.getId();
if (MOBS1.containsKey(npcId))
{
giveItemRandomly(qs.getPlayer(), npc, TITAN_ANCIENT_BOOK, (getRandom(1000) < MOBS1.get(npcId)) ? 3 : 2, 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, TITAN_ANCIENT_BOOK, (getRandom(1000) < MOBS1.get(npcId)) ? 3 : 2, 0, 1, true);
}
else
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java vendored
View File

@@ -120,7 +120,7 @@ public class Q00379_FantasyWine extends Quest
}
final ItemHolder dropItem = ((npc.getId() == ENKU_ORC_CHAMPION) ? LEAF_OF_EUCALYPTUS : STONE_OF_CHILL);
if (giveItemRandomly(killer, npc, dropItem.getId(), 1, dropItem.getCount(), 1.0, true) && hasAllItems(killer, true, LEAF_OF_EUCALYPTUS, STONE_OF_CHILL))
if (giveItemRandomly(killer, npc, dropItem.getId(), 1, dropItem.getCount(), 1, true) && hasAllItems(killer, true, LEAF_OF_EUCALYPTUS, STONE_OF_CHILL))
{
qs.setCond(2);
}

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java vendored
View File

@@ -71,13 +71,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()

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java vendored
View File

@@ -412,7 +412,7 @@ public class Q00417_PathOfTheScavenger extends Quest
}
case HONEY_BEAR:
{
if (npc.isScriptValue(2) && firstAttacker && ((Attackable) npc).isSpoiled() && hasQuestItems(killer, BEAR_PICTURE) && giveItemRandomly(killer, npc, HONEY_JAR, 1, 5, 1.0, true))
if (npc.isScriptValue(2) && firstAttacker && ((Attackable) npc).isSpoiled() && hasQuestItems(killer, BEAR_PICTURE) && giveItemRandomly(killer, npc, HONEY_JAR, 1, 5, 1, true))
{
qs.setCond(6);
}
@@ -421,7 +421,7 @@ public class Q00417_PathOfTheScavenger extends Quest
case HUNTER_TARANTULA:
case PLUNDER_TARANTULA:
{
if (npc.isScriptValue(2) && firstAttacker && ((Attackable) npc).isSpoiled() && hasQuestItems(killer, TARANTULA_PICTURE) && giveItemRandomly(killer, npc, BEAD, 1, 20, 1.0, true))
if (npc.isScriptValue(2) && firstAttacker && ((Attackable) npc).isSpoiled() && hasQuestItems(killer, TARANTULA_PICTURE) && giveItemRandomly(killer, npc, BEAD, 1, 20, 1, true))
{
qs.setCond(8);
}

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java vendored
View File

@@ -255,7 +255,7 @@ public class Q00501_ProofOfClanAlliance extends Quest
{
if ((getRandom(10) == 1) && (lqs.getMemoState() >= 3) && (lqs.getMemoState() < 6))
{
giveItemRandomly(player, npc, HERB_OF_OEL_MAHUM, 1, 0, 1.0, true);
giveItemRandomly(player, npc, HERB_OF_OEL_MAHUM, 1, 0, 1, true);
}
break;
}
@@ -263,7 +263,7 @@ public class Q00501_ProofOfClanAlliance extends Quest
{
if ((getRandom(10) == 1) && (lqs.getMemoState() >= 3) && (lqs.getMemoState() < 6))
{
giveItemRandomly(player, npc, HERB_OF_HARIT, 1, 0, 1.0, true);
giveItemRandomly(player, npc, HERB_OF_HARIT, 1, 0, 1, true);
}
break;
}
@@ -271,7 +271,7 @@ public class Q00501_ProofOfClanAlliance extends Quest
{
if ((getRandom(10) == 1) && (lqs.getMemoState() >= 3) && (lqs.getMemoState() < 6))
{
giveItemRandomly(player, npc, HERB_OF_VANOR, 1, 0, 1.0, true);
giveItemRandomly(player, npc, HERB_OF_VANOR, 1, 0, 1, true);
}
break;
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java vendored
View File

@@ -274,7 +274,7 @@ public class Q00619_RelicsOfTheOldEmpire extends Quest
if (CommonUtil.contains(ARCHON_OF_HALISHA, npcId))
{
final int itemCount = ((getRandom(100) < 79) ? 4 : 3);
giveItemRandomly(player, npc, BROKEN_RELIC_PART, itemCount, 0, 1.0, true);
giveItemRandomly(player, npc, BROKEN_RELIC_PART, itemCount, 0, 1, true);
}
else
{

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java vendored
View File

@@ -465,12 +465,12 @@ public class Q00620_FourGoblets extends Quest
else if (MOB2.containsKey(npcId))
{
final int itemCount = ((getRandom(100) < MOB2.get(npc.getId())) ? 2 : 1);
giveItemRandomly(qs.getPlayer(), npc, SEALED_BOX, itemCount, 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, SEALED_BOX, itemCount, 0, 1, true);
}
else
{
final int itemCount = ((getRandom(100) < MOB3.get(npc.getId())) ? 5 : 4);
giveItemRandomly(qs.getPlayer(), npc, SEALED_BOX, itemCount, 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, SEALED_BOX, itemCount, 0, 1, true);
}
}
break;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java vendored
View File

@@ -161,7 +161,7 @@ public class Q00634_InSearchOfFragmentsOfDimension extends Quest
final int i0 = (int) ((0.15 * npc.getLevel()) + 1.6);
if (getRandom(100) < 10)
{
giveItemRandomly(qs.getPlayer(), npc, DIMENSIONAL_FRAGMENT, i0, 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, DIMENSIONAL_FRAGMENT, i0, 0, 1, true);
}
}
return super.onKill(npc, player, isSummon);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java vendored
View File

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

4
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -702,7 +702,7 @@ public class Formulas
}
case SHIELD_DEFENSE_PERFECT_BLOCK: // perfect block
{
return 1.;
return 1;
}
}
@@ -1841,7 +1841,7 @@ public class Formulas
{
return 0;
}
return creature.calcStat(Stat.FALL, (fallHeight * creature.getMaxHp()) / 1000.0, null, null);
return creature.calcStat(Stat.FALL, (fallHeight * creature.getMaxHp()) / 1000, null, null);
}
public static boolean calcBlowSuccess(Creature creature, Creature target, Skill skill)