From a15695b7fa163198f41e05a9f582a390f3eeb699 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 1 Feb 2022 00:19:29 +0000 Subject: [PATCH] Minor code cleanup. Thanks to nasseka. --- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00032_AnObviousLie.java | 2 +- .../Q00038_DragonFangs.java | 2 +- .../Q00177_SplitDestiny.java | 4 +-- .../Q00278_HomeSecurity.java | 2 +- .../Q00371_ShrieksOfGhosts.java | 4 +-- ...00377_ExplorationOfTheGiantsCavePart2.java | 2 +- .../Q00483_IntendedTactic.java | 2 +- .../Q00501_ProofOfClanAlliance.java | 6 ++-- .../Q00642_APowerfulPrimevalCreature.java | 2 +- .../Q10292_SevenSignsGirlOfDoubt.java | 2 +- .../Q10740_NeverForget.java | 2 +- .../Q10741_ADraughtForTheCold.java | 2 +- .../Q10743_StrangeFungus.java | 2 +- .../Q10744_StrongerThanSteel.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 4 +-- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 4 +-- .../stats/finalizers/MaxHpFinalizer.java | 4 +-- .../stats/finalizers/MaxMpFinalizer.java | 4 +-- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 4 +-- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00032_AnObviousLie.java | 2 +- .../Q00038_DragonFangs.java | 2 +- .../Q00177_SplitDestiny.java | 4 +-- .../Q00278_HomeSecurity.java | 2 +- .../Q00371_ShrieksOfGhosts.java | 4 +-- ...00377_ExplorationOfTheGiantsCavePart2.java | 2 +- .../Q00483_IntendedTactic.java | 2 +- .../Q00501_ProofOfClanAlliance.java | 6 ++-- .../Q00642_APowerfulPrimevalCreature.java | 2 +- .../Q00826_InSearchOfTheSecretWeapon.java | 2 +- .../Q00827_EinhasadsOrder.java | 2 +- .../Q00831_SayhasScheme.java | 2 +- .../Q00835_PitiableMelisa.java | 2 +- .../Q10292_SevenSignsGirlOfDoubt.java | 2 +- .../Q10740_NeverForget.java | 2 +- .../Q10741_ADraughtForTheCold.java | 2 +- .../Q10743_StrangeFungus.java | 2 +- .../Q10744_StrongerThanSteel.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 4 +-- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 4 +-- .../stats/finalizers/MaxHpFinalizer.java | 4 +-- .../stats/finalizers/MaxMpFinalizer.java | 4 +-- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 4 +-- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00032_AnObviousLie.java | 2 +- .../Q00177_SplitDestiny.java | 4 +-- .../Q00278_HomeSecurity.java | 2 +- .../Q00371_ShrieksOfGhosts.java | 4 +-- .../Q00483_IntendedTactic.java | 2 +- .../Q00501_ProofOfClanAlliance.java | 6 ++-- .../Q00642_APowerfulPrimevalCreature.java | 2 +- .../Q00826_InSearchOfTheSecretWeapon.java | 2 +- .../Q00827_EinhasadsOrder.java | 2 +- .../Q00831_SayhasScheme.java | 2 +- .../Q00835_PitiableMelisa.java | 2 +- .../Q00926_30DaySearchOperation.java | 2 +- .../Q00928_100DaySubjugationOperation.java | 2 +- .../Q10292_SevenSignsGirlOfDoubt.java | 2 +- .../Q10740_NeverForget.java | 2 +- .../Q10741_ADraughtForTheCold.java | 2 +- .../Q10743_StrangeFungus.java | 2 +- .../Q10744_StrongerThanSteel.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 4 +-- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 4 +-- .../stats/finalizers/MaxHpFinalizer.java | 4 +-- .../stats/finalizers/MaxMpFinalizer.java | 4 +-- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 4 +-- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00032_AnObviousLie.java | 2 +- .../Q00177_SplitDestiny.java | 4 +-- .../Q00278_HomeSecurity.java | 2 +- .../Q00371_ShrieksOfGhosts.java | 4 +-- .../Q00483_IntendedTactic.java | 2 +- .../Q00501_ProofOfClanAlliance.java | 6 ++-- .../Q00642_APowerfulPrimevalCreature.java | 2 +- .../Q00826_InSearchOfTheSecretWeapon.java | 2 +- .../Q00827_EinhasadsOrder.java | 2 +- .../Q00831_SayhasScheme.java | 2 +- .../Q00835_PitiableMelisa.java | 2 +- .../Q00926_30DaySearchOperation.java | 2 +- .../Q00928_100DaySubjugationOperation.java | 2 +- .../Q10292_SevenSignsGirlOfDoubt.java | 2 +- .../Q10740_NeverForget.java | 2 +- .../Q10741_ADraughtForTheCold.java | 2 +- .../Q10743_StrangeFungus.java | 2 +- .../Q10744_StrongerThanSteel.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 4 +-- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 4 +-- .../stats/finalizers/MaxHpFinalizer.java | 4 +-- .../stats/finalizers/MaxMpFinalizer.java | 4 +-- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 4 +-- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00032_AnObviousLie.java | 2 +- .../Q00177_SplitDestiny.java | 4 +-- .../Q00278_HomeSecurity.java | 2 +- .../Q00371_ShrieksOfGhosts.java | 4 +-- .../Q00483_IntendedTactic.java | 2 +- .../Q00642_APowerfulPrimevalCreature.java | 2 +- .../Q00826_InSearchOfTheSecretWeapon.java | 2 +- .../Q00827_EinhasadsOrder.java | 2 +- .../Q00831_SayhasScheme.java | 2 +- .../Q00835_PitiableMelisa.java | 2 +- .../Q00926_30DaySearchOperation.java | 2 +- .../Q00928_100DaySubjugationOperation.java | 2 +- .../Q10292_SevenSignsGirlOfDoubt.java | 2 +- .../Q10740_NeverForget.java | 2 +- .../Q10741_ADraughtForTheCold.java | 2 +- .../Q10743_StrangeFungus.java | 2 +- .../Q10744_StrongerThanSteel.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 4 +-- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 4 +-- .../stats/finalizers/MaxHpFinalizer.java | 4 +-- .../stats/finalizers/MaxMpFinalizer.java | 4 +-- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 4 +-- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00032_AnObviousLie.java | 2 +- .../Q00177_SplitDestiny.java | 4 +-- .../Q00371_ShrieksOfGhosts.java | 4 +-- .../Q00483_IntendedTactic.java | 2 +- .../Q00826_InSearchOfTheSecretWeapon.java | 2 +- .../Q00827_EinhasadsOrder.java | 2 +- .../Q00831_SayhasScheme.java | 2 +- .../Q00835_PitiableMelisa.java | 2 +- .../Q00926_30DaySearchOperation.java | 2 +- .../Q00928_100DaySubjugationOperation.java | 2 +- .../Q10292_SevenSignsGirlOfDoubt.java | 2 +- .../Q10740_NeverForget.java | 2 +- .../Q10741_ADraughtForTheCold.java | 2 +- .../Q10743_StrangeFungus.java | 2 +- .../Q10744_StrongerThanSteel.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 4 +-- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 4 +-- .../stats/finalizers/MaxHpFinalizer.java | 4 +-- .../stats/finalizers/MaxMpFinalizer.java | 4 +-- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 4 +-- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00032_AnObviousLie.java | 2 +- .../Q00177_SplitDestiny.java | 4 +-- .../Q00371_ShrieksOfGhosts.java | 4 +-- .../Q00483_IntendedTactic.java | 2 +- .../Q00826_InSearchOfTheSecretWeapon.java | 2 +- .../Q00827_EinhasadsOrder.java | 2 +- .../Q00831_SayhasScheme.java | 2 +- .../Q00835_PitiableMelisa.java | 2 +- .../Q00926_30DaySearchOperation.java | 2 +- .../Q00928_100DaySubjugationOperation.java | 2 +- .../Q10292_SevenSignsGirlOfDoubt.java | 2 +- .../Q10740_NeverForget.java | 2 +- .../Q10741_ADraughtForTheCold.java | 2 +- .../Q10743_StrangeFungus.java | 2 +- .../Q10744_StrongerThanSteel.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 4 +-- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 4 +-- .../stats/finalizers/MaxHpFinalizer.java | 4 +-- .../stats/finalizers/MaxMpFinalizer.java | 4 +-- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 4 +-- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00032_AnObviousLie.java | 2 +- .../Q00826_InSearchOfTheSecretWeapon.java | 2 +- .../Q00827_EinhasadsOrder.java | 2 +- .../Q00831_SayhasScheme.java | 2 +- .../Q00835_PitiableMelisa.java | 2 +- .../Q00926_30DaySearchOperation.java | 2 +- .../Q00928_100DaySubjugationOperation.java | 2 +- .../gameserver/model/stats/Formulas.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 4 +-- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 4 +-- .../stats/finalizers/MaxHpFinalizer.java | 4 +-- .../stats/finalizers/MaxMpFinalizer.java | 4 +-- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 4 +-- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00835_PitiableMelisa.java | 2 +- .../gameserver/model/stats/Formulas.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 4 +-- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 4 +-- .../stats/finalizers/MaxHpFinalizer.java | 4 +-- .../stats/finalizers/MaxMpFinalizer.java | 4 +-- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 4 +-- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00835_PitiableMelisa.java | 2 +- .../gameserver/model/stats/Formulas.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 4 +-- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 4 +-- .../stats/finalizers/MaxHpFinalizer.java | 4 +-- .../stats/finalizers/MaxMpFinalizer.java | 4 +-- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 4 +-- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00835_PitiableMelisa.java | 2 +- .../gameserver/model/stats/Formulas.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 4 +-- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 4 +-- .../stats/finalizers/MaxHpFinalizer.java | 4 +-- .../stats/finalizers/MaxMpFinalizer.java | 4 +-- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 4 +-- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../Q335_TheSongOfTheHunter.java | 6 ++-- .../gameserver/model/skill/Formulas.java | 2 +- .../Q335_TheSongOfTheHunter.java | 6 ++-- .../gameserver/model/skill/Formulas.java | 2 +- .../Q00032_AnObviousLie.java | 2 +- .../Q00038_DragonFangs.java | 2 +- .../Q00103_SpiritOfCraftsman.java | 2 +- .../Q00175_TheWayOfTheWarrior.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 30 +++++++++---------- .../Q00230_TestOfTheSummoner.java | 24 +++++++-------- .../Q00233_TestOfTheWarSpirit.java | 8 ++--- .../Q00235_MimirsElixir.java | 2 +- .../Q00266_PleasOfPixies.java | 2 +- .../Q00291_RevengeOfTheRedbonnet.java | 2 +- .../Q00292_BrigandsSweep.java | 4 +-- .../Q00294_CovertBusiness.java | 2 +- .../Q00295_DreamingOfTheSkies.java | 2 +- .../Q00325_GrimCollector.java | 2 +- .../Q00329_CuriosityOfADwarf.java | 2 +- .../Q00335_TheSongOfTheHunter.java | 10 +++---- .../Q00351_BlackSwan/Q00351_BlackSwan.java | 10 +++---- .../Q00352_HelpRoodRaiseANewPet.java | 4 +-- .../Q00354_ConquestOfAlligatorIsland.java | 2 +- .../Q00355_FamilyHonor.java | 4 +-- .../Q00366_SilverHairedShaman.java | 2 +- .../Q00369_CollectorOfJewels.java | 2 +- .../Q00370_AnElderSowsSeeds.java | 2 +- .../Q00371_ShrieksOfGhosts.java | 4 +-- ...00377_ExplorationOfTheGiantsCavePart2.java | 2 +- .../Q00379_FantasyWine.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 14 ++++----- .../Q00417_PathOfTheScavenger.java | 4 +-- .../Q00501_ProofOfClanAlliance.java | 6 ++-- .../Q00619_RelicsOfTheOldEmpire.java | 2 +- .../Q00620_FourGoblets.java | 4 +-- ...Q00634_InSearchOfFragmentsOfDimension.java | 2 +- .../Q00642_APowerfulPrimevalCreature.java | 2 +- .../gameserver/model/stats/Formulas.java | 4 +-- .../Q00032_AnObviousLie.java | 2 +- .../Q00038_DragonFangs.java | 2 +- .../Q00103_SpiritOfCraftsman.java | 2 +- .../Q00175_TheWayOfTheWarrior.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 30 +++++++++---------- .../Q00230_TestOfTheSummoner.java | 24 +++++++-------- .../Q00233_TestOfTheWarSpirit.java | 8 ++--- .../Q00235_MimirsElixir.java | 2 +- .../Q00266_PleasOfPixies.java | 2 +- .../Q00278_HomeSecurity.java | 2 +- .../Q00291_RevengeOfTheRedbonnet.java | 2 +- .../Q00292_BrigandsSweep.java | 4 +-- .../Q00294_CovertBusiness.java | 2 +- .../Q00295_DreamingOfTheSkies.java | 2 +- .../Q00325_GrimCollector.java | 2 +- .../Q00329_CuriosityOfADwarf.java | 2 +- .../Q00335_TheSongOfTheHunter.java | 10 +++---- .../Q00351_BlackSwan/Q00351_BlackSwan.java | 10 +++---- .../Q00352_HelpRoodRaiseANewPet.java | 4 +-- .../Q00354_ConquestOfAlligatorIsland.java | 2 +- .../Q00355_FamilyHonor.java | 4 +-- .../Q00366_SilverHairedShaman.java | 2 +- .../Q00369_CollectorOfJewels.java | 2 +- .../Q00370_AnElderSowsSeeds.java | 2 +- .../Q00371_ShrieksOfGhosts.java | 4 +-- ...00377_ExplorationOfTheGiantsCavePart2.java | 2 +- .../Q00379_FantasyWine.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 14 ++++----- .../Q00417_PathOfTheScavenger.java | 4 +-- .../Q00501_ProofOfClanAlliance.java | 6 ++-- .../Q00619_RelicsOfTheOldEmpire.java | 2 +- .../Q00620_FourGoblets.java | 4 +-- ...Q00634_InSearchOfFragmentsOfDimension.java | 2 +- .../Q00642_APowerfulPrimevalCreature.java | 2 +- .../gameserver/model/stats/Formulas.java | 4 +-- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00103_SpiritOfCraftsman.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 30 +++++++++---------- .../Q00230_TestOfTheSummoner.java | 24 +++++++-------- .../Q00233_TestOfTheWarSpirit.java | 8 ++--- .../Q00266_PleasOfPixies.java | 2 +- .../Q00291_RevengeOfTheRedbonnet.java | 2 +- .../Q00292_BrigandsSweep.java | 4 +-- .../Q00294_CovertBusiness.java | 2 +- .../Q00295_DreamingOfTheSkies.java | 2 +- .../Q00325_GrimCollector.java | 2 +- .../Q00329_CuriosityOfADwarf.java | 2 +- .../Q00354_ConquestOfAlligatorIsland.java | 2 +- .../Q00355_FamilyHonor.java | 4 +-- .../Q00369_CollectorOfJewels.java | 2 +- .../Q00370_AnElderSowsSeeds.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 14 ++++----- .../Q00417_PathOfTheScavenger.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 2 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 30 +++++++++---------- .../Q00230_TestOfTheSummoner.java | 24 +++++++-------- .../Q00233_TestOfTheWarSpirit.java | 8 ++--- .../Q00266_PleasOfPixies.java | 2 +- .../Q00292_BrigandsSweep.java | 4 +-- .../Q00294_CovertBusiness.java | 2 +- .../Q00295_DreamingOfTheSkies.java | 2 +- .../Q00325_GrimCollector.java | 2 +- .../Q00329_CuriosityOfADwarf.java | 2 +- .../Q00354_ConquestOfAlligatorIsland.java | 2 +- .../Q00355_FamilyHonor.java | 4 +-- .../Q00369_CollectorOfJewels.java | 2 +- .../Q00370_AnElderSowsSeeds.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 14 ++++----- .../Q00417_PathOfTheScavenger.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 2 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 30 +++++++++---------- .../Q00230_TestOfTheSummoner.java | 24 +++++++-------- .../Q00233_TestOfTheWarSpirit.java | 8 ++--- .../Q00266_PleasOfPixies.java | 2 +- .../Q00292_BrigandsSweep.java | 4 +-- .../Q00294_CovertBusiness.java | 2 +- .../Q00295_DreamingOfTheSkies.java | 2 +- .../Q00325_GrimCollector.java | 2 +- .../Q00329_CuriosityOfADwarf.java | 2 +- .../Q00354_ConquestOfAlligatorIsland.java | 2 +- .../Q00355_FamilyHonor.java | 4 +-- .../Q00369_CollectorOfJewels.java | 2 +- .../Q00370_AnElderSowsSeeds.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 14 ++++----- .../Q00417_PathOfTheScavenger.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 2 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 30 +++++++++---------- .../Q00230_TestOfTheSummoner.java | 24 +++++++-------- .../Q00233_TestOfTheWarSpirit.java | 8 ++--- .../Q00266_PleasOfPixies.java | 2 +- .../Q00292_BrigandsSweep.java | 4 +-- .../Q00294_CovertBusiness.java | 2 +- .../Q00295_DreamingOfTheSkies.java | 2 +- .../Q00325_GrimCollector.java | 2 +- .../Q00329_CuriosityOfADwarf.java | 2 +- .../Q00354_ConquestOfAlligatorIsland.java | 2 +- .../Q00355_FamilyHonor.java | 4 +-- .../Q00369_CollectorOfJewels.java | 2 +- .../Q00370_AnElderSowsSeeds.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 14 ++++----- .../Q00417_PathOfTheScavenger.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 2 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 30 +++++++++---------- .../Q00230_TestOfTheSummoner.java | 24 +++++++-------- .../Q00233_TestOfTheWarSpirit.java | 8 ++--- .../Q00266_PleasOfPixies.java | 2 +- .../Q00292_BrigandsSweep.java | 4 +-- .../Q00294_CovertBusiness.java | 2 +- .../Q00295_DreamingOfTheSkies.java | 2 +- .../Q00325_GrimCollector.java | 2 +- .../Q00329_CuriosityOfADwarf.java | 2 +- .../Q00354_ConquestOfAlligatorIsland.java | 2 +- .../Q00355_FamilyHonor.java | 4 +-- .../Q00369_CollectorOfJewels.java | 2 +- .../Q00370_AnElderSowsSeeds.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 14 ++++----- .../Q00417_PathOfTheScavenger.java | 4 +-- .../gameserver/model/stats/Formulas.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 2 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00329_CuriosityOfADwarf.java | 2 +- .../Q00354_ConquestOfAlligatorIsland.java | 2 +- .../Q00355_FamilyHonor.java | 4 +-- .../Q00369_CollectorOfJewels.java | 2 +- .../Q00370_AnElderSowsSeeds.java | 2 +- .../gameserver/model/stats/Formulas.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 2 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../Q00032_AnObviousLie.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 30 +++++++++---------- .../Q00230_TestOfTheSummoner.java | 24 +++++++-------- .../Q00233_TestOfTheWarSpirit.java | 8 ++--- .../Q00266_PleasOfPixies.java | 2 +- .../Q00292_BrigandsSweep.java | 4 +-- .../Q00294_CovertBusiness.java | 2 +- .../Q00295_DreamingOfTheSkies.java | 2 +- .../Q00325_GrimCollector.java | 2 +- .../Q00329_CuriosityOfADwarf.java | 2 +- .../Q00354_ConquestOfAlligatorIsland.java | 2 +- .../Q00355_FamilyHonor.java | 4 +-- .../Q00369_CollectorOfJewels.java | 2 +- .../Q00370_AnElderSowsSeeds.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 14 ++++----- .../Q00417_PathOfTheScavenger.java | 4 +-- .../Q00642_APowerfulPrimevalCreature.java | 2 +- .../gameserver/model/stats/Formulas.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 2 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../gameserver/model/stats/Formulas.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 2 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../gameserver/model/stats/Formulas.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 2 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../gameserver/model/stats/Formulas.java | 2 +- .../finalizers/MAttackSpeedFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../stats/finalizers/MaxCpFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 2 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../finalizers/PAttackSpeedFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../finalizers/VampiricChanceFinalizer.java | 2 +- 600 files changed, 1013 insertions(+), 1013 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index c586a254b1..ab85113705 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java index 33f8ddcf74..bf248d2979 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java @@ -294,7 +294,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); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java index 490b89a85c..422fe286e6 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java @@ -330,7 +330,7 @@ public class Q00177_SplitDestiny extends Quest { if (CommonUtil.contains(GIANTS_HAND_MONSTERS, npc.getId())) { - if (giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1.0, true)) + if (giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1, true)) { qs.setCond(3, true); } @@ -350,7 +350,7 @@ public class Q00177_SplitDestiny extends Quest { if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId())) { - if (giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1.0, true)) + if (giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1, true)) { qs.setCond(6, true); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index a26af3307a..74b891182a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -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); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java index a858ada686..248239899b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java @@ -192,11 +192,11 @@ public class Q00371_ShrieksOfGhosts extends Quest final int random = getRandom(1000); if (random < info.getFirstChance()) { - giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1, true); } else if (random < info.getSecondChance()) { - giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1, true); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java index 908a234ca5..3a52057d9a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java @@ -108,7 +108,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 { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java index 76bfe53daf..e15e32b144 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java @@ -166,7 +166,7 @@ public class Q00483_IntendedTactic extends Quest { qs.setCond(2, true); } - if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1.0, true)) + if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1, true)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java index 803af0eb50..ffc938563f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java @@ -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; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java index ba55c590fc..3ad4eb9269 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java @@ -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); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index b658dc69ff..4a68875612 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -204,7 +204,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest if (CommonUtil.contains(MOBS, npc.getId())) { final QuestState qs = getRandomPartyMemberState(player, 3, 3, npc); - if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1.0, true)) + if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1, true)) { qs.setCond(4, true); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index 72d63a6b82..4b4379d023 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -188,7 +188,7 @@ public class Q10740_NeverForget extends Quest public String onKill(Npc npc, Player killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1.0, true)) + if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index d22170f70f..897dc08246 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -161,7 +161,7 @@ public class Q10741_ADraughtForTheCold extends Quest } case KIKU: { - giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1.0, true); + giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1, true); break; } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index b8d375dd3c..62be95fe57 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -172,7 +172,7 @@ public class Q10743_StrangeFungus extends Quest } case EVOLVED_GROWLER: { - if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1.0, true)) + if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index f7e629a9b5..a30ff5fd9d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -148,11 +148,11 @@ public class Q10744_StrongerThanSteel extends Quest { if (npc.getId() == TREANT) { - giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1.0, true); + giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1, true); } else if (npc.getId() == LEAFIE) { - giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1.0, true); + giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1, true); } if ((getQuestItemsCount(killer, TREANT_LEAF) >= 20) && (getQuestItemsCount(killer, LEAFIE_LEAF) >= 15)) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java index c91e4600de..e4458cec1e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index c92146cd4a..e7c108fde1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction } // Calculate modifiers Magic Attack - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072); return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index e35c300501..b8bcb8013e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1; baseValue *= witBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 31df739b0f..c3257b0c0f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -86,7 +86,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); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 8c1500146e..6781b65584 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction { baseValue = player.getTemplate().getBaseCpMax(player.getLevel()); } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return Stat.defaultValue(creature, stat, baseValue); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 6520c65fef..da29d1caa9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index d4043c0c83..cb994ce561 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1; baseValue *= menBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index a244f65cc8..0c8bb74a2d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction { baseValue *= Config.RAID_PATTACK_MULTIPLIER; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus; return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index f43b26d2c6..05528df9d7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction { baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1; baseValue *= dexBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index c586a254b1..ab85113705 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java index 33f8ddcf74..bf248d2979 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java @@ -294,7 +294,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); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java index 490b89a85c..422fe286e6 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java @@ -330,7 +330,7 @@ public class Q00177_SplitDestiny extends Quest { if (CommonUtil.contains(GIANTS_HAND_MONSTERS, npc.getId())) { - if (giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1.0, true)) + if (giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1, true)) { qs.setCond(3, true); } @@ -350,7 +350,7 @@ public class Q00177_SplitDestiny extends Quest { if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId())) { - if (giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1.0, true)) + if (giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1, true)) { qs.setCond(6, true); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index a26af3307a..74b891182a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -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); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java index a858ada686..248239899b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java @@ -192,11 +192,11 @@ public class Q00371_ShrieksOfGhosts extends Quest final int random = getRandom(1000); if (random < info.getFirstChance()) { - giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1, true); } else if (random < info.getSecondChance()) { - giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1, true); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java index 908a234ca5..3a52057d9a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java @@ -108,7 +108,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 { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java index 76bfe53daf..e15e32b144 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java @@ -166,7 +166,7 @@ public class Q00483_IntendedTactic extends Quest { qs.setCond(2, true); } - if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1.0, true)) + if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1, true)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java index 803af0eb50..ffc938563f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java @@ -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; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java index ba55c590fc..3ad4eb9269 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java @@ -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); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java index a13d1c187e..33c9979b4a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java @@ -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); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java index bbdfb502db..8b7399c41e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java @@ -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); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java index bb28178182..9584d686bc 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java @@ -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); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java index 27c4586ec0..6448125f2f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java @@ -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); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index b658dc69ff..4a68875612 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -204,7 +204,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest if (CommonUtil.contains(MOBS, npc.getId())) { final QuestState qs = getRandomPartyMemberState(player, 3, 3, npc); - if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1.0, true)) + if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1, true)) { qs.setCond(4, true); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index 72d63a6b82..4b4379d023 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -188,7 +188,7 @@ public class Q10740_NeverForget extends Quest public String onKill(Npc npc, Player killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1.0, true)) + if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index d22170f70f..897dc08246 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -161,7 +161,7 @@ public class Q10741_ADraughtForTheCold extends Quest } case KIKU: { - giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1.0, true); + giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1, true); break; } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index b8d375dd3c..62be95fe57 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -172,7 +172,7 @@ public class Q10743_StrangeFungus extends Quest } case EVOLVED_GROWLER: { - if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1.0, true)) + if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index f7e629a9b5..a30ff5fd9d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -148,11 +148,11 @@ public class Q10744_StrongerThanSteel extends Quest { if (npc.getId() == TREANT) { - giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1.0, true); + giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1, true); } else if (npc.getId() == LEAFIE) { - giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1.0, true); + giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1, true); } if ((getQuestItemsCount(killer, TREANT_LEAF) >= 20) && (getQuestItemsCount(killer, LEAFIE_LEAF) >= 15)) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java index c91e4600de..e4458cec1e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index c92146cd4a..e7c108fde1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction } // Calculate modifiers Magic Attack - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072); return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index e35c300501..b8bcb8013e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1; baseValue *= witBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 31df739b0f..c3257b0c0f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -86,7 +86,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); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 8c1500146e..6781b65584 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction { baseValue = player.getTemplate().getBaseCpMax(player.getLevel()); } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return Stat.defaultValue(creature, stat, baseValue); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 6520c65fef..da29d1caa9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index d4043c0c83..cb994ce561 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1; baseValue *= menBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index a244f65cc8..0c8bb74a2d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction { baseValue *= Config.RAID_PATTACK_MULTIPLIER; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus; return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index f43b26d2c6..05528df9d7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction { baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1; baseValue *= dexBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index c586a254b1..ab85113705 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java index ff4554e3f1..22ae037b8c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java @@ -321,7 +321,7 @@ public class Q00177_SplitDestiny extends Quest } case 2: { - if ((npc.getId() == VAMPIRICE_BERISE) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1.0, true)) + if ((npc.getId() == VAMPIRICE_BERISE) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1, true)) { qs.setCond(3, true); } @@ -338,7 +338,7 @@ public class Q00177_SplitDestiny extends Quest } case 5: { - if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId()) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1.0, true)) + if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId()) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1, true)) { qs.setCond(6, true); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index a26af3307a..74b891182a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -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); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java index b991a7293d..b2e53f6314 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java @@ -193,11 +193,11 @@ public class Q00371_ShrieksOfGhosts extends Quest final int random = getRandom(1000); if (random < info.getFirstChance()) { - giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1, true); } else if (random < info.getSecondChance()) { - giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1, true); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java index 76bfe53daf..e15e32b144 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java @@ -166,7 +166,7 @@ public class Q00483_IntendedTactic extends Quest { qs.setCond(2, true); } - if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1.0, true)) + if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1, true)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java index 803af0eb50..ffc938563f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java @@ -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; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java index ba55c590fc..3ad4eb9269 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java @@ -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); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java index a13d1c187e..33c9979b4a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java @@ -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); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java index bbdfb502db..8b7399c41e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java @@ -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); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java index bb28178182..9584d686bc 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java @@ -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); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java index 27c4586ec0..6448125f2f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java @@ -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); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java index 0642f90526..0c68f67f34 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java @@ -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); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java index 0bc846fc2f..18391c86e3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java @@ -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); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 2e1f2aa5f8..4f42181d0b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -196,7 +196,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest if (CommonUtil.contains(MOBS, npc.getId())) { final QuestState qs = getRandomPartyMemberState(player, 3, 3, npc); - if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1.0, true)) + if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1, true)) { qs.setCond(4, true); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index 72d63a6b82..4b4379d023 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -188,7 +188,7 @@ public class Q10740_NeverForget extends Quest public String onKill(Npc npc, Player killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1.0, true)) + if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index d22170f70f..897dc08246 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -161,7 +161,7 @@ public class Q10741_ADraughtForTheCold extends Quest } case KIKU: { - giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1.0, true); + giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1, true); break; } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index b8d375dd3c..62be95fe57 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -172,7 +172,7 @@ public class Q10743_StrangeFungus extends Quest } case EVOLVED_GROWLER: { - if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1.0, true)) + if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index f7e629a9b5..a30ff5fd9d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -148,11 +148,11 @@ public class Q10744_StrongerThanSteel extends Quest { if (npc.getId() == TREANT) { - giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1.0, true); + giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1, true); } else if (npc.getId() == LEAFIE) { - giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1.0, true); + giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1, true); } if ((getQuestItemsCount(killer, TREANT_LEAF) >= 20) && (getQuestItemsCount(killer, LEAFIE_LEAF) >= 15)) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java index c91e4600de..e4458cec1e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index c92146cd4a..e7c108fde1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction } // Calculate modifiers Magic Attack - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072); return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index e35c300501..b8bcb8013e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1; baseValue *= witBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 31df739b0f..c3257b0c0f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -86,7 +86,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); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 8c1500146e..6781b65584 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction { baseValue = player.getTemplate().getBaseCpMax(player.getLevel()); } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return Stat.defaultValue(creature, stat, baseValue); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 6520c65fef..da29d1caa9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index d4043c0c83..cb994ce561 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1; baseValue *= menBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index a244f65cc8..0c8bb74a2d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction { baseValue *= Config.RAID_PATTACK_MULTIPLIER; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus; return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index f43b26d2c6..05528df9d7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction { baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1; baseValue *= dexBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index c586a254b1..ab85113705 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java index ff4554e3f1..22ae037b8c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java @@ -321,7 +321,7 @@ public class Q00177_SplitDestiny extends Quest } case 2: { - if ((npc.getId() == VAMPIRICE_BERISE) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1.0, true)) + if ((npc.getId() == VAMPIRICE_BERISE) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1, true)) { qs.setCond(3, true); } @@ -338,7 +338,7 @@ public class Q00177_SplitDestiny extends Quest } case 5: { - if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId()) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1.0, true)) + if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId()) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1, true)) { qs.setCond(6, true); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index a26af3307a..74b891182a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java index b991a7293d..b2e53f6314 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java @@ -193,11 +193,11 @@ public class Q00371_ShrieksOfGhosts extends Quest final int random = getRandom(1000); if (random < info.getFirstChance()) { - giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1, true); } else if (random < info.getSecondChance()) { - giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1, true); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java index 76bfe53daf..e15e32b144 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java @@ -166,7 +166,7 @@ public class Q00483_IntendedTactic extends Quest { qs.setCond(2, true); } - if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1.0, true)) + if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1, true)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java index 803af0eb50..ffc938563f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java @@ -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; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java index ba55c590fc..3ad4eb9269 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java @@ -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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java index a13d1c187e..33c9979b4a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java @@ -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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java index bbdfb502db..8b7399c41e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java @@ -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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java index bb28178182..9584d686bc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java @@ -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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java index 27c4586ec0..6448125f2f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java @@ -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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java index 0642f90526..0c68f67f34 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java @@ -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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java index 0bc846fc2f..18391c86e3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java @@ -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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 2e1f2aa5f8..4f42181d0b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -196,7 +196,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest if (CommonUtil.contains(MOBS, npc.getId())) { final QuestState qs = getRandomPartyMemberState(player, 3, 3, npc); - if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1.0, true)) + if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1, true)) { qs.setCond(4, true); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index e81c7c16d3..051ea28cf9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -187,7 +187,7 @@ public class Q10740_NeverForget extends Quest public String onKill(Npc npc, Player killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1.0, true)) + if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index f491aefee7..012d6a6263 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -160,7 +160,7 @@ public class Q10741_ADraughtForTheCold extends Quest } case KIKU: { - giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1.0, true); + giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1, true); break; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 6f34d295c9..51d978fd10 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -171,7 +171,7 @@ public class Q10743_StrangeFungus extends Quest } case EVOLVED_GROWLER: { - if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1.0, true)) + if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index abb5777613..d81ff1fbc5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -147,11 +147,11 @@ public class Q10744_StrongerThanSteel extends Quest { if (npc.getId() == TREANT) { - giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1.0, true); + giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1, true); } else if (npc.getId() == LEAFIE) { - giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1.0, true); + giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1, true); } if ((getQuestItemsCount(killer, TREANT_LEAF) >= 20) && (getQuestItemsCount(killer, LEAFIE_LEAF) >= 15)) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java index c91e4600de..e4458cec1e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index c92146cd4a..e7c108fde1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction } // Calculate modifiers Magic Attack - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072); return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index e35c300501..b8bcb8013e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1; baseValue *= witBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 31df739b0f..c3257b0c0f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -86,7 +86,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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 8c1500146e..6781b65584 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction { baseValue = player.getTemplate().getBaseCpMax(player.getLevel()); } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return Stat.defaultValue(creature, stat, baseValue); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 6520c65fef..da29d1caa9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index d4043c0c83..cb994ce561 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1; baseValue *= menBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index a244f65cc8..0c8bb74a2d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction { baseValue *= Config.RAID_PATTACK_MULTIPLIER; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus; return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index f43b26d2c6..05528df9d7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction { baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1; baseValue *= dexBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index c586a254b1..ab85113705 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java index ff4554e3f1..22ae037b8c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java @@ -321,7 +321,7 @@ public class Q00177_SplitDestiny extends Quest } case 2: { - if ((npc.getId() == VAMPIRICE_BERISE) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1.0, true)) + if ((npc.getId() == VAMPIRICE_BERISE) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1, true)) { qs.setCond(3, true); } @@ -338,7 +338,7 @@ public class Q00177_SplitDestiny extends Quest } case 5: { - if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId()) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1.0, true)) + if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId()) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1, true)) { qs.setCond(6, true); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index a26af3307a..74b891182a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -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); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java index b991a7293d..b2e53f6314 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java @@ -193,11 +193,11 @@ public class Q00371_ShrieksOfGhosts extends Quest final int random = getRandom(1000); if (random < info.getFirstChance()) { - giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1, true); } else if (random < info.getSecondChance()) { - giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1, true); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java index 76bfe53daf..e15e32b144 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java @@ -166,7 +166,7 @@ public class Q00483_IntendedTactic extends Quest { qs.setCond(2, true); } - if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1.0, true)) + if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1, true)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java index ba55c590fc..3ad4eb9269 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java @@ -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); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java index a13d1c187e..33c9979b4a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java @@ -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); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java index bbdfb502db..8b7399c41e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java @@ -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); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java index bb28178182..9584d686bc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java @@ -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); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java index 27c4586ec0..6448125f2f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java @@ -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); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java index 0642f90526..0c68f67f34 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java @@ -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); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java index 0bc846fc2f..18391c86e3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java @@ -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); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 2e1f2aa5f8..4f42181d0b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -196,7 +196,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest if (CommonUtil.contains(MOBS, npc.getId())) { final QuestState qs = getRandomPartyMemberState(player, 3, 3, npc); - if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1.0, true)) + if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1, true)) { qs.setCond(4, true); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index e81c7c16d3..051ea28cf9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -187,7 +187,7 @@ public class Q10740_NeverForget extends Quest public String onKill(Npc npc, Player killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1.0, true)) + if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index f491aefee7..012d6a6263 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -160,7 +160,7 @@ public class Q10741_ADraughtForTheCold extends Quest } case KIKU: { - giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1.0, true); + giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1, true); break; } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 6f34d295c9..51d978fd10 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -171,7 +171,7 @@ public class Q10743_StrangeFungus extends Quest } case EVOLVED_GROWLER: { - if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1.0, true)) + if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index abb5777613..d81ff1fbc5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -147,11 +147,11 @@ public class Q10744_StrongerThanSteel extends Quest { if (npc.getId() == TREANT) { - giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1.0, true); + giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1, true); } else if (npc.getId() == LEAFIE) { - giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1.0, true); + giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1, true); } if ((getQuestItemsCount(killer, TREANT_LEAF) >= 20) && (getQuestItemsCount(killer, LEAFIE_LEAF) >= 15)) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java index c91e4600de..e4458cec1e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index c92146cd4a..e7c108fde1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction } // Calculate modifiers Magic Attack - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072); return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index e35c300501..b8bcb8013e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1; baseValue *= witBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 31df739b0f..c3257b0c0f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -86,7 +86,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); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 8c1500146e..6781b65584 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction { baseValue = player.getTemplate().getBaseCpMax(player.getLevel()); } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return Stat.defaultValue(creature, stat, baseValue); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 068f5c9368..98d5766746 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 0546560e58..d38eccd226 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1; baseValue *= menBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index a244f65cc8..0c8bb74a2d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction { baseValue *= Config.RAID_PATTACK_MULTIPLIER; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus; return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index f43b26d2c6..05528df9d7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction { baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1; baseValue *= dexBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index c586a254b1..ab85113705 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java index ff4554e3f1..22ae037b8c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java @@ -321,7 +321,7 @@ public class Q00177_SplitDestiny extends Quest } case 2: { - if ((npc.getId() == VAMPIRICE_BERISE) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1.0, true)) + if ((npc.getId() == VAMPIRICE_BERISE) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1, true)) { qs.setCond(3, true); } @@ -338,7 +338,7 @@ public class Q00177_SplitDestiny extends Quest } case 5: { - if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId()) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1.0, true)) + if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId()) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1, true)) { qs.setCond(6, true); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java index b991a7293d..b2e53f6314 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java @@ -193,11 +193,11 @@ public class Q00371_ShrieksOfGhosts extends Quest final int random = getRandom(1000); if (random < info.getFirstChance()) { - giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1, true); } else if (random < info.getSecondChance()) { - giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1, true); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java index 76bfe53daf..e15e32b144 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java @@ -166,7 +166,7 @@ public class Q00483_IntendedTactic extends Quest { qs.setCond(2, true); } - if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1.0, true)) + if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1, true)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java index a13d1c187e..33c9979b4a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java @@ -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); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java index bbdfb502db..8b7399c41e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java @@ -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); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java index bb28178182..9584d686bc 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java @@ -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); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java index 27c4586ec0..6448125f2f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java @@ -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); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java index 0642f90526..0c68f67f34 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java @@ -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); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java index 0bc846fc2f..18391c86e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java @@ -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); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 2e1f2aa5f8..4f42181d0b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -196,7 +196,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest if (CommonUtil.contains(MOBS, npc.getId())) { final QuestState qs = getRandomPartyMemberState(player, 3, 3, npc); - if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1.0, true)) + if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1, true)) { qs.setCond(4, true); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index e81c7c16d3..051ea28cf9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -187,7 +187,7 @@ public class Q10740_NeverForget extends Quest public String onKill(Npc npc, Player killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1.0, true)) + if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index f491aefee7..012d6a6263 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -160,7 +160,7 @@ public class Q10741_ADraughtForTheCold extends Quest } case KIKU: { - giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1.0, true); + giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1, true); break; } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 6f34d295c9..51d978fd10 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -171,7 +171,7 @@ public class Q10743_StrangeFungus extends Quest } case EVOLVED_GROWLER: { - if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1.0, true)) + if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index abb5777613..d81ff1fbc5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -147,11 +147,11 @@ public class Q10744_StrongerThanSteel extends Quest { if (npc.getId() == TREANT) { - giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1.0, true); + giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1, true); } else if (npc.getId() == LEAFIE) { - giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1.0, true); + giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1, true); } if ((getQuestItemsCount(killer, TREANT_LEAF) >= 20) && (getQuestItemsCount(killer, LEAFIE_LEAF) >= 15)) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java index c91e4600de..e4458cec1e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index c92146cd4a..e7c108fde1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction } // Calculate modifiers Magic Attack - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072); return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index e35c300501..b8bcb8013e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1; baseValue *= witBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 31df739b0f..c3257b0c0f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -86,7 +86,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); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 8c1500146e..6781b65584 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction { baseValue = player.getTemplate().getBaseCpMax(player.getLevel()); } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return Stat.defaultValue(creature, stat, baseValue); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 068f5c9368..98d5766746 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 0546560e58..d38eccd226 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1; baseValue *= menBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index a244f65cc8..0c8bb74a2d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction { baseValue *= Config.RAID_PATTACK_MULTIPLIER; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus; return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index f43b26d2c6..05528df9d7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction { baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1; baseValue *= dexBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index c586a254b1..ab85113705 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java index ff4554e3f1..22ae037b8c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java @@ -321,7 +321,7 @@ public class Q00177_SplitDestiny extends Quest } case 2: { - if ((npc.getId() == VAMPIRICE_BERISE) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1.0, true)) + if ((npc.getId() == VAMPIRICE_BERISE) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_HAND_PIECE, 1, 10, 1, true)) { qs.setCond(3, true); } @@ -338,7 +338,7 @@ public class Q00177_SplitDestiny extends Quest } case 5: { - if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId()) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1.0, true)) + if (CommonUtil.contains(GIANTS_FOOT_MONSTERS, npc.getId()) && giveItemRandomly(killer, npc, PETRIFIED_GIANTS_FOOT_PIECE, 1, 10, 1, true)) { qs.setCond(6, true); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java index b991a7293d..b2e53f6314 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java @@ -193,11 +193,11 @@ public class Q00371_ShrieksOfGhosts extends Quest final int random = getRandom(1000); if (random < info.getFirstChance()) { - giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_ASH_URN, 1, 0, 1, true); } else if (random < info.getSecondChance()) { - giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1.0, true); + giveItemRandomly(killer, npc, ANCIENT_PORCELAIN, 1, 0, 1, true); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java index 76bfe53daf..e15e32b144 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java @@ -166,7 +166,7 @@ public class Q00483_IntendedTactic extends Quest { qs.setCond(2, true); } - if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1.0, true)) + if ((qs != null) && qs.isCond(2) && (CommonUtil.contains(BOSSES, npc.getId())) && giveItemRandomly(killer, npc, TRUTTHFUL_ONES_BLOOD, 1, 10, 1, true)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java index a13d1c187e..33c9979b4a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java @@ -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); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java index bbdfb502db..8b7399c41e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java @@ -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); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java index bb28178182..9584d686bc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java @@ -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); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java index 27c4586ec0..6448125f2f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java @@ -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); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java index 0642f90526..0c68f67f34 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java @@ -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); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java index 0bc846fc2f..18391c86e3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java @@ -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); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 2e1f2aa5f8..4f42181d0b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -196,7 +196,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest if (CommonUtil.contains(MOBS, npc.getId())) { final QuestState qs = getRandomPartyMemberState(player, 3, 3, npc); - if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1.0, true)) + if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1, true)) { qs.setCond(4, true); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index e81c7c16d3..051ea28cf9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -187,7 +187,7 @@ public class Q10740_NeverForget extends Quest public String onKill(Npc npc, Player killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1.0, true)) + if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, npc, UNNAMED_RELICS, 1, 20, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index f491aefee7..012d6a6263 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -160,7 +160,7 @@ public class Q10741_ADraughtForTheCold extends Quest } case KIKU: { - giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1.0, true); + giveItemRandomly(killer, npc, NUTRITIOUS_MEAT, 1, 10, 1, true); break; } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 6f34d295c9..51d978fd10 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -171,7 +171,7 @@ public class Q10743_StrangeFungus extends Quest } case EVOLVED_GROWLER: { - if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1.0, true)) + if (giveItemRandomly(killer, npc, PECULIAR_MUSHROOM_SPORE, 1, 10, 1, true)) { qs.setCond(2); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index abb5777613..d81ff1fbc5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -147,11 +147,11 @@ public class Q10744_StrongerThanSteel extends Quest { if (npc.getId() == TREANT) { - giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1.0, true); + giveItemRandomly(killer, npc, TREANT_LEAF, 1, 20, 1, true); } else if (npc.getId() == LEAFIE) { - giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1.0, true); + giveItemRandomly(killer, npc, LEAFIE_LEAF, 1, 15, 1, true); } if ((getQuestItemsCount(killer, TREANT_LEAF) >= 20) && (getQuestItemsCount(killer, LEAFIE_LEAF) >= 15)) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java index c91e4600de..e4458cec1e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index c92146cd4a..e7c108fde1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction } // Calculate modifiers Magic Attack - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072); return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index e35c300501..b8bcb8013e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1; baseValue *= witBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 31df739b0f..c3257b0c0f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -86,7 +86,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); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 8c1500146e..6781b65584 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction { baseValue = player.getTemplate().getBaseCpMax(player.getLevel()); } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return Stat.defaultValue(creature, stat, baseValue); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 068f5c9368..98d5766746 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 0546560e58..d38eccd226 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1; baseValue *= menBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index a244f65cc8..0c8bb74a2d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction { baseValue *= Config.RAID_PATTACK_MULTIPLIER; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus; return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index f43b26d2c6..05528df9d7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction { baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1; baseValue *= dexBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index c586a254b1..ab85113705 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java index a13d1c187e..33c9979b4a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00826_InSearchOfTheSecretWeapon/Q00826_InSearchOfTheSecretWeapon.java @@ -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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java index bbdfb502db..8b7399c41e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00827_EinhasadsOrder/Q00827_EinhasadsOrder.java @@ -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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java index bb28178182..9584d686bc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00831_SayhasScheme/Q00831_SayhasScheme.java @@ -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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java index 27c4586ec0..6448125f2f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java @@ -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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java index 0642f90526..0c68f67f34 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00926_30DaySearchOperation/Q00926_30DaySearchOperation.java @@ -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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java index 0bc846fc2f..18391c86e3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00928_100DaySubjugationOperation/Q00928_100DaySubjugationOperation.java @@ -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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 234f9144f4..c8369b7605 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index c92146cd4a..e7c108fde1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction } // Calculate modifiers Magic Attack - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072); return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index e35c300501..b8bcb8013e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1; baseValue *= witBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 31df739b0f..c3257b0c0f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -86,7 +86,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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 8c1500146e..6781b65584 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction { baseValue = player.getTemplate().getBaseCpMax(player.getLevel()); } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return Stat.defaultValue(creature, stat, baseValue); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 068f5c9368..98d5766746 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 0546560e58..d38eccd226 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1; baseValue *= menBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index a244f65cc8..0c8bb74a2d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction { baseValue *= Config.RAID_PATTACK_MULTIPLIER; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus; return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index f43b26d2c6..05528df9d7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction { baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1; baseValue *= dexBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java index 27c4586ec0..6448125f2f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java @@ -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); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 234f9144f4..c8369b7605 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index c92146cd4a..e7c108fde1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction } // Calculate modifiers Magic Attack - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072); return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index e35c300501..b8bcb8013e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1; baseValue *= witBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 31df739b0f..c3257b0c0f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -86,7 +86,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); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 8c1500146e..6781b65584 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction { baseValue = player.getTemplate().getBaseCpMax(player.getLevel()); } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return Stat.defaultValue(creature, stat, baseValue); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 068f5c9368..98d5766746 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 0546560e58..d38eccd226 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1; baseValue *= menBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index a244f65cc8..0c8bb74a2d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction { baseValue *= Config.RAID_PATTACK_MULTIPLIER; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus; return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index f43b26d2c6..05528df9d7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction { baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1; baseValue *= dexBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java index 27c4586ec0..6448125f2f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java @@ -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); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 234f9144f4..c8369b7605 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index c92146cd4a..e7c108fde1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction } // Calculate modifiers Magic Attack - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072); return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index e35c300501..b8bcb8013e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1; baseValue *= witBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 31df739b0f..c3257b0c0f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -86,7 +86,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); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 8c1500146e..6781b65584 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction { baseValue = player.getTemplate().getBaseCpMax(player.getLevel()); } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return Stat.defaultValue(creature, stat, baseValue); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 068f5c9368..98d5766746 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 0546560e58..d38eccd226 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1; baseValue *= menBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index a244f65cc8..0c8bb74a2d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction { baseValue *= Config.RAID_PATTACK_MULTIPLIER; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus; return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index f43b26d2c6..05528df9d7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction { baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1; baseValue *= dexBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 063ab6f722..d2df70f37a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java index 27c4586ec0..6448125f2f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q00835_PitiableMelisa/Q00835_PitiableMelisa.java @@ -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); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 11289a86bd..e1d26ce44f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index c92146cd4a..e7c108fde1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction } // Calculate modifiers Magic Attack - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072); return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index e35c300501..b8bcb8013e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1; baseValue *= witBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 31df739b0f..c3257b0c0f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -86,7 +86,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); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 8c1500146e..6781b65584 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction { baseValue = player.getTemplate().getBaseCpMax(player.getLevel()); } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return Stat.defaultValue(creature, stat, baseValue); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 068f5c9368..98d5766746 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1; baseValue *= conBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 0546560e58..d38eccd226 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction } } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1; baseValue *= menBonus * chaBonus; return defaultValue(creature, stat, baseValue); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index a244f65cc8..0c8bb74a2d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction { baseValue *= Config.RAID_PATTACK_MULTIPLIER; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus; return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index f43b26d2c6..05528df9d7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction { baseValue *= Config.CHAMPION_SPD_ATK; } - final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.; - final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.; + final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1; + final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1; baseValue *= dexBonus * chaBonus; return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java index e7e3775fcf..964b875cd0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java @@ -278,7 +278,7 @@ public class Q335_TheSongOfTheHunter extends Quest { st.takeItems(i, -1); } - st.giveItems(57, (3400 * (int) Math.pow(2.0, bloodCrystalLevel - 2))); + st.giveItems(57, (3400 * (int) Math.pow(2, bloodCrystalLevel - 2))); return true; } @@ -978,7 +978,7 @@ public class Q335_TheSongOfTheHunter extends Quest throw new Exception("Overflow"); } int result = 0; - final int mval = (int) Math.pow(2.0, bits); + final int mval = (int) Math.pow(2, bits); for (int i = 0; i < m; ++i) { result <<= bits; @@ -1003,7 +1003,7 @@ public class Q335_TheSongOfTheHunter extends Quest private static int[] unpackInt(int value, int bits) { final int m = 32 / bits; - final int mval = (int) Math.pow(2.0, bits); + final int mval = (int) Math.pow(2, bits); final int[] result = new int[m]; int a = value; for (int i = m; i > 0; --i) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/Formulas.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/Formulas.java index 30155a6932..fe51e4796d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/Formulas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/Formulas.java @@ -1231,7 +1231,7 @@ public class Formulas double defence = target.getPDef(attacker); if (ss) { - damage *= 2.; + damage *= 2; } if (shld) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java index e7e3775fcf..964b875cd0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java @@ -278,7 +278,7 @@ public class Q335_TheSongOfTheHunter extends Quest { st.takeItems(i, -1); } - st.giveItems(57, (3400 * (int) Math.pow(2.0, bloodCrystalLevel - 2))); + st.giveItems(57, (3400 * (int) Math.pow(2, bloodCrystalLevel - 2))); return true; } @@ -978,7 +978,7 @@ public class Q335_TheSongOfTheHunter extends Quest throw new Exception("Overflow"); } int result = 0; - final int mval = (int) Math.pow(2.0, bits); + final int mval = (int) Math.pow(2, bits); for (int i = 0; i < m; ++i) { result <<= bits; @@ -1003,7 +1003,7 @@ public class Q335_TheSongOfTheHunter extends Quest private static int[] unpackInt(int value, int bits) { final int m = 32 / bits; - final int mval = (int) Math.pow(2.0, bits); + final int mval = (int) Math.pow(2, bits); final int[] result = new int[m]; int a = value; for (int i = m; i > 0; --i) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/Formulas.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/Formulas.java index 30155a6932..fe51e4796d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/Formulas.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/Formulas.java @@ -1231,7 +1231,7 @@ public class Formulas double defence = target.getPDef(attacker); if (ss) { - damage *= 2.; + damage *= 2; } if (shld) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index c586a254b1..ab85113705 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java index f52d23cde4..202dbd78f4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java index 8528e58872..1ea60199f9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java index ebc95552e9..06ad6b05bd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java index 08cf42b69a..fcd69bf819 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java @@ -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; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java index b7ffcdb492..7af8678236 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java @@ -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) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java index 7cfac2650a..a24fce0d0c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java @@ -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; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java index 2ae2c13784..58cc12c2fa 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java index ebff1c4a80..571fe61e80 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java @@ -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()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java index f1579ab7ee..449d112ee5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java index f4c177c2bf..8754cae8da 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java index 2aafa8dbad..9e57902a97 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java @@ -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); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java index aed97567e0..c1786e8ce1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java index 68e0be63d3..6654b224e3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java index d27f837f89..ceec5e89ef 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java @@ -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; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index e9249da99e..fc90718f84 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -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; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java index 9ed90cd3f9..bf8ee18bed 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java index 9c3b19778e..6aadb34694 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java @@ -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); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java index 98386a63fe..d8c8aad070 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index 7119a27bd8..111b91d5d5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -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); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java index 824d898b51..7cd5f814f7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java index 132797856e..09c295ec3f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java @@ -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); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java index 53f0cb2b45..b64060d4a9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java @@ -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); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java index 91481398a3..d4008b5d7a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java @@ -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); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java index cacc73c93f..9e83d73652 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java index 868e5ea1a9..44023b8d90 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java @@ -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 { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java index 6499f2c995..39eb315693 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java index 9ebdd5184b..1cc968a42d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java @@ -71,13 +71,13 @@ public class Q00416_PathOfTheOrcShaman extends Quest private static final Map 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() diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java index 4637153146..3aa5b8e282 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java index 8273928be5..02257e1329 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java @@ -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; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java index 9f0b64f3db..ee96c1661f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java @@ -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 { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java index ac0c563bb5..ea8df463c0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java @@ -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; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java index 9d5a25847b..05a3cc09db 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java @@ -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); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java index 8adb74f09c..6bfda3b650 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java @@ -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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 7b3d911af8..2350e6b60d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -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) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index c586a254b1..ab85113705 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java index f52d23cde4..202dbd78f4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java index 8528e58872..1ea60199f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java index ebc95552e9..06ad6b05bd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java index 08cf42b69a..fcd69bf819 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java @@ -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; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java index b7ffcdb492..7af8678236 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java @@ -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) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java index 7cfac2650a..a24fce0d0c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java @@ -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; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java index 2ae2c13784..58cc12c2fa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java index ebff1c4a80..571fe61e80 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java @@ -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()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java index f1579ab7ee..449d112ee5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index e672f0176f..d00a0af0e1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java index f4c177c2bf..8754cae8da 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java index 2aafa8dbad..9e57902a97 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java index aed97567e0..c1786e8ce1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java index 68e0be63d3..6654b224e3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java index d27f837f89..ceec5e89ef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java @@ -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; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index e9249da99e..fc90718f84 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -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; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java index 9ed90cd3f9..bf8ee18bed 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java index 9c3b19778e..6aadb34694 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java index 98386a63fe..d8c8aad070 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index 7119a27bd8..111b91d5d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java index 824d898b51..7cd5f814f7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java index 132797856e..09c295ec3f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java index 53f0cb2b45..b64060d4a9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java index 91481398a3..d4008b5d7a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java @@ -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); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java index cacc73c93f..9e83d73652 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java index 868e5ea1a9..44023b8d90 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java @@ -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 { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java index 6499f2c995..39eb315693 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java index 9ebdd5184b..1cc968a42d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java @@ -71,13 +71,13 @@ public class Q00416_PathOfTheOrcShaman extends Quest private static final Map 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() diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java index 4637153146..3aa5b8e282 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java index 8273928be5..02257e1329 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java @@ -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; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java index 9f0b64f3db..ee96c1661f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java @@ -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 { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java index ac0c563bb5..ea8df463c0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java @@ -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; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java index 9d5a25847b..05a3cc09db 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java index 8adb74f09c..6bfda3b650 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 5ba8275bb0..dd216fe6ac 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -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) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java index 42fc13b911..f904289c6e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java @@ -242,7 +242,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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java index 83bf7f6c56..05aade19d6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java @@ -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; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java index 766d75ad61..761bdeb64a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java @@ -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) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java index 75915cf41a..2d810c2bb4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java index d826290bd7..a8f0d1a2a5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java index 135f609f33..4e52519000 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java index 94dd06f64f..9f34fec4db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java @@ -71,7 +71,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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java index b8ae45140f..7218c9946f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java @@ -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); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java index 4fb26993d2..f39972bb59 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java index 0749fe1ab0..6f5e27721e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java index d82ef914ed..233ae4efea 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index 2af9cabf8d..c6cf5b1dd6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index 6e77f095c9..37841a2bc6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -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); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java index ed38bf36c0..a2b34b1ae8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java index 3f152596ac..07c3e3147c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java @@ -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); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java index 711208a865..c83613bf14 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java @@ -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); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java index 1f7f77935c..6a0fb18a23 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java @@ -68,13 +68,13 @@ public class Q00416_PathOfTheOrcShaman extends Quest private static final Map 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() diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java index 31a1db94a7..2e9a9937b5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 0bad774c4c..f755b2f097 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index 117e644407..e0967db7bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ff0ad75b8a..b2b54e205b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 76a032659e..1977f50fb7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index d8f3930287..10d391208e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 334fb9252a..4d3a47b195 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index 6f7412e6c4..84a4fbd254 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java index 83bf7f6c56..05aade19d6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java @@ -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; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java index 766d75ad61..761bdeb64a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java @@ -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) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java index 75915cf41a..2d810c2bb4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java index d826290bd7..a8f0d1a2a5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java index 135f609f33..4e52519000 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java index b8ae45140f..7218c9946f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java @@ -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); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java index 4fb26993d2..f39972bb59 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java index 0749fe1ab0..6f5e27721e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java index d82ef914ed..233ae4efea 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index 2af9cabf8d..c6cf5b1dd6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index 6e77f095c9..37841a2bc6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -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); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java index ed38bf36c0..a2b34b1ae8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java index 3f152596ac..07c3e3147c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java @@ -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); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java index 711208a865..c83613bf14 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java @@ -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); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java index 1f7f77935c..6a0fb18a23 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java @@ -68,13 +68,13 @@ public class Q00416_PathOfTheOrcShaman extends Quest private static final Map 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() diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java index 31a1db94a7..2e9a9937b5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 0bad774c4c..f755b2f097 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index 117e644407..e0967db7bd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ff0ad75b8a..b2b54e205b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 76a032659e..1977f50fb7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index d8f3930287..10d391208e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 334fb9252a..4d3a47b195 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index 6f7412e6c4..84a4fbd254 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java index 83bf7f6c56..05aade19d6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java @@ -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; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java index 766d75ad61..761bdeb64a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java @@ -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) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java index 75915cf41a..2d810c2bb4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java index d826290bd7..a8f0d1a2a5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java index 135f609f33..4e52519000 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java index b8ae45140f..7218c9946f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java @@ -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); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java index 4fb26993d2..f39972bb59 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java index 0749fe1ab0..6f5e27721e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java index d82ef914ed..233ae4efea 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index 2af9cabf8d..c6cf5b1dd6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index 6e77f095c9..37841a2bc6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -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); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java index ed38bf36c0..a2b34b1ae8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java index 3f152596ac..07c3e3147c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java @@ -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); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java index 711208a865..c83613bf14 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java @@ -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); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java index 1f7f77935c..6a0fb18a23 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java @@ -68,13 +68,13 @@ public class Q00416_PathOfTheOrcShaman extends Quest private static final Map 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() diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java index 31a1db94a7..2e9a9937b5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 0bad774c4c..f755b2f097 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index 117e644407..e0967db7bd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ff0ad75b8a..b2b54e205b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 76a032659e..1977f50fb7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 02c4f00cf6..e1a7fd7f25 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 334fb9252a..4d3a47b195 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index 6f7412e6c4..84a4fbd254 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7d678637ec..90188cd6e9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java index 83bf7f6c56..05aade19d6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java @@ -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; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java index 766d75ad61..761bdeb64a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java @@ -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) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java index 75915cf41a..2d810c2bb4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java index d826290bd7..a8f0d1a2a5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java index 135f609f33..4e52519000 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java index b8ae45140f..7218c9946f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java @@ -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); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java index 4fb26993d2..f39972bb59 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java index 0749fe1ab0..6f5e27721e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java index d82ef914ed..233ae4efea 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index 2af9cabf8d..c6cf5b1dd6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index 6e77f095c9..37841a2bc6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -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); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java index ed38bf36c0..a2b34b1ae8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java index 3f152596ac..07c3e3147c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java @@ -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); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java index 711208a865..c83613bf14 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java @@ -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); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java index 1f7f77935c..6a0fb18a23 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java @@ -68,13 +68,13 @@ public class Q00416_PathOfTheOrcShaman extends Quest private static final Map 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() diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java index 31a1db94a7..2e9a9937b5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 07a6beff44..db781f0616 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1420,7 +1420,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index 117e644407..e0967db7bd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ff0ad75b8a..b2b54e205b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 76a032659e..1977f50fb7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 02c4f00cf6..e1a7fd7f25 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 334fb9252a..4d3a47b195 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index 6f7412e6c4..84a4fbd254 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7d678637ec..90188cd6e9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java index 83bf7f6c56..05aade19d6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java @@ -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; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java index 766d75ad61..761bdeb64a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java @@ -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) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java index 75915cf41a..2d810c2bb4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java index d826290bd7..a8f0d1a2a5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java index 135f609f33..4e52519000 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java index b8ae45140f..7218c9946f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java @@ -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); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java index 4fb26993d2..f39972bb59 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java index 0749fe1ab0..6f5e27721e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java index d82ef914ed..233ae4efea 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index 2af9cabf8d..c6cf5b1dd6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index 6e77f095c9..37841a2bc6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -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); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java index ed38bf36c0..a2b34b1ae8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java index 3f152596ac..07c3e3147c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java @@ -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); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java index 711208a865..c83613bf14 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java @@ -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); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java index 1f7f77935c..6a0fb18a23 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java @@ -68,13 +68,13 @@ public class Q00416_PathOfTheOrcShaman extends Quest private static final Map 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() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java index 31a1db94a7..2e9a9937b5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 07a6beff44..db781f0616 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1420,7 +1420,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index 117e644407..e0967db7bd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ff0ad75b8a..b2b54e205b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 76a032659e..1977f50fb7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 02c4f00cf6..e1a7fd7f25 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 334fb9252a..4d3a47b195 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index 6f7412e6c4..84a4fbd254 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java index bb5989f97b..41af2a4dce 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index 2af9cabf8d..c6cf5b1dd6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -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; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index 6e77f095c9..37841a2bc6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -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); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java index ed38bf36c0..a2b34b1ae8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java @@ -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); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java index 3f152596ac..07c3e3147c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java @@ -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); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java index 711208a865..c83613bf14 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java @@ -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); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 07a6beff44..db781f0616 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1420,7 +1420,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index 117e644407..e0967db7bd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 961fc9e634..808869e0f1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ff0ad75b8a..b2b54e205b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 76a032659e..1977f50fb7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 02c4f00cf6..e1a7fd7f25 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 334fb9252a..4d3a47b195 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index 6f7412e6c4..84a4fbd254 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 77844d7075..e7bf2e807f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index c586a254b1..ab85113705 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java index 83bf7f6c56..05aade19d6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java @@ -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; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java index 766d75ad61..761bdeb64a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java @@ -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) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java index 75915cf41a..2d810c2bb4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java @@ -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; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java index d826290bd7..a8f0d1a2a5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java index 135f609f33..4e52519000 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java index b8ae45140f..7218c9946f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java @@ -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); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java index 4fb26993d2..f39972bb59 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java index 0749fe1ab0..6f5e27721e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java index d82ef914ed..233ae4efea 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java @@ -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; } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index 2af9cabf8d..c6cf5b1dd6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -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; } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index 6e77f095c9..37841a2bc6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -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); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java index ed38bf36c0..a2b34b1ae8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java index 3f152596ac..07c3e3147c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java @@ -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); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java index 711208a865..c83613bf14 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java @@ -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); } } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java index 1f7f77935c..6a0fb18a23 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java @@ -68,13 +68,13 @@ public class Q00416_PathOfTheOrcShaman extends Quest private static final Map 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() diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java index 31a1db94a7..2e9a9937b5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java index ba55c590fc..3ad4eb9269 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 0bad774c4c..f755b2f097 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1419,7 +1419,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index 117e644407..e0967db7bd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 8cda31884c..d96c2e25ae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS); } - 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), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ff0ad75b8a..b2b54e205b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 76a032659e..1977f50fb7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index d8f3930287..10d391208e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 334fb9252a..4d3a47b195 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index 6f7412e6c4..84a4fbd254 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hp.java index bb5989f97b..41af2a4dce 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 07a6beff44..db781f0616 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1420,7 +1420,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index 117e644407..e0967db7bd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 961fc9e634..808869e0f1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ff0ad75b8a..b2b54e205b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 76a032659e..1977f50fb7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 02c4f00cf6..e1a7fd7f25 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 334fb9252a..4d3a47b195 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index 6f7412e6c4..84a4fbd254 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Cp.java index e87cd0b20f..a1a3800c6a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hp.java index bb5989f97b..41af2a4dce 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 07a6beff44..db781f0616 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1420,7 +1420,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index 117e644407..e0967db7bd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 961fc9e634..808869e0f1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ff0ad75b8a..b2b54e205b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 76a032659e..1977f50fb7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 02c4f00cf6..e1a7fd7f25 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 334fb9252a..4d3a47b195 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index 6f7412e6c4..84a4fbd254 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 063ab6f722..d2df70f37a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hp.java index bb5989f97b..41af2a4dce 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6f7194da4f..d94877fe1b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 2e34b8cb6f..f737c260a3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1420,7 +1420,7 @@ public class Formulas } case SHIELD_DEFENSE_PERFECT_BLOCK: { - return 1.; + return 1; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java index 117e644407..e0967db7bd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 961fc9e634..808869e0f1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ff0ad75b8a..b2b54e205b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java index 76a032659e..1977f50fb7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 02c4f00cf6..e1a7fd7f25 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 334fb9252a..4d3a47b195 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -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); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java index 6f7412e6c4..84a4fbd254 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 0dac4105b2..8ab5a6ea58 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -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); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java index 46d5f813ae..73334ff16c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/VampiricChanceFinalizer.java @@ -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; } }