From 853e48cd81f9ce9eafb491f2e0684aff2af25ef6 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 28 Jan 2022 23:23:29 +0000 Subject: [PATCH] Make use of script random methods. --- .../RaidersCrossroads/Kaysen/Kaysen.java | 3 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 9 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 7 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 9 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 15 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 19 +- .../Q00181_DevilsStrikeBackAdventOfBalok.java | 3 +- .../Q00620_FourGoblets.java | 75 +++-- .../Q00662_AGameOfCards.java | 3 +- .../Q00663_SeductiveWhispers.java | 13 +- .../ai/areas/EnchantedValley/FlowerBud.java | 3 +- .../RaidersCrossroads/Kaysen/Kaysen.java | 3 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 9 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 7 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 15 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 9 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 15 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 19 +- .../Q00181_DevilsStrikeBackAdventOfBalok.java | 3 +- .../Q00620_FourGoblets.java | 75 +++-- .../Q00662_AGameOfCards.java | 3 +- .../Q00663_SeductiveWhispers.java | 13 +- .../ai/areas/EnchantedValley/FlowerBud.java | 3 +- .../RaidersCrossroads/Kaysen/Kaysen.java | 3 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 9 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 7 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 15 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 9 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 13 +- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 15 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 19 +- .../Q00181_DevilsStrikeBackAdventOfBalok.java | 3 +- .../Q00620_FourGoblets.java | 75 +++-- .../Q00662_AGameOfCards.java | 3 +- .../Q00663_SeductiveWhispers.java | 13 +- .../ai/areas/EnchantedValley/FlowerBud.java | 3 +- .../RaidersCrossroads/Kaysen/Kaysen.java | 3 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 9 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 7 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 15 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 9 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 13 +- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 15 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 19 +- .../Q00181_DevilsStrikeBackAdventOfBalok.java | 3 +- .../Q00620_FourGoblets.java | 75 +++-- .../Q00662_AGameOfCards.java | 3 +- .../Q00663_SeductiveWhispers.java | 13 +- .../ai/areas/EnchantedValley/FlowerBud.java | 3 +- .../RaidersCrossroads/Kaysen/Kaysen.java | 3 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 9 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 7 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 15 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 9 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 13 +- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 15 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 19 +- .../Q00181_DevilsStrikeBackAdventOfBalok.java | 3 +- .../Q00620_FourGoblets.java | 75 +++-- .../Q00662_AGameOfCards.java | 3 +- .../Q00663_SeductiveWhispers.java | 13 +- .../ai/areas/EnchantedValley/FlowerBud.java | 3 +- .../RaidersCrossroads/Kaysen/Kaysen.java | 3 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 9 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 7 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 15 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 9 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 13 +- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 15 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 19 +- .../Q00181_DevilsStrikeBackAdventOfBalok.java | 3 +- .../Q00620_FourGoblets.java | 75 +++-- .../Q00662_AGameOfCards.java | 3 +- .../Q00663_SeductiveWhispers.java | 13 +- .../ai/areas/EnchantedValley/FlowerBud.java | 3 +- .../RaidersCrossroads/Kaysen/Kaysen.java | 3 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 3 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 7 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 15 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 3 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 13 +- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 15 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 19 +- .../Q00181_DevilsStrikeBackAdventOfBalok.java | 3 +- .../Q00620_FourGoblets.java | 75 +++-- .../Q00662_AGameOfCards.java | 3 +- .../Q00663_SeductiveWhispers.java | 13 +- .../ai/areas/EnchantedValley/FlowerBud.java | 3 +- .../RaidersCrossroads/Kaysen/Kaysen.java | 3 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 3 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 7 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 15 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 3 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 13 +- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 15 +- .../Q00620_FourGoblets.java | 75 +++-- .../data/scripts/ai/areas/Aden/Lulu/Lulu.java | 3 +- .../scripts/ai/areas/Giran/Grace/Grace.java | 3 +- .../RaidersCrossroads/Kaysen/Kaysen.java | 3 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 7 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 15 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 13 +- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../data/scripts/ai/others/AetherDrops.java | 3 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 15 +- .../data/scripts/ai/areas/Aden/Lulu/Lulu.java | 3 +- .../scripts/ai/areas/Giran/Grace/Grace.java | 3 +- .../RaidersCrossroads/Kaysen/Kaysen.java | 3 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 7 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 15 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 13 +- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../data/scripts/ai/others/AetherDrops.java | 3 +- .../ai/others/GreedyTreasureChests.java | 81 +++--- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../scripts/events/DreamMaker/DreamMaker.java | 3 +- .../events/LegendsMark/LegendsMark.java | 3 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 15 +- .../data/scripts/ai/areas/Aden/Lulu/Lulu.java | 3 +- .../scripts/ai/areas/Giran/Grace/Grace.java | 3 +- .../RaidersCrossroads/Kaysen/Kaysen.java | 3 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 7 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 15 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 13 +- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../data/scripts/ai/others/AetherDrops.java | 3 +- .../ai/others/GreedyTreasureChests.java | 81 +++--- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../scripts/events/DreamMaker/DreamMaker.java | 3 +- .../events/LegendsMark/LegendsMark.java | 3 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 15 +- .../ai/areas/HotSprings/HotSprings.java | 5 +- .../game/data/scripts/ai/bosses/Antharas.java | 17 +- .../game/data/scripts/ai/bosses/Baium.java | 29 +- .../game/data/scripts/ai/bosses/Core.java | 7 +- .../game/data/scripts/ai/bosses/Orfen.java | 5 +- .../game/data/scripts/ai/bosses/QueenAnt.java | 11 +- .../game/data/scripts/ai/bosses/Valakas.java | 189 +++++++------ .../game/data/scripts/ai/bosses/Zaken.java | 263 +++++++++--------- .../data/scripts/ai/others/CatsEyeBandit.java | 5 +- .../game/data/scripts/ai/others/Chests.java | 7 +- .../ai/others/DeluLizardmanSpecialAgent.java | 3 +- .../others/DeluLizardmanSpecialCommander.java | 3 +- .../game/data/scripts/ai/others/EvaBox.java | 3 +- .../scripts/ai/others/FeedableBeasts.java | 17 +- .../data/scripts/ai/others/KarulBugbear.java | 5 +- .../data/scripts/ai/others/Monastery.java | 3 +- .../ai/others/NewbieHelper/NewbieHelper.java | 3 +- .../scripts/ai/others/OlMahumGeneral.java | 3 +- .../scripts/ai/others/RetreatOnAttack.java | 5 +- .../ai/others/ScarletStakatoNoble.java | 3 +- .../game/data/scripts/ai/others/Splendor.java | 3 +- .../data/scripts/ai/others/SummonMinions.java | 11 +- .../scripts/ai/others/TimakOrcOverlord.java | 3 +- .../ai/others/TimakOrcTroopLeader.java | 3 +- .../data/scripts/ai/others/Transform.java | 7 +- .../scripts/ai/others/TurekOrcFootman.java | 3 +- .../scripts/ai/others/TurekOrcSupplier.java | 3 +- .../scripts/ai/others/TurekOrcWarlord.java | 3 +- .../Q022_TragedyInVonHellmannForest.java | 3 +- .../Q038_DragonFangs/Q038_DragonFangs.java | 3 +- .../Q105_SkirmishWithTheOrcs.java | 5 +- .../Q108_JumbleTumbleDiamondFuss.java | 3 +- .../Q171_ActsOfEvil/Q171_ActsOfEvil.java | 7 +- .../Q211_TrialOfTheChallenger.java | 7 +- .../Q212_TrialOfDuty/Q212_TrialOfDuty.java | 7 +- .../Q215_TrialOfThePilgrim.java | 3 +- .../Q216_TrialOfTheGuildsman.java | 3 +- .../Q217_TestimonyOfTrust.java | 5 +- .../Q218_TestimonyOfLife.java | 3 +- .../Q223_TestOfTheChampion.java | 9 +- .../Q224_TestOfSagittarius.java | 3 +- .../Q226_TestOfTheHealer.java | 3 +- .../Q230_TestOfTheSummoner.java | 5 +- .../Q233_TestOfTheWarSpirit.java | 7 +- .../Q246_PossessorOfAPreciousSoul.java | 3 +- .../Q258_BringWolfPelts.java | 3 +- .../quests/Q264_KeenClaws/Q264_KeenClaws.java | 7 +- .../Q266_PleasOfPixies.java | 7 +- .../Q271_ProofOfValor/Q271_ProofOfValor.java | 5 +- .../Q273_InvadersOfTheHolyLand.java | 3 +- .../Q274_SkirmishWithTheWerewolves.java | 3 +- .../Q275_DarkWingedSpies.java | 3 +- .../Q276_TotemOfTheHestui.java | 3 +- .../Q291_RevengeOfTheRedbonnet.java | 3 +- .../Q292_BrigandsSweep.java | 3 +- .../Q293_TheHiddenVeins.java | 3 +- .../Q294_CovertBusiness.java | 3 +- .../Q295_DreamingOfTheSkies.java | 3 +- .../Q296_TarantulasSpiderSilk.java | 5 +- .../Q300_HuntingLetoLizardman.java | 3 +- .../Q325_GrimCollector.java | 5 +- .../Q327_RecoverTheFarmland.java | 19 +- .../Q328_SenseForBusiness.java | 3 +- .../Q329_CuriosityOfADwarf.java | 3 +- .../Q330_AdeptOfTaste/Q330_AdeptOfTaste.java | 15 +- .../Q333_HuntOfTheBlackLion.java | 19 +- .../Q334_TheWishingPotion.java | 35 ++- .../Q335_TheSongOfTheHunter.java | 65 +++-- .../Q336_CoinsOfMagic/Q336_CoinsOfMagic.java | 9 +- .../Q337_AudienceWithTheLandDragon.java | 17 +- .../Q343_UnderTheShadowOfTheIvoryTower.java | 13 +- .../Q344_1000YearsTheEndOfLamentation.java | 13 +- .../Q345_MethodToRaiseTheDead.java | 9 +- .../Q348_AnArrogantSearch.java | 5 +- .../quests/Q351_BlackSwan/Q351_BlackSwan.java | 3 +- .../Q352_HelpRoodRaiseANewPet.java | 3 +- .../Q355_FamilyHonor/Q355_FamilyHonor.java | 5 +- .../Q358_IllegitimateChildOfAGoddess.java | 3 +- .../Q359_ForSleeplessDeadmen.java | 3 +- .../Q364_JovialAccordion.java | 5 +- .../Q365_DevilsLegacy/Q365_DevilsLegacy.java | 7 +- .../Q367_ElectrifyingRecharge.java | 5 +- .../Q371_ShriekOfGhosts.java | 5 +- .../Q372_LegacyOfInsolence.java | 3 +- .../Q373_SupplierOfReagents.java | 5 +- .../Q375_WhisperOfDreams_Part2.java | 3 +- ...Q376_ExplorationOfTheGiantsCave_Part1.java | 3 +- ...Q377_ExplorationOfTheGiantsCave_Part2.java | 3 +- .../Q379_FantasyWine/Q379_FantasyWine.java | 3 +- .../Q380_BringOutTheFlavorOfIngredients.java | 3 +- .../Q382_KailsMagicCoin.java | 3 +- .../Q383_SearchingForTreasure.java | 9 +- .../Q384_WarehouseKeepersPastime.java | 5 +- .../Q386_StolenDignity.java | 5 +- .../Q403_PathToARogue/Q403_PathToARogue.java | 3 +- .../Q414_PathToAnOrcRaider.java | 5 +- .../Q416_PathToAnOrcShaman.java | 7 +- .../Q417_PathToBecomeAScavenger.java | 9 +- .../quests/Q419_GetAPet/Q419_GetAPet.java | 3 +- .../Q420_LittleWing/Q420_LittleWing.java | 7 +- .../Q421_LittleWingsBigAdventure.java | 9 +- .../Q422_RepentYourSins.java | 3 +- .../Q426_QuestForFishingShot.java | 3 +- .../Q501_ProofOfClanAlliance.java | 9 +- .../Q503_PursuitOfClanAmbition.java | 7 +- .../Q601_WatchingEyes/Q601_WatchingEyes.java | 3 +- .../Q602_ShadowOfLight.java | 3 +- .../Q604_DaimonTheWhiteEyed_Part2.java | 5 +- .../Q605_AllianceWithKetraOrcs.java | 3 +- .../Q610_MagicalPowerOfWater_Part2.java | 2 +- .../Q611_AllianceWithVarkaSilenos.java | 3 +- .../Q616_MagicalPowerOfFire_Part2.java | 2 +- .../Q617_GatherTheFlames.java | 3 +- .../Q619_RelicsOfTheOldEmpire.java | 3 +- .../Q620_FourGoblets/Q620_FourGoblets.java | 43 ++- .../Q621_EggDelivery/Q621_EggDelivery.java | 5 +- .../Q622_SpecialtyLiquorDelivery.java | 5 +- .../Q623_TheFinestFood.java | 3 +- .../Q625_TheFinestIngredients_Part2.java | 5 +- .../data/scripts/quests/SagasSuperClass.java | 5 +- .../GrandBossTeleporters.java | 17 +- .../OracleTeleport/OracleTeleport.java | 3 +- .../ToIVortexExit/ToIVortexExit.java | 15 +- .../ai/areas/HotSprings/HotSprings.java | 5 +- .../game/data/scripts/ai/bosses/Antharas.java | 17 +- .../game/data/scripts/ai/bosses/Baium.java | 29 +- .../game/data/scripts/ai/bosses/Benom.java | 9 +- .../game/data/scripts/ai/bosses/Core.java | 7 +- .../data/scripts/ai/bosses/Frintezza.java | 63 +++-- .../game/data/scripts/ai/bosses/Orfen.java | 5 +- .../game/data/scripts/ai/bosses/QueenAnt.java | 11 +- .../data/scripts/ai/bosses/Tyrannosaurus.java | 5 +- .../game/data/scripts/ai/bosses/Valakas.java | 189 +++++++------ .../data/scripts/ai/bosses/VanHalter.java | 5 +- .../game/data/scripts/ai/bosses/Zaken.java | 263 +++++++++--------- .../data/scripts/ai/others/CatsEyeBandit.java | 5 +- .../game/data/scripts/ai/others/Chests.java | 7 +- .../ai/others/DeluLizardmanSpecialAgent.java | 3 +- .../others/DeluLizardmanSpecialCommander.java | 3 +- .../game/data/scripts/ai/others/EvaBox.java | 3 +- .../scripts/ai/others/FeedableBeasts.java | 17 +- .../data/scripts/ai/others/KarulBugbear.java | 5 +- .../data/scripts/ai/others/Monastery.java | 3 +- .../ai/others/NewbieHelper/NewbieHelper.java | 5 +- .../scripts/ai/others/OlMahumGeneral.java | 3 +- .../scripts/ai/others/RetreatOnAttack.java | 5 +- .../ai/others/ScarletStakatoNoble.java | 3 +- .../game/data/scripts/ai/others/Splendor.java | 3 +- .../data/scripts/ai/others/SummonMinions.java | 11 +- .../scripts/ai/others/TimakOrcOverlord.java | 3 +- .../ai/others/TimakOrcTroopLeader.java | 3 +- .../data/scripts/ai/others/Transform.java | 7 +- .../scripts/ai/others/TurekOrcFootman.java | 3 +- .../scripts/ai/others/TurekOrcSupplier.java | 3 +- .../scripts/ai/others/TurekOrcWarlord.java | 3 +- .../Q022_TragedyInVonHellmannForest.java | 3 +- .../Q038_DragonFangs/Q038_DragonFangs.java | 3 +- .../Q105_SkirmishWithTheOrcs.java | 5 +- .../Q108_JumbleTumbleDiamondFuss.java | 3 +- .../Q171_ActsOfEvil/Q171_ActsOfEvil.java | 7 +- .../Q211_TrialOfTheChallenger.java | 7 +- .../Q212_TrialOfDuty/Q212_TrialOfDuty.java | 7 +- .../Q215_TrialOfThePilgrim.java | 3 +- .../Q216_TrialOfTheGuildsman.java | 3 +- .../Q217_TestimonyOfTrust.java | 5 +- .../Q218_TestimonyOfLife.java | 3 +- .../Q223_TestOfTheChampion.java | 9 +- .../Q224_TestOfSagittarius.java | 3 +- .../Q226_TestOfTheHealer.java | 3 +- .../Q230_TestOfTheSummoner.java | 5 +- .../Q233_TestOfTheWarSpirit.java | 7 +- .../Q246_PossessorOfAPreciousSoul.java | 3 +- .../Q258_BringWolfPelts.java | 3 +- .../quests/Q264_KeenClaws/Q264_KeenClaws.java | 7 +- .../Q266_PleasOfPixies.java | 7 +- .../Q271_ProofOfValor/Q271_ProofOfValor.java | 5 +- .../Q273_InvadersOfTheHolyLand.java | 3 +- .../Q274_SkirmishWithTheWerewolves.java | 3 +- .../Q275_DarkWingedSpies.java | 3 +- .../Q276_TotemOfTheHestui.java | 3 +- .../Q291_RevengeOfTheRedbonnet.java | 3 +- .../Q292_BrigandsSweep.java | 3 +- .../Q293_TheHiddenVeins.java | 3 +- .../Q294_CovertBusiness.java | 3 +- .../Q295_DreamingOfTheSkies.java | 3 +- .../Q296_TarantulasSpiderSilk.java | 5 +- .../Q300_HuntingLetoLizardman.java | 3 +- .../Q325_GrimCollector.java | 5 +- .../Q327_RecoverTheFarmland.java | 19 +- .../Q328_SenseForBusiness.java | 3 +- .../Q329_CuriosityOfADwarf.java | 3 +- .../Q330_AdeptOfTaste/Q330_AdeptOfTaste.java | 15 +- .../Q333_HuntOfTheBlackLion.java | 19 +- .../Q334_TheWishingPotion.java | 35 ++- .../Q335_TheSongOfTheHunter.java | 65 +++-- .../Q336_CoinsOfMagic/Q336_CoinsOfMagic.java | 9 +- .../Q337_AudienceWithTheLandDragon.java | 17 +- .../Q343_UnderTheShadowOfTheIvoryTower.java | 13 +- .../Q344_1000YearsTheEndOfLamentation.java | 13 +- .../Q345_MethodToRaiseTheDead.java | 9 +- .../Q348_AnArrogantSearch.java | 5 +- .../quests/Q351_BlackSwan/Q351_BlackSwan.java | 3 +- .../Q352_HelpRoodRaiseANewPet.java | 3 +- .../Q355_FamilyHonor/Q355_FamilyHonor.java | 5 +- .../Q358_IllegitimateChildOfAGoddess.java | 3 +- .../Q359_ForSleeplessDeadmen.java | 3 +- .../Q364_JovialAccordion.java | 5 +- .../Q365_DevilsLegacy/Q365_DevilsLegacy.java | 7 +- .../Q367_ElectrifyingRecharge.java | 5 +- .../Q371_ShriekOfGhosts.java | 5 +- .../Q372_LegacyOfInsolence.java | 3 +- .../Q373_SupplierOfReagents.java | 5 +- .../Q375_WhisperOfDreams_Part2.java | 3 +- ...Q376_ExplorationOfTheGiantsCave_Part1.java | 3 +- ...Q377_ExplorationOfTheGiantsCave_Part2.java | 3 +- .../Q379_FantasyWine/Q379_FantasyWine.java | 3 +- .../Q380_BringOutTheFlavorOfIngredients.java | 3 +- .../Q382_KailsMagicCoin.java | 3 +- .../Q383_SearchingForTreasure.java | 9 +- .../Q384_WarehouseKeepersPastime.java | 5 +- .../Q386_StolenDignity.java | 5 +- .../Q403_PathToARogue/Q403_PathToARogue.java | 3 +- .../Q414_PathToAnOrcRaider.java | 5 +- .../Q416_PathToAnOrcShaman.java | 7 +- .../Q417_PathToBecomeAScavenger.java | 9 +- .../quests/Q419_GetAPet/Q419_GetAPet.java | 3 +- .../Q420_LittleWing/Q420_LittleWing.java | 7 +- .../Q421_LittleWingsBigAdventure.java | 9 +- .../Q422_RepentYourSins.java | 3 +- .../Q426_QuestForFishingShot.java | 3 +- .../Q501_ProofOfClanAlliance.java | 9 +- .../Q503_PursuitOfClanAmbition.java | 7 +- .../Q508_AClansReputation.java | 3 +- .../Q509_TheClansPrestige.java | 3 +- .../Q601_WatchingEyes/Q601_WatchingEyes.java | 3 +- .../Q602_ShadowOfLight.java | 3 +- .../Q604_DaimonTheWhiteEyed_Part2.java | 5 +- .../Q605_AllianceWithKetraOrcs.java | 3 +- .../Q610_MagicalPowerOfWater_Part2.java | 2 +- .../Q611_AllianceWithVarkaSilenos.java | 3 +- .../Q616_MagicalPowerOfFire_Part2.java | 2 +- .../Q617_GatherTheFlames.java | 3 +- .../Q619_RelicsOfTheOldEmpire.java | 3 +- .../Q620_FourGoblets/Q620_FourGoblets.java | 43 ++- .../Q621_EggDelivery/Q621_EggDelivery.java | 5 +- .../Q622_SpecialtyLiquorDelivery.java | 5 +- .../Q623_TheFinestFood.java | 3 +- .../Q625_TheFinestIngredients_Part2.java | 5 +- .../Q638_SeekersOfTheHolyGrail.java | 3 +- .../Q642_APowerfulPrimevalCreature.java | 5 +- .../Q643_RiseAndFallOfTheElrokiTribe.java | 3 +- .../Q647_InfluxOfMachines.java | 3 +- .../Q648_AnIceMerchantsDream.java | 3 +- .../Q651_RunawayYouth/Q651_RunawayYouth.java | 5 +- .../Q652_AnAgedExAdventurer.java | 7 +- .../Q653_WildMaiden/Q653_WildMaiden.java | 5 +- .../Q660_AidingTheFloranVillage.java | 7 +- .../Q662_AGameOfCards/Q662_AGameOfCards.java | 11 +- .../Q663_SeductiveWhispers.java | 21 +- .../data/scripts/quests/SagasSuperClass.java | 5 +- .../GrandBossTeleporters.java | 17 +- .../OracleTeleport/OracleTeleport.java | 3 +- .../ToIVortexExit/ToIVortexExit.java | 15 +- .../HallOfErosionAttack.java | 11 +- .../HallOfErosionDefence.java | 9 +- .../HeartInfinityAttack.java | 9 +- .../HeartInfinityDefence.java | 9 +- .../SeedOfDestruction/SeedOfDestruction.java | 3 +- .../scripts/ai/bosses/DrChaos/DrChaos.java | 7 +- .../Q00025_HidingBehindTheTruth.java | 3 +- .../Q00144_PailakaInjuredDragon.java | 23 +- .../Q00356_DigUpTheSeaOfSpores.java | 3 +- .../Q00426_QuestForFishingShot.java | 5 +- .../Q00662_AGameOfCards.java | 3 +- .../Q00697_DefendTheHallOfErosion.java | 3 +- .../Q00698_BlockTheLordsEscape.java | 3 +- .../Q00708_PathToBecomingALordGludio.java | 3 +- .../Q00709_PathToBecomingALordDion.java | 3 +- .../HallOfErosionAttack.java | 11 +- .../HallOfErosionDefence.java | 9 +- .../HeartInfinityAttack.java | 9 +- .../HeartInfinityDefence.java | 9 +- .../SeedOfDestruction/SeedOfDestruction.java | 3 +- .../scripts/ai/bosses/DrChaos/DrChaos.java | 7 +- .../ai/bosses/SeerUgoros/SeerUgoros.java | 3 +- .../scripts/ai/others/AltarsOfSacrifice.java | 6 +- .../ai/others/NevitsHerald/NevitsHerald.java | 3 +- .../FinalEmperialTomb/ScarletVanHalisha.java | 21 +- .../Q00025_HidingBehindTheTruth.java | 3 +- .../Q00144_PailakaInjuredDragon.java | 23 +- .../Q00356_DigUpTheSeaOfSpores.java | 3 +- .../Q00426_QuestForFishingShot.java | 5 +- .../Q00662_AGameOfCards.java | 3 +- .../Q00697_DefendTheHallOfErosion.java | 3 +- .../Q00698_BlockTheLordsEscape.java | 3 +- .../Q00708_PathToBecomingALordGludio.java | 3 +- .../Q00709_PathToBecomingALordDion.java | 3 +- .../TowerOfInsolence/Arushinai/Arushinai.java | 3 +- .../TowerOfInsolence/EnergyOfInsolence.java | 7 +- .../TowerOfInsolence/HeavenlyRift/Bomb.java | 13 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../events/MerrySquashmas/MerrySquashmas.java | 17 +- .../events/SquashEvent/SquashEvent.java | 17 +- .../WatermelonNinja/WatermelonNinja.java | 17 +- .../TowerOfInsolence/Arushinai/Arushinai.java | 3 +- .../TowerOfInsolence/EnergyOfInsolence.java | 7 +- .../TowerOfInsolence/HeavenlyRift/Bomb.java | 13 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../events/MerrySquashmas/MerrySquashmas.java | 17 +- .../events/SquashEvent/SquashEvent.java | 17 +- .../WatermelonNinja/WatermelonNinja.java | 17 +- .../ai/areas/DragonValley/Fellow/Fellow.java | 3 +- .../TowerOfInsolence/Arushinai/Arushinai.java | 3 +- .../areas/TowerOfInsolence/Ateld/Ateld.java | 3 +- .../TowerOfInsolence/EnergyOfInsolence.java | 7 +- .../TowerOfInsolence/HeavenlyRift/Bomb.java | 13 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../events/MerrySquashmas/MerrySquashmas.java | 17 +- .../events/SquashEvent/SquashEvent.java | 17 +- .../WatermelonNinja/WatermelonNinja.java | 17 +- .../ai/areas/DragonValley/Fellow/Fellow.java | 3 +- .../TowerOfInsolence/Arushinai/Arushinai.java | 3 +- .../areas/TowerOfInsolence/Ateld/Ateld.java | 3 +- .../TowerOfInsolence/EnergyOfInsolence.java | 7 +- .../TowerOfInsolence/HeavenlyRift/Bomb.java | 13 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../events/MerrySquashmas/MerrySquashmas.java | 17 +- .../events/SquashEvent/SquashEvent.java | 17 +- .../WatermelonNinja/WatermelonNinja.java | 17 +- .../ai/areas/DragonValley/Fellow/Fellow.java | 3 +- .../TowerOfInsolence/Arushinai/Arushinai.java | 3 +- .../areas/TowerOfInsolence/Ateld/Ateld.java | 3 +- .../TowerOfInsolence/EnergyOfInsolence.java | 7 +- .../TowerOfInsolence/HeavenlyRift/Bomb.java | 13 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../events/MerrySquashmas/MerrySquashmas.java | 17 +- .../events/SquashEvent/SquashEvent.java | 17 +- .../WatermelonNinja/WatermelonNinja.java | 17 +- .../ai/areas/DragonValley/Fellow/Fellow.java | 3 +- .../TowerOfInsolence/Arushinai/Arushinai.java | 3 +- .../areas/TowerOfInsolence/Ateld/Ateld.java | 3 +- .../TowerOfInsolence/EnergyOfInsolence.java | 7 +- .../TowerOfInsolence/HeavenlyRift/Bomb.java | 13 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../events/MerrySquashmas/MerrySquashmas.java | 17 +- .../events/SquashEvent/SquashEvent.java | 17 +- .../WatermelonNinja/WatermelonNinja.java | 17 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../events/MerrySquashmas/MerrySquashmas.java | 17 +- .../events/SquashEvent/SquashEvent.java | 17 +- .../WatermelonNinja/WatermelonNinja.java | 17 +- .../ai/areas/DragonValley/Fellow/Fellow.java | 3 +- .../TowerOfInsolence/Arushinai/Arushinai.java | 3 +- .../areas/TowerOfInsolence/Ateld/Ateld.java | 3 +- .../TowerOfInsolence/EnergyOfInsolence.java | 7 +- .../TowerOfInsolence/HeavenlyRift/Bomb.java | 13 +- .../game/data/scripts/ai/others/Atingo.java | 3 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../events/MerrySquashmas/MerrySquashmas.java | 17 +- .../events/SquashEvent/SquashEvent.java | 17 +- .../WatermelonNinja/WatermelonNinja.java | 17 +- .../TranscendentZone/TranscendentZone.java | 5 +- .../ai/areas/DragonValley/Fellow/Fellow.java | 3 +- .../TowerOfInsolence/Arushinai/Arushinai.java | 3 +- .../areas/TowerOfInsolence/Ateld/Ateld.java | 3 +- .../TowerOfInsolence/EnergyOfInsolence.java | 7 +- .../TowerOfInsolence/HeavenlyRift/Bomb.java | 13 +- .../game/data/scripts/ai/others/Atingo.java | 3 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../events/MerrySquashmas/MerrySquashmas.java | 17 +- .../events/SquashEvent/SquashEvent.java | 17 +- .../WatermelonNinja/WatermelonNinja.java | 17 +- .../TranscendentZone/TranscendentZone.java | 5 +- .../ai/areas/DragonValley/Fellow/Fellow.java | 3 +- .../TowerOfInsolence/Arushinai/Arushinai.java | 3 +- .../areas/TowerOfInsolence/Ateld/Ateld.java | 3 +- .../TowerOfInsolence/EnergyOfInsolence.java | 7 +- .../TowerOfInsolence/HeavenlyRift/Bomb.java | 13 +- .../game/data/scripts/ai/others/Atingo.java | 3 +- .../ai/others/OlyManager/OlyManager.java | 3 +- .../custom/listeners/ListenerTest.java | 5 +- .../events/MerrySquashmas/MerrySquashmas.java | 17 +- .../events/SquashEvent/SquashEvent.java | 17 +- .../WatermelonNinja/WatermelonNinja.java | 17 +- .../TranscendentZone/TranscendentZone.java | 5 +- 564 files changed, 2586 insertions(+), 3145 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java index b49d5c445c..5ffc401682 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java @@ -16,7 +16,6 @@ */ package ai.areas.RaidersCrossroads.Kaysen; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -105,7 +104,7 @@ public class Kaysen extends AbstractNpcAI } npc.setScriptValue(1); - if (Rnd.get(100) < REWARD_CHANCE) + if (getRandom(100) < REWARD_CHANCE) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_THOUGHT_I_D_BE_A_PUSHOVER_DIDN_T_YOU); giveItems(player, REWARD); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 365f49300b..c1d1ccd5b4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -406,7 +405,7 @@ public class Anakim extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -416,7 +415,7 @@ public class Anakim extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -596,7 +595,7 @@ public class Anakim extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -645,7 +644,7 @@ public class Anakim extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) + if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 811959c8dc..992eae3c7c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -19,7 +19,6 @@ package ai.bosses.Balok; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; @@ -147,7 +146,7 @@ public class BalokWarzone extends AbstractInstance } case "stage_last_send_minions": { - final Npc minion = _minionList.get(Rnd.get(_minionList.size())); + final Npc minion = _minionList.get(getRandom(_minionList.size())); if (minion != null) { minion.setRunning(); @@ -186,7 +185,7 @@ public class BalokWarzone extends AbstractInstance } case "imprission_minions": { - final int[] randomJail = PRISONS_SPAWN[Rnd.get(PRISONS_SPAWN.length)]; // Random jail + final int[] randomJail = PRISONS_SPAWN[getRandom(PRISONS_SPAWN.length)]; // Random jail player.teleToLocation(randomJail[0], randomJail[1], randomJail[2]); world.broadcastPacket(new ExShowScreenMessage("$s1, locked away in the prison.".replace("$s1", player.getName()), 5000)); break; @@ -220,7 +219,7 @@ public class BalokWarzone extends AbstractInstance } World.getInstance().forEachVisibleObjectInRange(npc, Player.class, 300, instPlayer -> { - if ((instPlayer == null) || (Rnd.get(100) > 2)) + if ((instPlayer == null) || (getRandom(100) > 2)) { return; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 3961572d66..d12d95df85 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -432,7 +431,7 @@ public class Lilith extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -442,7 +441,7 @@ public class Lilith extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -612,7 +611,7 @@ public class Lilith extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -661,7 +660,7 @@ public class Lilith extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) + if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index f8b05abb47..6c6e11d07c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -946,8 +945,8 @@ public class Lindvior extends AbstractNpcAI int y = loc.getY(); if (radius > 0) { - x += Rnd.get(-radius, radius); - y += Rnd.get(-radius, radius); + x += getRandom(-radius, radius); + y += getRandom(-radius, radius); } for (int i = 0; i < count; i++) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 44df549069..8b7e94342c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -626,7 +625,7 @@ public class Trasken extends AbstractNpcAI _tieTrasken.getSpawn().stopRespawn(); _tieTrasken.decayMe(); - final int[] spawn = TAIL_RANDOM_SPAWN[Rnd.get(TAIL_RANDOM_SPAWN.length)]; + final int[] spawn = TAIL_RANDOM_SPAWN[getRandom(TAIL_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TAIL_TRASKEN) == null) { ThreadPool.schedule(() -> @@ -647,7 +646,7 @@ public class Trasken extends AbstractNpcAI _trasken.getSpawn().stopRespawn(); _trasken.decayMe(); - final int[] spawn1 = TRASKEN_RANDOM_SPAWN[Rnd.get(TRASKEN_RANDOM_SPAWN.length)]; + final int[] spawn1 = TRASKEN_RANDOM_SPAWN[getRandom(TRASKEN_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TRASKEN) == null) { ThreadPool.schedule(() -> diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index fa4d37c099..7ec65ee769 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ClassId; @@ -353,7 +352,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 69009a5c59..24e4edf9b8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -724,16 +723,16 @@ public class CeremonyOfChaos extends AbstractNpcAI msg.addString(winner.getName()); // Rewards according to https://l2wiki.com/Ceremony_of_Chaos - final int marksRewarded = Rnd.get(2, 5); // Guessed - final int boxs = Rnd.get(1, 5); + final int marksRewarded = getRandom(2, 5); // Guessed + final int boxs = getRandom(1, 5); winner.addItem("CoC-Winner", 45584, marksRewarded, winner, true); // Mark of battle winner.addItem("CoC-Winner", 36333, boxs, winner, true); // Mysterious Box // Possible additional rewards // Improved Life Stone - if (Rnd.get(10) < 3) // Chance to get reward (30%) + if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(4)) + switch (getRandom(4)) { case 0: { @@ -758,9 +757,9 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Soul Crystal Fragment - else if (Rnd.get(10) < 3) // Chance to get reward (30%) + else if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(6)) + switch (getRandom(6)) { case 0: { @@ -795,7 +794,7 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Mysterious Belt - else if (Rnd.get(10) < 1) // Chance to get reward (10%) + else if (getRandom(10) < 1) // Chance to get reward (10%) { winner.addItem("CoC-Winner", 35565, 1, winner, true); // Mysterious Belt } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 7bbf4a0077..936e02d42f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -21,7 +21,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; @@ -152,7 +151,7 @@ public class MemoryOfDisaster extends AbstractInstance new Location(116925, -180420, -1200, 46585), new Location(116656, -180461, -1240, 56363), }; - private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, Rnd.get(65520)); + private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, getRandom(65520)); // Misc private static final int FIRE_IN_DWARVEN_VILLAGE = 23120700; private static final int TEMPLATE_ID = 200; @@ -221,7 +220,7 @@ public class MemoryOfDisaster extends AbstractInstance case "FIGHT": { addSpawn(npc, npc.getParameters().getInt("npcId"), npc.getLocation(), true, instance.getId()); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { @@ -553,7 +552,7 @@ public class MemoryOfDisaster extends AbstractInstance case "ATTACK_TIME": { final List tentacles = npc.getInstanceWorld().getAliveNpcs(TENTACLE).stream().filter(n -> n.getVariables().getBoolean("isLeaderKiller", false)).collect(Collectors.toList()); - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(Rnd.get(tentacles.size())))); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(getRandom(tentacles.size())))); break; } case "RUN_TIME": @@ -561,7 +560,7 @@ public class MemoryOfDisaster extends AbstractInstance npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> { n.setRunning(); - n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[Rnd.get(SHOUT_RUN.length)]); + n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[getRandom(SHOUT_RUN.length)]); n.getAI().moveTo(DWARVES_MOVE_1); }); break; @@ -640,7 +639,7 @@ public class MemoryOfDisaster extends AbstractInstance } case "TIMER_ID_DIE": { - npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[Rnd.get(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); + npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[getRandom(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); npc.doDie(npc); DecayTaskManager.getInstance().cancel(npc); break; @@ -675,7 +674,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if ((npc.getX() == DWARVES_MOVE_3.getX()) && (npc.getY() == DWARVES_MOVE_3.getY())) { - addMoveToDesire(npc, DWARVES_MOVE_RANDOM[Rnd.get(DWARVES_MOVE_RANDOM.length)], 23); + addMoveToDesire(npc, DWARVES_MOVE_RANDOM[getRandom(DWARVES_MOVE_RANDOM.length)], 23); } } switch (npc.getId()) @@ -864,7 +863,7 @@ public class MemoryOfDisaster extends AbstractInstance } else { - dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[Rnd.get(SHOUT_BRONK_DEATH.length)]); + dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[getRandom(SHOUT_BRONK_DEATH.length)]); } } npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.UGH_IF_I_SEE_YOU_IN_THE_SPIRIT_WORLD_FIRST_ROUND_IS_ON_ME); @@ -873,7 +872,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if (npc.getId() == SILVERA) { - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[Rnd.get(SHOUT_SILVERA_DEATH.length)])); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[getRandom(SHOUT_SILVERA_DEATH.length)])); } } @@ -970,7 +969,7 @@ public class MemoryOfDisaster extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance) && event.equals("SCE_J4D_DARK_ELF_START")) { - getTimers().addTimer("TIMER_ID_DIE", Rnd.get(60000) + 5000, receiver, null); + getTimers().addTimer("TIMER_ID_DIE", getRandom(60000) + 5000, receiver, null); } return super.onEventReceived(event, sender, receiver, reference); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java index 486084718b..a325fcb987 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java @@ -17,7 +17,6 @@ package quests.Q00181_DevilsStrikeBackAdventOfBalok; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; @@ -77,7 +76,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest giveAdena(player, 37128000, true); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); qs.exitQuest(QuestType.ONE_TIME, true); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java index f63e4684a7..24dc552a09 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java @@ -16,7 +16,6 @@ */ package quests.Q00620_FourGoblets; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -141,7 +140,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31454-13.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -149,10 +148,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -194,10 +193,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -230,10 +229,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -275,10 +274,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -311,10 +310,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -328,10 +327,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 50) + else if (getRandom(1000) < 50) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -348,10 +347,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -421,10 +420,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -469,7 +468,7 @@ public class Q00620_FourGoblets extends Quest } else if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31454-14.htm"; } @@ -590,7 +589,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31919-3.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -598,10 +597,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -643,10 +642,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -679,10 +678,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -724,10 +723,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -760,10 +759,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -777,11 +776,11 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 5) + else if (getRandom(1000) < 5) { reward = 1; } - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -797,10 +796,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -870,10 +869,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -918,7 +917,7 @@ public class Q00620_FourGoblets extends Quest } if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31919-4.htm"; } @@ -1158,7 +1157,7 @@ public class Q00620_FourGoblets extends Quest final int npcId = npc.getId(); if ((qs != null) && (qs.getCond() > 0) && (npcId >= 18120) && (npcId <= 18256)) { - if (Rnd.get(100) < 15) + if (getRandom(100) < 15) { giveItems(killer, SEALED_BOX, 1); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index e9f21fb91d..e012de30f8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -673,7 +672,7 @@ public class Q00662_AGameOfCards extends Quest } } - final Player player = players.get(Rnd.get(players.size())); + final Player player = players.get(getRandom(players.size())); if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && (MONSTERS.get(npc.getId()) < getRandom(1000))) { final QuestState qs = getQuestState(player, false); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 6e54441f46..2198ee2165 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -19,7 +19,6 @@ package quests.Q00663_SeductiveWhispers; import java.util.Arrays; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -198,7 +197,7 @@ public class Q00663_SeductiveWhispers extends Quest { if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -233,7 +232,7 @@ public class Q00663_SeductiveWhispers extends Quest // Player draw a card (Always player start first !!) if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -346,7 +345,7 @@ public class Q00663_SeductiveWhispers extends Quest final QuestState qs = getQuestState(killer, false); if ((qs != null) && qs.isCond(1)) { - switch (Rnd.get(0, 5)) + switch (getRandom(0, 5)) { case 0: case 1: @@ -379,7 +378,7 @@ public class Q00663_SeductiveWhispers extends Quest private Card getRandomCard() { - final int index = Rnd.get(0, 7); + final int index = getRandom(0, 7); return Arrays.stream(cards).filter(card -> (!card.equals(playerCard)) && (!card.equals(npcCard))).collect(Collectors.toList()).get(index); } @@ -461,12 +460,12 @@ public class Q00663_SeductiveWhispers extends Quest private int getRandomRecipeBGrade() { - return RECIPES_B_GRADE[Rnd.get(0, RECIPES_B_GRADE.length - 1)]; + return RECIPES_B_GRADE[getRandom(0, RECIPES_B_GRADE.length - 1)]; } private int getRandomPartBGrade() { - return PART_B_GRADE[Rnd.get(0, PART_B_GRADE.length - 1)]; + return PART_B_GRADE[getRandom(0, PART_B_GRADE.length - 1)]; } private enum Side diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java index 93e8559ff9..4cb6303606 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java @@ -19,7 +19,6 @@ package ai.areas.EnchantedValley; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -53,7 +52,7 @@ public class FlowerBud extends AbstractNpcAI { if (event.equals("spawn") && npc.isDead()) { - final Npc elegant = addSpawn(FLOWER_SPAWNS.get(Rnd.get(FLOWER_SPAWNS.size())), npc, false, 120000, false); + final Npc elegant = addSpawn(FLOWER_SPAWNS.get(getRandom(FLOWER_SPAWNS.size())), npc, false, 120000, false); addAttackPlayerDesire(elegant, player); } return event; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java index b49d5c445c..5ffc401682 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java @@ -16,7 +16,6 @@ */ package ai.areas.RaidersCrossroads.Kaysen; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -105,7 +104,7 @@ public class Kaysen extends AbstractNpcAI } npc.setScriptValue(1); - if (Rnd.get(100) < REWARD_CHANCE) + if (getRandom(100) < REWARD_CHANCE) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_THOUGHT_I_D_BE_A_PUSHOVER_DIDN_T_YOU); giveItems(player, REWARD); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 365f49300b..c1d1ccd5b4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -406,7 +405,7 @@ public class Anakim extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -416,7 +415,7 @@ public class Anakim extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -596,7 +595,7 @@ public class Anakim extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -645,7 +644,7 @@ public class Anakim extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) + if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 811959c8dc..992eae3c7c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -19,7 +19,6 @@ package ai.bosses.Balok; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; @@ -147,7 +146,7 @@ public class BalokWarzone extends AbstractInstance } case "stage_last_send_minions": { - final Npc minion = _minionList.get(Rnd.get(_minionList.size())); + final Npc minion = _minionList.get(getRandom(_minionList.size())); if (minion != null) { minion.setRunning(); @@ -186,7 +185,7 @@ public class BalokWarzone extends AbstractInstance } case "imprission_minions": { - final int[] randomJail = PRISONS_SPAWN[Rnd.get(PRISONS_SPAWN.length)]; // Random jail + final int[] randomJail = PRISONS_SPAWN[getRandom(PRISONS_SPAWN.length)]; // Random jail player.teleToLocation(randomJail[0], randomJail[1], randomJail[2]); world.broadcastPacket(new ExShowScreenMessage("$s1, locked away in the prison.".replace("$s1", player.getName()), 5000)); break; @@ -220,7 +219,7 @@ public class BalokWarzone extends AbstractInstance } World.getInstance().forEachVisibleObjectInRange(npc, Player.class, 300, instPlayer -> { - if ((instPlayer == null) || (Rnd.get(100) > 2)) + if ((instPlayer == null) || (getRandom(100) > 2)) { return; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 420276fe1d..a83cffe0cf 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -196,21 +195,21 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().addBoss(_kelbimBoss); _lastAction = Chronos.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); - startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; } case "stage_all_spawn_minions": { - for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) + for (int i = 0; i < getRandom((_bossStage * 5) / 2, _bossStage * 5); i++) { final Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } - for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) + for (int i = 0; i < getRandom((_bossStage * 2) / 2, _bossStage * 2); i++) { - final Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); + final Npc minion = addSpawn(KELBIM_GUARDIANS[getRandom(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); @@ -223,7 +222,7 @@ public class Kelbim extends AbstractNpcAI { if (_kelbimBoss.isInCombat()) { - final Skill randomAttackSkill = AREA_SKILLS[Rnd.get(AREA_SKILLS.length)]; + final Skill randomAttackSkill = AREA_SKILLS[getRandom(AREA_SKILLS.length)]; final List skillNpcs = new ArrayList<>(); for (Player pl : ZONE.getPlayersInside()) { @@ -231,7 +230,7 @@ public class Kelbim extends AbstractNpcAI { continue; } - if (Rnd.get(100) > 40) + if (getRandom(100) > 40) { final Npc skillMob = addSpawn(KELBIM_SHOUT, pl.getX(), pl.getY(), pl.getZ() + 10, 0, true, 60000, false, 0); skillNpcs.add(skillMob); @@ -247,7 +246,7 @@ public class Kelbim extends AbstractNpcAI skillNpc.doCast(randomAttackSkill); } } - startQuestTimer("stage_all_random_area_attack", Rnd.get(1, 2) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(1, 2) * 60000, null, null); } break; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 3961572d66..d12d95df85 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -432,7 +431,7 @@ public class Lilith extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -442,7 +441,7 @@ public class Lilith extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -612,7 +611,7 @@ public class Lilith extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -661,7 +660,7 @@ public class Lilith extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) + if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index f8b05abb47..6c6e11d07c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -946,8 +945,8 @@ public class Lindvior extends AbstractNpcAI int y = loc.getY(); if (radius > 0) { - x += Rnd.get(-radius, radius); - y += Rnd.get(-radius, radius); + x += getRandom(-radius, radius); + y += getRandom(-radius, radius); } for (int i = 0; i < count; i++) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 44df549069..8b7e94342c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -626,7 +625,7 @@ public class Trasken extends AbstractNpcAI _tieTrasken.getSpawn().stopRespawn(); _tieTrasken.decayMe(); - final int[] spawn = TAIL_RANDOM_SPAWN[Rnd.get(TAIL_RANDOM_SPAWN.length)]; + final int[] spawn = TAIL_RANDOM_SPAWN[getRandom(TAIL_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TAIL_TRASKEN) == null) { ThreadPool.schedule(() -> @@ -647,7 +646,7 @@ public class Trasken extends AbstractNpcAI _trasken.getSpawn().stopRespawn(); _trasken.decayMe(); - final int[] spawn1 = TRASKEN_RANDOM_SPAWN[Rnd.get(TRASKEN_RANDOM_SPAWN.length)]; + final int[] spawn1 = TRASKEN_RANDOM_SPAWN[getRandom(TRASKEN_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TRASKEN) == null) { ThreadPool.schedule(() -> diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index e158d27c12..9f919f7627 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ClassId; @@ -353,7 +352,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 618e3f8660..c86890807d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -724,16 +723,16 @@ public class CeremonyOfChaos extends AbstractNpcAI msg.addString(winner.getName()); // Rewards according to https://l2wiki.com/Ceremony_of_Chaos - final int marksRewarded = Rnd.get(2, 5); // Guessed - final int boxs = Rnd.get(1, 5); + final int marksRewarded = getRandom(2, 5); // Guessed + final int boxs = getRandom(1, 5); winner.addItem("CoC-Winner", 45584, marksRewarded, winner, true); // Mark of battle winner.addItem("CoC-Winner", 36333, boxs, winner, true); // Mysterious Box // Possible additional rewards // Improved Life Stone - if (Rnd.get(10) < 3) // Chance to get reward (30%) + if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(4)) + switch (getRandom(4)) { case 0: { @@ -758,9 +757,9 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Soul Crystal Fragment - else if (Rnd.get(10) < 3) // Chance to get reward (30%) + else if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(6)) + switch (getRandom(6)) { case 0: { @@ -795,7 +794,7 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Mysterious Belt - else if (Rnd.get(10) < 1) // Chance to get reward (10%) + else if (getRandom(10) < 1) // Chance to get reward (10%) { winner.addItem("CoC-Winner", 35565, 1, winner, true); // Mysterious Belt } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 7bbf4a0077..936e02d42f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -21,7 +21,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; @@ -152,7 +151,7 @@ public class MemoryOfDisaster extends AbstractInstance new Location(116925, -180420, -1200, 46585), new Location(116656, -180461, -1240, 56363), }; - private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, Rnd.get(65520)); + private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, getRandom(65520)); // Misc private static final int FIRE_IN_DWARVEN_VILLAGE = 23120700; private static final int TEMPLATE_ID = 200; @@ -221,7 +220,7 @@ public class MemoryOfDisaster extends AbstractInstance case "FIGHT": { addSpawn(npc, npc.getParameters().getInt("npcId"), npc.getLocation(), true, instance.getId()); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { @@ -553,7 +552,7 @@ public class MemoryOfDisaster extends AbstractInstance case "ATTACK_TIME": { final List tentacles = npc.getInstanceWorld().getAliveNpcs(TENTACLE).stream().filter(n -> n.getVariables().getBoolean("isLeaderKiller", false)).collect(Collectors.toList()); - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(Rnd.get(tentacles.size())))); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(getRandom(tentacles.size())))); break; } case "RUN_TIME": @@ -561,7 +560,7 @@ public class MemoryOfDisaster extends AbstractInstance npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> { n.setRunning(); - n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[Rnd.get(SHOUT_RUN.length)]); + n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[getRandom(SHOUT_RUN.length)]); n.getAI().moveTo(DWARVES_MOVE_1); }); break; @@ -640,7 +639,7 @@ public class MemoryOfDisaster extends AbstractInstance } case "TIMER_ID_DIE": { - npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[Rnd.get(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); + npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[getRandom(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); npc.doDie(npc); DecayTaskManager.getInstance().cancel(npc); break; @@ -675,7 +674,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if ((npc.getX() == DWARVES_MOVE_3.getX()) && (npc.getY() == DWARVES_MOVE_3.getY())) { - addMoveToDesire(npc, DWARVES_MOVE_RANDOM[Rnd.get(DWARVES_MOVE_RANDOM.length)], 23); + addMoveToDesire(npc, DWARVES_MOVE_RANDOM[getRandom(DWARVES_MOVE_RANDOM.length)], 23); } } switch (npc.getId()) @@ -864,7 +863,7 @@ public class MemoryOfDisaster extends AbstractInstance } else { - dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[Rnd.get(SHOUT_BRONK_DEATH.length)]); + dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[getRandom(SHOUT_BRONK_DEATH.length)]); } } npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.UGH_IF_I_SEE_YOU_IN_THE_SPIRIT_WORLD_FIRST_ROUND_IS_ON_ME); @@ -873,7 +872,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if (npc.getId() == SILVERA) { - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[Rnd.get(SHOUT_SILVERA_DEATH.length)])); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[getRandom(SHOUT_SILVERA_DEATH.length)])); } } @@ -970,7 +969,7 @@ public class MemoryOfDisaster extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance) && event.equals("SCE_J4D_DARK_ELF_START")) { - getTimers().addTimer("TIMER_ID_DIE", Rnd.get(60000) + 5000, receiver, null); + getTimers().addTimer("TIMER_ID_DIE", getRandom(60000) + 5000, receiver, null); } return super.onEventReceived(event, sender, receiver, reference); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java index 486084718b..a325fcb987 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java @@ -17,7 +17,6 @@ package quests.Q00181_DevilsStrikeBackAdventOfBalok; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; @@ -77,7 +76,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest giveAdena(player, 37128000, true); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); qs.exitQuest(QuestType.ONE_TIME, true); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java index f63e4684a7..24dc552a09 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java @@ -16,7 +16,6 @@ */ package quests.Q00620_FourGoblets; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -141,7 +140,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31454-13.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -149,10 +148,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -194,10 +193,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -230,10 +229,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -275,10 +274,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -311,10 +310,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -328,10 +327,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 50) + else if (getRandom(1000) < 50) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -348,10 +347,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -421,10 +420,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -469,7 +468,7 @@ public class Q00620_FourGoblets extends Quest } else if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31454-14.htm"; } @@ -590,7 +589,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31919-3.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -598,10 +597,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -643,10 +642,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -679,10 +678,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -724,10 +723,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -760,10 +759,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -777,11 +776,11 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 5) + else if (getRandom(1000) < 5) { reward = 1; } - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -797,10 +796,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -870,10 +869,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -918,7 +917,7 @@ public class Q00620_FourGoblets extends Quest } if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31919-4.htm"; } @@ -1158,7 +1157,7 @@ public class Q00620_FourGoblets extends Quest final int npcId = npc.getId(); if ((qs != null) && (qs.getCond() > 0) && (npcId >= 18120) && (npcId <= 18256)) { - if (Rnd.get(100) < 15) + if (getRandom(100) < 15) { giveItems(killer, SEALED_BOX, 1); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index e9f21fb91d..e012de30f8 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -673,7 +672,7 @@ public class Q00662_AGameOfCards extends Quest } } - final Player player = players.get(Rnd.get(players.size())); + final Player player = players.get(getRandom(players.size())); if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && (MONSTERS.get(npc.getId()) < getRandom(1000))) { final QuestState qs = getQuestState(player, false); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 6e54441f46..2198ee2165 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -19,7 +19,6 @@ package quests.Q00663_SeductiveWhispers; import java.util.Arrays; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -198,7 +197,7 @@ public class Q00663_SeductiveWhispers extends Quest { if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -233,7 +232,7 @@ public class Q00663_SeductiveWhispers extends Quest // Player draw a card (Always player start first !!) if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -346,7 +345,7 @@ public class Q00663_SeductiveWhispers extends Quest final QuestState qs = getQuestState(killer, false); if ((qs != null) && qs.isCond(1)) { - switch (Rnd.get(0, 5)) + switch (getRandom(0, 5)) { case 0: case 1: @@ -379,7 +378,7 @@ public class Q00663_SeductiveWhispers extends Quest private Card getRandomCard() { - final int index = Rnd.get(0, 7); + final int index = getRandom(0, 7); return Arrays.stream(cards).filter(card -> (!card.equals(playerCard)) && (!card.equals(npcCard))).collect(Collectors.toList()).get(index); } @@ -461,12 +460,12 @@ public class Q00663_SeductiveWhispers extends Quest private int getRandomRecipeBGrade() { - return RECIPES_B_GRADE[Rnd.get(0, RECIPES_B_GRADE.length - 1)]; + return RECIPES_B_GRADE[getRandom(0, RECIPES_B_GRADE.length - 1)]; } private int getRandomPartBGrade() { - return PART_B_GRADE[Rnd.get(0, PART_B_GRADE.length - 1)]; + return PART_B_GRADE[getRandom(0, PART_B_GRADE.length - 1)]; } private enum Side diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java index 93e8559ff9..4cb6303606 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java @@ -19,7 +19,6 @@ package ai.areas.EnchantedValley; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -53,7 +52,7 @@ public class FlowerBud extends AbstractNpcAI { if (event.equals("spawn") && npc.isDead()) { - final Npc elegant = addSpawn(FLOWER_SPAWNS.get(Rnd.get(FLOWER_SPAWNS.size())), npc, false, 120000, false); + final Npc elegant = addSpawn(FLOWER_SPAWNS.get(getRandom(FLOWER_SPAWNS.size())), npc, false, 120000, false); addAttackPlayerDesire(elegant, player); } return event; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java index b49d5c445c..5ffc401682 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java @@ -16,7 +16,6 @@ */ package ai.areas.RaidersCrossroads.Kaysen; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -105,7 +104,7 @@ public class Kaysen extends AbstractNpcAI } npc.setScriptValue(1); - if (Rnd.get(100) < REWARD_CHANCE) + if (getRandom(100) < REWARD_CHANCE) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_THOUGHT_I_D_BE_A_PUSHOVER_DIDN_T_YOU); giveItems(player, REWARD); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 365f49300b..c1d1ccd5b4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -406,7 +405,7 @@ public class Anakim extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -416,7 +415,7 @@ public class Anakim extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -596,7 +595,7 @@ public class Anakim extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -645,7 +644,7 @@ public class Anakim extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) + if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 811959c8dc..992eae3c7c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -19,7 +19,6 @@ package ai.bosses.Balok; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; @@ -147,7 +146,7 @@ public class BalokWarzone extends AbstractInstance } case "stage_last_send_minions": { - final Npc minion = _minionList.get(Rnd.get(_minionList.size())); + final Npc minion = _minionList.get(getRandom(_minionList.size())); if (minion != null) { minion.setRunning(); @@ -186,7 +185,7 @@ public class BalokWarzone extends AbstractInstance } case "imprission_minions": { - final int[] randomJail = PRISONS_SPAWN[Rnd.get(PRISONS_SPAWN.length)]; // Random jail + final int[] randomJail = PRISONS_SPAWN[getRandom(PRISONS_SPAWN.length)]; // Random jail player.teleToLocation(randomJail[0], randomJail[1], randomJail[2]); world.broadcastPacket(new ExShowScreenMessage("$s1, locked away in the prison.".replace("$s1", player.getName()), 5000)); break; @@ -220,7 +219,7 @@ public class BalokWarzone extends AbstractInstance } World.getInstance().forEachVisibleObjectInRange(npc, Player.class, 300, instPlayer -> { - if ((instPlayer == null) || (Rnd.get(100) > 2)) + if ((instPlayer == null) || (getRandom(100) > 2)) { return; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 420276fe1d..a83cffe0cf 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -196,21 +195,21 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().addBoss(_kelbimBoss); _lastAction = Chronos.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); - startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; } case "stage_all_spawn_minions": { - for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) + for (int i = 0; i < getRandom((_bossStage * 5) / 2, _bossStage * 5); i++) { final Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } - for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) + for (int i = 0; i < getRandom((_bossStage * 2) / 2, _bossStage * 2); i++) { - final Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); + final Npc minion = addSpawn(KELBIM_GUARDIANS[getRandom(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); @@ -223,7 +222,7 @@ public class Kelbim extends AbstractNpcAI { if (_kelbimBoss.isInCombat()) { - final Skill randomAttackSkill = AREA_SKILLS[Rnd.get(AREA_SKILLS.length)]; + final Skill randomAttackSkill = AREA_SKILLS[getRandom(AREA_SKILLS.length)]; final List skillNpcs = new ArrayList<>(); for (Player pl : ZONE.getPlayersInside()) { @@ -231,7 +230,7 @@ public class Kelbim extends AbstractNpcAI { continue; } - if (Rnd.get(100) > 40) + if (getRandom(100) > 40) { final Npc skillMob = addSpawn(KELBIM_SHOUT, pl.getX(), pl.getY(), pl.getZ() + 10, 0, true, 60000, false, 0); skillNpcs.add(skillMob); @@ -247,7 +246,7 @@ public class Kelbim extends AbstractNpcAI skillNpc.doCast(randomAttackSkill); } } - startQuestTimer("stage_all_random_area_attack", Rnd.get(1, 2) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(1, 2) * 60000, null, null); } break; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 3961572d66..d12d95df85 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -432,7 +431,7 @@ public class Lilith extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -442,7 +441,7 @@ public class Lilith extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -612,7 +611,7 @@ public class Lilith extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -661,7 +660,7 @@ public class Lilith extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) + if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index f8b05abb47..6c6e11d07c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -946,8 +945,8 @@ public class Lindvior extends AbstractNpcAI int y = loc.getY(); if (radius > 0) { - x += Rnd.get(-radius, radius); - y += Rnd.get(-radius, radius); + x += getRandom(-radius, radius); + y += getRandom(-radius, radius); } for (int i = 0; i < count; i++) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index b888a054b0..8ee1bc2c4b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -22,7 +22,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -233,7 +232,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 1) && _ramona1.isInCombat()) { - Skill randomAttackSkill = RAMONA1_SKILLS[Rnd.get(RAMONA1_SKILLS.length)]; + Skill randomAttackSkill = RAMONA1_SKILLS[getRandom(RAMONA1_SKILLS.length)]; if (getRandom(100) > 20) { _ramona1.doCast(randomAttackSkill); @@ -248,7 +247,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona2 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -262,7 +261,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 2) && _ramona2.isInCombat()) { - Skill randomAttackSkill = RAMONA2_SKILLS[Rnd.get(RAMONA2_SKILLS.length)]; + Skill randomAttackSkill = RAMONA2_SKILLS[getRandom(RAMONA2_SKILLS.length)]; if (getRandom(100) > 20) { _ramona2.doCast(randomAttackSkill); @@ -277,7 +276,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona3 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -291,7 +290,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 3) && _ramona3.isInCombat()) { - Skill randomAttackSkill = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill randomAttackSkill = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if (getRandom(100) > 20) { _ramona3.doCast(randomAttackSkill); @@ -510,7 +509,7 @@ public class Ramona extends AbstractNpcAI if ((player != null) && !player.isDead()) { - Skill skillToCast = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill skillToCast = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if ((skillToCast != null) && SkillCaster.checkUseConditions(npc, skillToCast)) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 44df549069..8b7e94342c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -626,7 +625,7 @@ public class Trasken extends AbstractNpcAI _tieTrasken.getSpawn().stopRespawn(); _tieTrasken.decayMe(); - final int[] spawn = TAIL_RANDOM_SPAWN[Rnd.get(TAIL_RANDOM_SPAWN.length)]; + final int[] spawn = TAIL_RANDOM_SPAWN[getRandom(TAIL_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TAIL_TRASKEN) == null) { ThreadPool.schedule(() -> @@ -647,7 +646,7 @@ public class Trasken extends AbstractNpcAI _trasken.getSpawn().stopRespawn(); _trasken.decayMe(); - final int[] spawn1 = TRASKEN_RANDOM_SPAWN[Rnd.get(TRASKEN_RANDOM_SPAWN.length)]; + final int[] spawn1 = TRASKEN_RANDOM_SPAWN[getRandom(TRASKEN_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TRASKEN) == null) { ThreadPool.schedule(() -> diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index e158d27c12..9f919f7627 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ClassId; @@ -353,7 +352,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 618e3f8660..c86890807d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -724,16 +723,16 @@ public class CeremonyOfChaos extends AbstractNpcAI msg.addString(winner.getName()); // Rewards according to https://l2wiki.com/Ceremony_of_Chaos - final int marksRewarded = Rnd.get(2, 5); // Guessed - final int boxs = Rnd.get(1, 5); + final int marksRewarded = getRandom(2, 5); // Guessed + final int boxs = getRandom(1, 5); winner.addItem("CoC-Winner", 45584, marksRewarded, winner, true); // Mark of battle winner.addItem("CoC-Winner", 36333, boxs, winner, true); // Mysterious Box // Possible additional rewards // Improved Life Stone - if (Rnd.get(10) < 3) // Chance to get reward (30%) + if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(4)) + switch (getRandom(4)) { case 0: { @@ -758,9 +757,9 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Soul Crystal Fragment - else if (Rnd.get(10) < 3) // Chance to get reward (30%) + else if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(6)) + switch (getRandom(6)) { case 0: { @@ -795,7 +794,7 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Mysterious Belt - else if (Rnd.get(10) < 1) // Chance to get reward (10%) + else if (getRandom(10) < 1) // Chance to get reward (10%) { winner.addItem("CoC-Winner", 35565, 1, winner, true); // Mysterious Belt } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 7bbf4a0077..936e02d42f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -21,7 +21,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; @@ -152,7 +151,7 @@ public class MemoryOfDisaster extends AbstractInstance new Location(116925, -180420, -1200, 46585), new Location(116656, -180461, -1240, 56363), }; - private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, Rnd.get(65520)); + private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, getRandom(65520)); // Misc private static final int FIRE_IN_DWARVEN_VILLAGE = 23120700; private static final int TEMPLATE_ID = 200; @@ -221,7 +220,7 @@ public class MemoryOfDisaster extends AbstractInstance case "FIGHT": { addSpawn(npc, npc.getParameters().getInt("npcId"), npc.getLocation(), true, instance.getId()); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { @@ -553,7 +552,7 @@ public class MemoryOfDisaster extends AbstractInstance case "ATTACK_TIME": { final List tentacles = npc.getInstanceWorld().getAliveNpcs(TENTACLE).stream().filter(n -> n.getVariables().getBoolean("isLeaderKiller", false)).collect(Collectors.toList()); - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(Rnd.get(tentacles.size())))); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(getRandom(tentacles.size())))); break; } case "RUN_TIME": @@ -561,7 +560,7 @@ public class MemoryOfDisaster extends AbstractInstance npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> { n.setRunning(); - n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[Rnd.get(SHOUT_RUN.length)]); + n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[getRandom(SHOUT_RUN.length)]); n.getAI().moveTo(DWARVES_MOVE_1); }); break; @@ -640,7 +639,7 @@ public class MemoryOfDisaster extends AbstractInstance } case "TIMER_ID_DIE": { - npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[Rnd.get(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); + npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[getRandom(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); npc.doDie(npc); DecayTaskManager.getInstance().cancel(npc); break; @@ -675,7 +674,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if ((npc.getX() == DWARVES_MOVE_3.getX()) && (npc.getY() == DWARVES_MOVE_3.getY())) { - addMoveToDesire(npc, DWARVES_MOVE_RANDOM[Rnd.get(DWARVES_MOVE_RANDOM.length)], 23); + addMoveToDesire(npc, DWARVES_MOVE_RANDOM[getRandom(DWARVES_MOVE_RANDOM.length)], 23); } } switch (npc.getId()) @@ -864,7 +863,7 @@ public class MemoryOfDisaster extends AbstractInstance } else { - dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[Rnd.get(SHOUT_BRONK_DEATH.length)]); + dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[getRandom(SHOUT_BRONK_DEATH.length)]); } } npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.UGH_IF_I_SEE_YOU_IN_THE_SPIRIT_WORLD_FIRST_ROUND_IS_ON_ME); @@ -873,7 +872,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if (npc.getId() == SILVERA) { - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[Rnd.get(SHOUT_SILVERA_DEATH.length)])); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[getRandom(SHOUT_SILVERA_DEATH.length)])); } } @@ -970,7 +969,7 @@ public class MemoryOfDisaster extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance) && event.equals("SCE_J4D_DARK_ELF_START")) { - getTimers().addTimer("TIMER_ID_DIE", Rnd.get(60000) + 5000, receiver, null); + getTimers().addTimer("TIMER_ID_DIE", getRandom(60000) + 5000, receiver, null); } return super.onEventReceived(event, sender, receiver, reference); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java index 486084718b..a325fcb987 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java @@ -17,7 +17,6 @@ package quests.Q00181_DevilsStrikeBackAdventOfBalok; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; @@ -77,7 +76,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest giveAdena(player, 37128000, true); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); qs.exitQuest(QuestType.ONE_TIME, true); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java index f63e4684a7..24dc552a09 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java @@ -16,7 +16,6 @@ */ package quests.Q00620_FourGoblets; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -141,7 +140,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31454-13.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -149,10 +148,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -194,10 +193,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -230,10 +229,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -275,10 +274,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -311,10 +310,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -328,10 +327,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 50) + else if (getRandom(1000) < 50) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -348,10 +347,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -421,10 +420,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -469,7 +468,7 @@ public class Q00620_FourGoblets extends Quest } else if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31454-14.htm"; } @@ -590,7 +589,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31919-3.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -598,10 +597,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -643,10 +642,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -679,10 +678,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -724,10 +723,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -760,10 +759,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -777,11 +776,11 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 5) + else if (getRandom(1000) < 5) { reward = 1; } - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -797,10 +796,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -870,10 +869,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -918,7 +917,7 @@ public class Q00620_FourGoblets extends Quest } if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31919-4.htm"; } @@ -1158,7 +1157,7 @@ public class Q00620_FourGoblets extends Quest final int npcId = npc.getId(); if ((qs != null) && (qs.getCond() > 0) && (npcId >= 18120) && (npcId <= 18256)) { - if (Rnd.get(100) < 15) + if (getRandom(100) < 15) { giveItems(killer, SEALED_BOX, 1); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index e9f21fb91d..e012de30f8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -673,7 +672,7 @@ public class Q00662_AGameOfCards extends Quest } } - final Player player = players.get(Rnd.get(players.size())); + final Player player = players.get(getRandom(players.size())); if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && (MONSTERS.get(npc.getId()) < getRandom(1000))) { final QuestState qs = getQuestState(player, false); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 6e54441f46..2198ee2165 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -19,7 +19,6 @@ package quests.Q00663_SeductiveWhispers; import java.util.Arrays; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -198,7 +197,7 @@ public class Q00663_SeductiveWhispers extends Quest { if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -233,7 +232,7 @@ public class Q00663_SeductiveWhispers extends Quest // Player draw a card (Always player start first !!) if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -346,7 +345,7 @@ public class Q00663_SeductiveWhispers extends Quest final QuestState qs = getQuestState(killer, false); if ((qs != null) && qs.isCond(1)) { - switch (Rnd.get(0, 5)) + switch (getRandom(0, 5)) { case 0: case 1: @@ -379,7 +378,7 @@ public class Q00663_SeductiveWhispers extends Quest private Card getRandomCard() { - final int index = Rnd.get(0, 7); + final int index = getRandom(0, 7); return Arrays.stream(cards).filter(card -> (!card.equals(playerCard)) && (!card.equals(npcCard))).collect(Collectors.toList()).get(index); } @@ -461,12 +460,12 @@ public class Q00663_SeductiveWhispers extends Quest private int getRandomRecipeBGrade() { - return RECIPES_B_GRADE[Rnd.get(0, RECIPES_B_GRADE.length - 1)]; + return RECIPES_B_GRADE[getRandom(0, RECIPES_B_GRADE.length - 1)]; } private int getRandomPartBGrade() { - return PART_B_GRADE[Rnd.get(0, PART_B_GRADE.length - 1)]; + return PART_B_GRADE[getRandom(0, PART_B_GRADE.length - 1)]; } private enum Side diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java index 93e8559ff9..4cb6303606 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java @@ -19,7 +19,6 @@ package ai.areas.EnchantedValley; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -53,7 +52,7 @@ public class FlowerBud extends AbstractNpcAI { if (event.equals("spawn") && npc.isDead()) { - final Npc elegant = addSpawn(FLOWER_SPAWNS.get(Rnd.get(FLOWER_SPAWNS.size())), npc, false, 120000, false); + final Npc elegant = addSpawn(FLOWER_SPAWNS.get(getRandom(FLOWER_SPAWNS.size())), npc, false, 120000, false); addAttackPlayerDesire(elegant, player); } return event; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java index b49d5c445c..5ffc401682 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java @@ -16,7 +16,6 @@ */ package ai.areas.RaidersCrossroads.Kaysen; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -105,7 +104,7 @@ public class Kaysen extends AbstractNpcAI } npc.setScriptValue(1); - if (Rnd.get(100) < REWARD_CHANCE) + if (getRandom(100) < REWARD_CHANCE) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_THOUGHT_I_D_BE_A_PUSHOVER_DIDN_T_YOU); giveItems(player, REWARD); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 365f49300b..c1d1ccd5b4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -406,7 +405,7 @@ public class Anakim extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -416,7 +415,7 @@ public class Anakim extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -596,7 +595,7 @@ public class Anakim extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -645,7 +644,7 @@ public class Anakim extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) + if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 811959c8dc..992eae3c7c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -19,7 +19,6 @@ package ai.bosses.Balok; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; @@ -147,7 +146,7 @@ public class BalokWarzone extends AbstractInstance } case "stage_last_send_minions": { - final Npc minion = _minionList.get(Rnd.get(_minionList.size())); + final Npc minion = _minionList.get(getRandom(_minionList.size())); if (minion != null) { minion.setRunning(); @@ -186,7 +185,7 @@ public class BalokWarzone extends AbstractInstance } case "imprission_minions": { - final int[] randomJail = PRISONS_SPAWN[Rnd.get(PRISONS_SPAWN.length)]; // Random jail + final int[] randomJail = PRISONS_SPAWN[getRandom(PRISONS_SPAWN.length)]; // Random jail player.teleToLocation(randomJail[0], randomJail[1], randomJail[2]); world.broadcastPacket(new ExShowScreenMessage("$s1, locked away in the prison.".replace("$s1", player.getName()), 5000)); break; @@ -220,7 +219,7 @@ public class BalokWarzone extends AbstractInstance } World.getInstance().forEachVisibleObjectInRange(npc, Player.class, 300, instPlayer -> { - if ((instPlayer == null) || (Rnd.get(100) > 2)) + if ((instPlayer == null) || (getRandom(100) > 2)) { return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 420276fe1d..a83cffe0cf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -196,21 +195,21 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().addBoss(_kelbimBoss); _lastAction = Chronos.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); - startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; } case "stage_all_spawn_minions": { - for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) + for (int i = 0; i < getRandom((_bossStage * 5) / 2, _bossStage * 5); i++) { final Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } - for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) + for (int i = 0; i < getRandom((_bossStage * 2) / 2, _bossStage * 2); i++) { - final Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); + final Npc minion = addSpawn(KELBIM_GUARDIANS[getRandom(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); @@ -223,7 +222,7 @@ public class Kelbim extends AbstractNpcAI { if (_kelbimBoss.isInCombat()) { - final Skill randomAttackSkill = AREA_SKILLS[Rnd.get(AREA_SKILLS.length)]; + final Skill randomAttackSkill = AREA_SKILLS[getRandom(AREA_SKILLS.length)]; final List skillNpcs = new ArrayList<>(); for (Player pl : ZONE.getPlayersInside()) { @@ -231,7 +230,7 @@ public class Kelbim extends AbstractNpcAI { continue; } - if (Rnd.get(100) > 40) + if (getRandom(100) > 40) { final Npc skillMob = addSpawn(KELBIM_SHOUT, pl.getX(), pl.getY(), pl.getZ() + 10, 0, true, 60000, false, 0); skillNpcs.add(skillMob); @@ -247,7 +246,7 @@ public class Kelbim extends AbstractNpcAI skillNpc.doCast(randomAttackSkill); } } - startQuestTimer("stage_all_random_area_attack", Rnd.get(1, 2) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(1, 2) * 60000, null, null); } break; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 3961572d66..d12d95df85 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -432,7 +431,7 @@ public class Lilith extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -442,7 +441,7 @@ public class Lilith extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -612,7 +611,7 @@ public class Lilith extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -661,7 +660,7 @@ public class Lilith extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) + if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index f8b05abb47..6c6e11d07c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -946,8 +945,8 @@ public class Lindvior extends AbstractNpcAI int y = loc.getY(); if (radius > 0) { - x += Rnd.get(-radius, radius); - y += Rnd.get(-radius, radius); + x += getRandom(-radius, radius); + y += getRandom(-radius, radius); } for (int i = 0; i < count; i++) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index b888a054b0..8ee1bc2c4b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -22,7 +22,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -233,7 +232,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 1) && _ramona1.isInCombat()) { - Skill randomAttackSkill = RAMONA1_SKILLS[Rnd.get(RAMONA1_SKILLS.length)]; + Skill randomAttackSkill = RAMONA1_SKILLS[getRandom(RAMONA1_SKILLS.length)]; if (getRandom(100) > 20) { _ramona1.doCast(randomAttackSkill); @@ -248,7 +247,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona2 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -262,7 +261,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 2) && _ramona2.isInCombat()) { - Skill randomAttackSkill = RAMONA2_SKILLS[Rnd.get(RAMONA2_SKILLS.length)]; + Skill randomAttackSkill = RAMONA2_SKILLS[getRandom(RAMONA2_SKILLS.length)]; if (getRandom(100) > 20) { _ramona2.doCast(randomAttackSkill); @@ -277,7 +276,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona3 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -291,7 +290,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 3) && _ramona3.isInCombat()) { - Skill randomAttackSkill = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill randomAttackSkill = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if (getRandom(100) > 20) { _ramona3.doCast(randomAttackSkill); @@ -510,7 +509,7 @@ public class Ramona extends AbstractNpcAI if ((player != null) && !player.isDead()) { - Skill skillToCast = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill skillToCast = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if ((skillToCast != null) && SkillCaster.checkUseConditions(npc, skillToCast)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 44df549069..8b7e94342c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -626,7 +625,7 @@ public class Trasken extends AbstractNpcAI _tieTrasken.getSpawn().stopRespawn(); _tieTrasken.decayMe(); - final int[] spawn = TAIL_RANDOM_SPAWN[Rnd.get(TAIL_RANDOM_SPAWN.length)]; + final int[] spawn = TAIL_RANDOM_SPAWN[getRandom(TAIL_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TAIL_TRASKEN) == null) { ThreadPool.schedule(() -> @@ -647,7 +646,7 @@ public class Trasken extends AbstractNpcAI _trasken.getSpawn().stopRespawn(); _trasken.decayMe(); - final int[] spawn1 = TRASKEN_RANDOM_SPAWN[Rnd.get(TRASKEN_RANDOM_SPAWN.length)]; + final int[] spawn1 = TRASKEN_RANDOM_SPAWN[getRandom(TRASKEN_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TRASKEN) == null) { ThreadPool.schedule(() -> diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 768f8f7227..96e0accbf7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ClassId; @@ -351,7 +350,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 618e3f8660..c86890807d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -724,16 +723,16 @@ public class CeremonyOfChaos extends AbstractNpcAI msg.addString(winner.getName()); // Rewards according to https://l2wiki.com/Ceremony_of_Chaos - final int marksRewarded = Rnd.get(2, 5); // Guessed - final int boxs = Rnd.get(1, 5); + final int marksRewarded = getRandom(2, 5); // Guessed + final int boxs = getRandom(1, 5); winner.addItem("CoC-Winner", 45584, marksRewarded, winner, true); // Mark of battle winner.addItem("CoC-Winner", 36333, boxs, winner, true); // Mysterious Box // Possible additional rewards // Improved Life Stone - if (Rnd.get(10) < 3) // Chance to get reward (30%) + if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(4)) + switch (getRandom(4)) { case 0: { @@ -758,9 +757,9 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Soul Crystal Fragment - else if (Rnd.get(10) < 3) // Chance to get reward (30%) + else if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(6)) + switch (getRandom(6)) { case 0: { @@ -795,7 +794,7 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Mysterious Belt - else if (Rnd.get(10) < 1) // Chance to get reward (10%) + else if (getRandom(10) < 1) // Chance to get reward (10%) { winner.addItem("CoC-Winner", 35565, 1, winner, true); // Mysterious Belt } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 7bbf4a0077..936e02d42f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -21,7 +21,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; @@ -152,7 +151,7 @@ public class MemoryOfDisaster extends AbstractInstance new Location(116925, -180420, -1200, 46585), new Location(116656, -180461, -1240, 56363), }; - private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, Rnd.get(65520)); + private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, getRandom(65520)); // Misc private static final int FIRE_IN_DWARVEN_VILLAGE = 23120700; private static final int TEMPLATE_ID = 200; @@ -221,7 +220,7 @@ public class MemoryOfDisaster extends AbstractInstance case "FIGHT": { addSpawn(npc, npc.getParameters().getInt("npcId"), npc.getLocation(), true, instance.getId()); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { @@ -553,7 +552,7 @@ public class MemoryOfDisaster extends AbstractInstance case "ATTACK_TIME": { final List tentacles = npc.getInstanceWorld().getAliveNpcs(TENTACLE).stream().filter(n -> n.getVariables().getBoolean("isLeaderKiller", false)).collect(Collectors.toList()); - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(Rnd.get(tentacles.size())))); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(getRandom(tentacles.size())))); break; } case "RUN_TIME": @@ -561,7 +560,7 @@ public class MemoryOfDisaster extends AbstractInstance npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> { n.setRunning(); - n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[Rnd.get(SHOUT_RUN.length)]); + n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[getRandom(SHOUT_RUN.length)]); n.getAI().moveTo(DWARVES_MOVE_1); }); break; @@ -640,7 +639,7 @@ public class MemoryOfDisaster extends AbstractInstance } case "TIMER_ID_DIE": { - npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[Rnd.get(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); + npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[getRandom(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); npc.doDie(npc); DecayTaskManager.getInstance().cancel(npc); break; @@ -675,7 +674,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if ((npc.getX() == DWARVES_MOVE_3.getX()) && (npc.getY() == DWARVES_MOVE_3.getY())) { - addMoveToDesire(npc, DWARVES_MOVE_RANDOM[Rnd.get(DWARVES_MOVE_RANDOM.length)], 23); + addMoveToDesire(npc, DWARVES_MOVE_RANDOM[getRandom(DWARVES_MOVE_RANDOM.length)], 23); } } switch (npc.getId()) @@ -864,7 +863,7 @@ public class MemoryOfDisaster extends AbstractInstance } else { - dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[Rnd.get(SHOUT_BRONK_DEATH.length)]); + dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[getRandom(SHOUT_BRONK_DEATH.length)]); } } npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.UGH_IF_I_SEE_YOU_IN_THE_SPIRIT_WORLD_FIRST_ROUND_IS_ON_ME); @@ -873,7 +872,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if (npc.getId() == SILVERA) { - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[Rnd.get(SHOUT_SILVERA_DEATH.length)])); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[getRandom(SHOUT_SILVERA_DEATH.length)])); } } @@ -970,7 +969,7 @@ public class MemoryOfDisaster extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance) && event.equals("SCE_J4D_DARK_ELF_START")) { - getTimers().addTimer("TIMER_ID_DIE", Rnd.get(60000) + 5000, receiver, null); + getTimers().addTimer("TIMER_ID_DIE", getRandom(60000) + 5000, receiver, null); } return super.onEventReceived(event, sender, receiver, reference); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java index 486084718b..a325fcb987 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java @@ -17,7 +17,6 @@ package quests.Q00181_DevilsStrikeBackAdventOfBalok; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; @@ -77,7 +76,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest giveAdena(player, 37128000, true); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); qs.exitQuest(QuestType.ONE_TIME, true); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java index f63e4684a7..24dc552a09 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java @@ -16,7 +16,6 @@ */ package quests.Q00620_FourGoblets; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -141,7 +140,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31454-13.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -149,10 +148,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -194,10 +193,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -230,10 +229,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -275,10 +274,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -311,10 +310,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -328,10 +327,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 50) + else if (getRandom(1000) < 50) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -348,10 +347,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -421,10 +420,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -469,7 +468,7 @@ public class Q00620_FourGoblets extends Quest } else if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31454-14.htm"; } @@ -590,7 +589,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31919-3.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -598,10 +597,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -643,10 +642,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -679,10 +678,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -724,10 +723,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -760,10 +759,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -777,11 +776,11 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 5) + else if (getRandom(1000) < 5) { reward = 1; } - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -797,10 +796,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -870,10 +869,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -918,7 +917,7 @@ public class Q00620_FourGoblets extends Quest } if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31919-4.htm"; } @@ -1158,7 +1157,7 @@ public class Q00620_FourGoblets extends Quest final int npcId = npc.getId(); if ((qs != null) && (qs.getCond() > 0) && (npcId >= 18120) && (npcId <= 18256)) { - if (Rnd.get(100) < 15) + if (getRandom(100) < 15) { giveItems(killer, SEALED_BOX, 1); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index e9f21fb91d..e012de30f8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -673,7 +672,7 @@ public class Q00662_AGameOfCards extends Quest } } - final Player player = players.get(Rnd.get(players.size())); + final Player player = players.get(getRandom(players.size())); if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && (MONSTERS.get(npc.getId()) < getRandom(1000))) { final QuestState qs = getQuestState(player, false); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 6e54441f46..2198ee2165 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -19,7 +19,6 @@ package quests.Q00663_SeductiveWhispers; import java.util.Arrays; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -198,7 +197,7 @@ public class Q00663_SeductiveWhispers extends Quest { if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -233,7 +232,7 @@ public class Q00663_SeductiveWhispers extends Quest // Player draw a card (Always player start first !!) if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -346,7 +345,7 @@ public class Q00663_SeductiveWhispers extends Quest final QuestState qs = getQuestState(killer, false); if ((qs != null) && qs.isCond(1)) { - switch (Rnd.get(0, 5)) + switch (getRandom(0, 5)) { case 0: case 1: @@ -379,7 +378,7 @@ public class Q00663_SeductiveWhispers extends Quest private Card getRandomCard() { - final int index = Rnd.get(0, 7); + final int index = getRandom(0, 7); return Arrays.stream(cards).filter(card -> (!card.equals(playerCard)) && (!card.equals(npcCard))).collect(Collectors.toList()).get(index); } @@ -461,12 +460,12 @@ public class Q00663_SeductiveWhispers extends Quest private int getRandomRecipeBGrade() { - return RECIPES_B_GRADE[Rnd.get(0, RECIPES_B_GRADE.length - 1)]; + return RECIPES_B_GRADE[getRandom(0, RECIPES_B_GRADE.length - 1)]; } private int getRandomPartBGrade() { - return PART_B_GRADE[Rnd.get(0, PART_B_GRADE.length - 1)]; + return PART_B_GRADE[getRandom(0, PART_B_GRADE.length - 1)]; } private enum Side diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java index 93e8559ff9..4cb6303606 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java @@ -19,7 +19,6 @@ package ai.areas.EnchantedValley; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -53,7 +52,7 @@ public class FlowerBud extends AbstractNpcAI { if (event.equals("spawn") && npc.isDead()) { - final Npc elegant = addSpawn(FLOWER_SPAWNS.get(Rnd.get(FLOWER_SPAWNS.size())), npc, false, 120000, false); + final Npc elegant = addSpawn(FLOWER_SPAWNS.get(getRandom(FLOWER_SPAWNS.size())), npc, false, 120000, false); addAttackPlayerDesire(elegant, player); } return event; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java index b49d5c445c..5ffc401682 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java @@ -16,7 +16,6 @@ */ package ai.areas.RaidersCrossroads.Kaysen; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -105,7 +104,7 @@ public class Kaysen extends AbstractNpcAI } npc.setScriptValue(1); - if (Rnd.get(100) < REWARD_CHANCE) + if (getRandom(100) < REWARD_CHANCE) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_THOUGHT_I_D_BE_A_PUSHOVER_DIDN_T_YOU); giveItems(player, REWARD); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 365f49300b..c1d1ccd5b4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -406,7 +405,7 @@ public class Anakim extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -416,7 +415,7 @@ public class Anakim extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -596,7 +595,7 @@ public class Anakim extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -645,7 +644,7 @@ public class Anakim extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) + if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 095d89bc2c..4760cc09ff 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -19,7 +19,6 @@ package ai.bosses.Balok; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; @@ -147,7 +146,7 @@ public class BalokWarzone extends AbstractInstance } case "stage_last_send_minions": { - final Npc minion = _minionList.get(Rnd.get(_minionList.size())); + final Npc minion = _minionList.get(getRandom(_minionList.size())); if (minion != null) { minion.setRunning(); @@ -186,7 +185,7 @@ public class BalokWarzone extends AbstractInstance } case "imprission_minions": { - final int[] randomJail = PRISONS_SPAWN[Rnd.get(PRISONS_SPAWN.length)]; // Random jail + final int[] randomJail = PRISONS_SPAWN[getRandom(PRISONS_SPAWN.length)]; // Random jail player.teleToLocation(randomJail[0], randomJail[1], randomJail[2]); world.broadcastPacket(new ExShowScreenMessage("$s1, locked away in the prison.".replace("$s1", player.getName()), 5000)); break; @@ -220,7 +219,7 @@ public class BalokWarzone extends AbstractInstance } World.getInstance().forEachVisibleObjectInRange(npc, Player.class, 300, instPlayer -> { - if ((instPlayer == null) || (Rnd.get(100) > 2)) + if ((instPlayer == null) || (getRandom(100) > 2)) { return; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 420276fe1d..a83cffe0cf 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -196,21 +195,21 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().addBoss(_kelbimBoss); _lastAction = Chronos.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); - startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; } case "stage_all_spawn_minions": { - for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) + for (int i = 0; i < getRandom((_bossStage * 5) / 2, _bossStage * 5); i++) { final Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } - for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) + for (int i = 0; i < getRandom((_bossStage * 2) / 2, _bossStage * 2); i++) { - final Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); + final Npc minion = addSpawn(KELBIM_GUARDIANS[getRandom(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); @@ -223,7 +222,7 @@ public class Kelbim extends AbstractNpcAI { if (_kelbimBoss.isInCombat()) { - final Skill randomAttackSkill = AREA_SKILLS[Rnd.get(AREA_SKILLS.length)]; + final Skill randomAttackSkill = AREA_SKILLS[getRandom(AREA_SKILLS.length)]; final List skillNpcs = new ArrayList<>(); for (Player pl : ZONE.getPlayersInside()) { @@ -231,7 +230,7 @@ public class Kelbim extends AbstractNpcAI { continue; } - if (Rnd.get(100) > 40) + if (getRandom(100) > 40) { final Npc skillMob = addSpawn(KELBIM_SHOUT, pl.getX(), pl.getY(), pl.getZ() + 10, 0, true, 60000, false, 0); skillNpcs.add(skillMob); @@ -247,7 +246,7 @@ public class Kelbim extends AbstractNpcAI skillNpc.doCast(randomAttackSkill); } } - startQuestTimer("stage_all_random_area_attack", Rnd.get(1, 2) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(1, 2) * 60000, null, null); } break; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 3961572d66..d12d95df85 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -432,7 +431,7 @@ public class Lilith extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -442,7 +441,7 @@ public class Lilith extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -612,7 +611,7 @@ public class Lilith extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -661,7 +660,7 @@ public class Lilith extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) + if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index f8b05abb47..6c6e11d07c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -946,8 +945,8 @@ public class Lindvior extends AbstractNpcAI int y = loc.getY(); if (radius > 0) { - x += Rnd.get(-radius, radius); - y += Rnd.get(-radius, radius); + x += getRandom(-radius, radius); + y += getRandom(-radius, radius); } for (int i = 0; i < count; i++) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index 8c77fe2a32..b41ffbd3ec 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -22,7 +22,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -233,7 +232,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 1) && _ramona1.isInCombat()) { - Skill randomAttackSkill = RAMONA1_SKILLS[Rnd.get(RAMONA1_SKILLS.length)]; + Skill randomAttackSkill = RAMONA1_SKILLS[getRandom(RAMONA1_SKILLS.length)]; if (getRandom(100) > 20) { _ramona1.doCast(randomAttackSkill); @@ -248,7 +247,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona2 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -262,7 +261,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 2) && _ramona2.isInCombat()) { - Skill randomAttackSkill = RAMONA2_SKILLS[Rnd.get(RAMONA2_SKILLS.length)]; + Skill randomAttackSkill = RAMONA2_SKILLS[getRandom(RAMONA2_SKILLS.length)]; if (getRandom(100) > 20) { _ramona2.doCast(randomAttackSkill); @@ -277,7 +276,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona3 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -291,7 +290,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 3) && _ramona3.isInCombat()) { - Skill randomAttackSkill = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill randomAttackSkill = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if (getRandom(100) > 20) { _ramona3.doCast(randomAttackSkill); @@ -510,7 +509,7 @@ public class Ramona extends AbstractNpcAI if ((player != null) && !player.isDead()) { - Skill skillToCast = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill skillToCast = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if ((skillToCast != null) && SkillCaster.checkUseConditions(npc, skillToCast)) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 44df549069..8b7e94342c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -626,7 +625,7 @@ public class Trasken extends AbstractNpcAI _tieTrasken.getSpawn().stopRespawn(); _tieTrasken.decayMe(); - final int[] spawn = TAIL_RANDOM_SPAWN[Rnd.get(TAIL_RANDOM_SPAWN.length)]; + final int[] spawn = TAIL_RANDOM_SPAWN[getRandom(TAIL_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TAIL_TRASKEN) == null) { ThreadPool.schedule(() -> @@ -647,7 +646,7 @@ public class Trasken extends AbstractNpcAI _trasken.getSpawn().stopRespawn(); _trasken.decayMe(); - final int[] spawn1 = TRASKEN_RANDOM_SPAWN[Rnd.get(TRASKEN_RANDOM_SPAWN.length)]; + final int[] spawn1 = TRASKEN_RANDOM_SPAWN[getRandom(TRASKEN_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TRASKEN) == null) { ThreadPool.schedule(() -> diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 768f8f7227..96e0accbf7 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ClassId; @@ -351,7 +350,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 250d35d232..ffaf36617b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -724,16 +723,16 @@ public class CeremonyOfChaos extends AbstractNpcAI msg.addString(winner.getName()); // Rewards according to https://l2wiki.com/Ceremony_of_Chaos - final int marksRewarded = Rnd.get(2, 5); // Guessed - final int boxs = Rnd.get(1, 5); + final int marksRewarded = getRandom(2, 5); // Guessed + final int boxs = getRandom(1, 5); winner.addItem("CoC-Winner", 45584, marksRewarded, winner, true); // Mark of battle winner.addItem("CoC-Winner", 36333, boxs, winner, true); // Mysterious Box // Possible additional rewards // Improved Life Stone - if (Rnd.get(10) < 3) // Chance to get reward (30%) + if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(4)) + switch (getRandom(4)) { case 0: { @@ -758,9 +757,9 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Soul Crystal Fragment - else if (Rnd.get(10) < 3) // Chance to get reward (30%) + else if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(6)) + switch (getRandom(6)) { case 0: { @@ -795,7 +794,7 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Mysterious Belt - else if (Rnd.get(10) < 1) // Chance to get reward (10%) + else if (getRandom(10) < 1) // Chance to get reward (10%) { winner.addItem("CoC-Winner", 35565, 1, winner, true); // Mysterious Belt } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 7bbf4a0077..936e02d42f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -21,7 +21,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; @@ -152,7 +151,7 @@ public class MemoryOfDisaster extends AbstractInstance new Location(116925, -180420, -1200, 46585), new Location(116656, -180461, -1240, 56363), }; - private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, Rnd.get(65520)); + private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, getRandom(65520)); // Misc private static final int FIRE_IN_DWARVEN_VILLAGE = 23120700; private static final int TEMPLATE_ID = 200; @@ -221,7 +220,7 @@ public class MemoryOfDisaster extends AbstractInstance case "FIGHT": { addSpawn(npc, npc.getParameters().getInt("npcId"), npc.getLocation(), true, instance.getId()); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { @@ -553,7 +552,7 @@ public class MemoryOfDisaster extends AbstractInstance case "ATTACK_TIME": { final List tentacles = npc.getInstanceWorld().getAliveNpcs(TENTACLE).stream().filter(n -> n.getVariables().getBoolean("isLeaderKiller", false)).collect(Collectors.toList()); - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(Rnd.get(tentacles.size())))); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(getRandom(tentacles.size())))); break; } case "RUN_TIME": @@ -561,7 +560,7 @@ public class MemoryOfDisaster extends AbstractInstance npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> { n.setRunning(); - n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[Rnd.get(SHOUT_RUN.length)]); + n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[getRandom(SHOUT_RUN.length)]); n.getAI().moveTo(DWARVES_MOVE_1); }); break; @@ -640,7 +639,7 @@ public class MemoryOfDisaster extends AbstractInstance } case "TIMER_ID_DIE": { - npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[Rnd.get(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); + npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[getRandom(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); npc.doDie(npc); DecayTaskManager.getInstance().cancel(npc); break; @@ -675,7 +674,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if ((npc.getX() == DWARVES_MOVE_3.getX()) && (npc.getY() == DWARVES_MOVE_3.getY())) { - addMoveToDesire(npc, DWARVES_MOVE_RANDOM[Rnd.get(DWARVES_MOVE_RANDOM.length)], 23); + addMoveToDesire(npc, DWARVES_MOVE_RANDOM[getRandom(DWARVES_MOVE_RANDOM.length)], 23); } } switch (npc.getId()) @@ -864,7 +863,7 @@ public class MemoryOfDisaster extends AbstractInstance } else { - dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[Rnd.get(SHOUT_BRONK_DEATH.length)]); + dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[getRandom(SHOUT_BRONK_DEATH.length)]); } } npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.UGH_IF_I_SEE_YOU_IN_THE_SPIRIT_WORLD_FIRST_ROUND_IS_ON_ME); @@ -873,7 +872,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if (npc.getId() == SILVERA) { - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[Rnd.get(SHOUT_SILVERA_DEATH.length)])); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[getRandom(SHOUT_SILVERA_DEATH.length)])); } } @@ -970,7 +969,7 @@ public class MemoryOfDisaster extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance) && event.equals("SCE_J4D_DARK_ELF_START")) { - getTimers().addTimer("TIMER_ID_DIE", Rnd.get(60000) + 5000, receiver, null); + getTimers().addTimer("TIMER_ID_DIE", getRandom(60000) + 5000, receiver, null); } return super.onEventReceived(event, sender, receiver, reference); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java index 486084718b..a325fcb987 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java @@ -17,7 +17,6 @@ package quests.Q00181_DevilsStrikeBackAdventOfBalok; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; @@ -77,7 +76,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest giveAdena(player, 37128000, true); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); qs.exitQuest(QuestType.ONE_TIME, true); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java index f63e4684a7..24dc552a09 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java @@ -16,7 +16,6 @@ */ package quests.Q00620_FourGoblets; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -141,7 +140,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31454-13.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -149,10 +148,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -194,10 +193,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -230,10 +229,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -275,10 +274,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -311,10 +310,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -328,10 +327,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 50) + else if (getRandom(1000) < 50) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -348,10 +347,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -421,10 +420,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -469,7 +468,7 @@ public class Q00620_FourGoblets extends Quest } else if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31454-14.htm"; } @@ -590,7 +589,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31919-3.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -598,10 +597,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -643,10 +642,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -679,10 +678,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -724,10 +723,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -760,10 +759,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -777,11 +776,11 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 5) + else if (getRandom(1000) < 5) { reward = 1; } - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -797,10 +796,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -870,10 +869,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -918,7 +917,7 @@ public class Q00620_FourGoblets extends Quest } if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31919-4.htm"; } @@ -1158,7 +1157,7 @@ public class Q00620_FourGoblets extends Quest final int npcId = npc.getId(); if ((qs != null) && (qs.getCond() > 0) && (npcId >= 18120) && (npcId <= 18256)) { - if (Rnd.get(100) < 15) + if (getRandom(100) < 15) { giveItems(killer, SEALED_BOX, 1); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index e9f21fb91d..e012de30f8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -673,7 +672,7 @@ public class Q00662_AGameOfCards extends Quest } } - final Player player = players.get(Rnd.get(players.size())); + final Player player = players.get(getRandom(players.size())); if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && (MONSTERS.get(npc.getId()) < getRandom(1000))) { final QuestState qs = getQuestState(player, false); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 6e54441f46..2198ee2165 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -19,7 +19,6 @@ package quests.Q00663_SeductiveWhispers; import java.util.Arrays; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -198,7 +197,7 @@ public class Q00663_SeductiveWhispers extends Quest { if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -233,7 +232,7 @@ public class Q00663_SeductiveWhispers extends Quest // Player draw a card (Always player start first !!) if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -346,7 +345,7 @@ public class Q00663_SeductiveWhispers extends Quest final QuestState qs = getQuestState(killer, false); if ((qs != null) && qs.isCond(1)) { - switch (Rnd.get(0, 5)) + switch (getRandom(0, 5)) { case 0: case 1: @@ -379,7 +378,7 @@ public class Q00663_SeductiveWhispers extends Quest private Card getRandomCard() { - final int index = Rnd.get(0, 7); + final int index = getRandom(0, 7); return Arrays.stream(cards).filter(card -> (!card.equals(playerCard)) && (!card.equals(npcCard))).collect(Collectors.toList()).get(index); } @@ -461,12 +460,12 @@ public class Q00663_SeductiveWhispers extends Quest private int getRandomRecipeBGrade() { - return RECIPES_B_GRADE[Rnd.get(0, RECIPES_B_GRADE.length - 1)]; + return RECIPES_B_GRADE[getRandom(0, RECIPES_B_GRADE.length - 1)]; } private int getRandomPartBGrade() { - return PART_B_GRADE[Rnd.get(0, PART_B_GRADE.length - 1)]; + return PART_B_GRADE[getRandom(0, PART_B_GRADE.length - 1)]; } private enum Side diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java index 93e8559ff9..4cb6303606 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java @@ -19,7 +19,6 @@ package ai.areas.EnchantedValley; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -53,7 +52,7 @@ public class FlowerBud extends AbstractNpcAI { if (event.equals("spawn") && npc.isDead()) { - final Npc elegant = addSpawn(FLOWER_SPAWNS.get(Rnd.get(FLOWER_SPAWNS.size())), npc, false, 120000, false); + final Npc elegant = addSpawn(FLOWER_SPAWNS.get(getRandom(FLOWER_SPAWNS.size())), npc, false, 120000, false); addAttackPlayerDesire(elegant, player); } return event; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java index b49d5c445c..5ffc401682 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java @@ -16,7 +16,6 @@ */ package ai.areas.RaidersCrossroads.Kaysen; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -105,7 +104,7 @@ public class Kaysen extends AbstractNpcAI } npc.setScriptValue(1); - if (Rnd.get(100) < REWARD_CHANCE) + if (getRandom(100) < REWARD_CHANCE) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_THOUGHT_I_D_BE_A_PUSHOVER_DIDN_T_YOU); giveItems(player, REWARD); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 365f49300b..c1d1ccd5b4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -406,7 +405,7 @@ public class Anakim extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -416,7 +415,7 @@ public class Anakim extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -596,7 +595,7 @@ public class Anakim extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -645,7 +644,7 @@ public class Anakim extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) + if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _anakimBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 811959c8dc..992eae3c7c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -19,7 +19,6 @@ package ai.bosses.Balok; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; @@ -147,7 +146,7 @@ public class BalokWarzone extends AbstractInstance } case "stage_last_send_minions": { - final Npc minion = _minionList.get(Rnd.get(_minionList.size())); + final Npc minion = _minionList.get(getRandom(_minionList.size())); if (minion != null) { minion.setRunning(); @@ -186,7 +185,7 @@ public class BalokWarzone extends AbstractInstance } case "imprission_minions": { - final int[] randomJail = PRISONS_SPAWN[Rnd.get(PRISONS_SPAWN.length)]; // Random jail + final int[] randomJail = PRISONS_SPAWN[getRandom(PRISONS_SPAWN.length)]; // Random jail player.teleToLocation(randomJail[0], randomJail[1], randomJail[2]); world.broadcastPacket(new ExShowScreenMessage("$s1, locked away in the prison.".replace("$s1", player.getName()), 5000)); break; @@ -220,7 +219,7 @@ public class BalokWarzone extends AbstractInstance } World.getInstance().forEachVisibleObjectInRange(npc, Player.class, 300, instPlayer -> { - if ((instPlayer == null) || (Rnd.get(100) > 2)) + if ((instPlayer == null) || (getRandom(100) > 2)) { return; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 420276fe1d..a83cffe0cf 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -196,21 +195,21 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().addBoss(_kelbimBoss); _lastAction = Chronos.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); - startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; } case "stage_all_spawn_minions": { - for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) + for (int i = 0; i < getRandom((_bossStage * 5) / 2, _bossStage * 5); i++) { final Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } - for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) + for (int i = 0; i < getRandom((_bossStage * 2) / 2, _bossStage * 2); i++) { - final Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); + final Npc minion = addSpawn(KELBIM_GUARDIANS[getRandom(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); @@ -223,7 +222,7 @@ public class Kelbim extends AbstractNpcAI { if (_kelbimBoss.isInCombat()) { - final Skill randomAttackSkill = AREA_SKILLS[Rnd.get(AREA_SKILLS.length)]; + final Skill randomAttackSkill = AREA_SKILLS[getRandom(AREA_SKILLS.length)]; final List skillNpcs = new ArrayList<>(); for (Player pl : ZONE.getPlayersInside()) { @@ -231,7 +230,7 @@ public class Kelbim extends AbstractNpcAI { continue; } - if (Rnd.get(100) > 40) + if (getRandom(100) > 40) { final Npc skillMob = addSpawn(KELBIM_SHOUT, pl.getX(), pl.getY(), pl.getZ() + 10, 0, true, 60000, false, 0); skillNpcs.add(skillMob); @@ -247,7 +246,7 @@ public class Kelbim extends AbstractNpcAI skillNpc.doCast(randomAttackSkill); } } - startQuestTimer("stage_all_random_area_attack", Rnd.get(1, 2) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(1, 2) * 60000, null, null); } break; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 3961572d66..d12d95df85 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -432,7 +431,7 @@ public class Lilith extends AbstractNpcAI { for (int i = 0; i < 2; i++) { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { final Npc remnant = addSpawn(REMNANT, randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ(), randomSpawn.getHeading(), true, 0, false, 0); @@ -442,7 +441,7 @@ public class Lilith extends AbstractNpcAI } else { - randomSpawn = _spawns.get(Rnd.get(_spawns.size())); + randomSpawn = _spawns.get(getRandom(_spawns.size())); if (randomSpawn != null) { npc.teleToLocation(randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ()); @@ -612,7 +611,7 @@ public class Lilith extends AbstractNpcAI } } } - if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (Rnd.get(100) > 95)) + if ((npc.getId() == REMNANT) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.30)) && !npc.isCastingNow() && (getRandom(100) > 95)) { npc.doCast(REMANT_TELE); } @@ -661,7 +660,7 @@ public class Lilith extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && Rnd.nextBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) + if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && getRandomBoolean() && (skill.getAbnormalType() == AbnormalType.HP_RECOVER) && !npc.isCastingNow() && (npc.getTarget() != npc) && (npc.getTarget() != caster) && (npc.getTarget() != _lilithBoss)) { ((Attackable) npc).clearAggroList(); npc.setTarget(caster); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index f8b05abb47..6c6e11d07c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -946,8 +945,8 @@ public class Lindvior extends AbstractNpcAI int y = loc.getY(); if (radius > 0) { - x += Rnd.get(-radius, radius); - y += Rnd.get(-radius, radius); + x += getRandom(-radius, radius); + y += getRandom(-radius, radius); } for (int i = 0; i < count; i++) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index 8c77fe2a32..b41ffbd3ec 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -22,7 +22,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -233,7 +232,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 1) && _ramona1.isInCombat()) { - Skill randomAttackSkill = RAMONA1_SKILLS[Rnd.get(RAMONA1_SKILLS.length)]; + Skill randomAttackSkill = RAMONA1_SKILLS[getRandom(RAMONA1_SKILLS.length)]; if (getRandom(100) > 20) { _ramona1.doCast(randomAttackSkill); @@ -248,7 +247,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona2 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -262,7 +261,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 2) && _ramona2.isInCombat()) { - Skill randomAttackSkill = RAMONA2_SKILLS[Rnd.get(RAMONA2_SKILLS.length)]; + Skill randomAttackSkill = RAMONA2_SKILLS[getRandom(RAMONA2_SKILLS.length)]; if (getRandom(100) > 20) { _ramona2.doCast(randomAttackSkill); @@ -277,7 +276,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona3 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -291,7 +290,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 3) && _ramona3.isInCombat()) { - Skill randomAttackSkill = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill randomAttackSkill = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if (getRandom(100) > 20) { _ramona3.doCast(randomAttackSkill); @@ -510,7 +509,7 @@ public class Ramona extends AbstractNpcAI if ((player != null) && !player.isDead()) { - Skill skillToCast = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill skillToCast = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if ((skillToCast != null) && SkillCaster.checkUseConditions(npc, skillToCast)) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 44df549069..8b7e94342c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -626,7 +625,7 @@ public class Trasken extends AbstractNpcAI _tieTrasken.getSpawn().stopRespawn(); _tieTrasken.decayMe(); - final int[] spawn = TAIL_RANDOM_SPAWN[Rnd.get(TAIL_RANDOM_SPAWN.length)]; + final int[] spawn = TAIL_RANDOM_SPAWN[getRandom(TAIL_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TAIL_TRASKEN) == null) { ThreadPool.schedule(() -> @@ -647,7 +646,7 @@ public class Trasken extends AbstractNpcAI _trasken.getSpawn().stopRespawn(); _trasken.decayMe(); - final int[] spawn1 = TRASKEN_RANDOM_SPAWN[Rnd.get(TRASKEN_RANDOM_SPAWN.length)]; + final int[] spawn1 = TRASKEN_RANDOM_SPAWN[getRandom(TRASKEN_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TRASKEN) == null) { ThreadPool.schedule(() -> diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 86fe7f5ccc..362eb94e8b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ClassId; @@ -351,7 +350,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 219438b1f6..9487ca4098 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -724,16 +723,16 @@ public class CeremonyOfChaos extends AbstractNpcAI msg.addString(winner.getName()); // Rewards according to https://l2wiki.com/Ceremony_of_Chaos - final int marksRewarded = Rnd.get(2, 5); // Guessed - final int boxs = Rnd.get(1, 5); + final int marksRewarded = getRandom(2, 5); // Guessed + final int boxs = getRandom(1, 5); winner.addItem("CoC-Winner", 45584, marksRewarded, winner, true); // Mark of battle winner.addItem("CoC-Winner", 36333, boxs, winner, true); // Mysterious Box // Possible additional rewards // Improved Life Stone - if (Rnd.get(10) < 3) // Chance to get reward (30%) + if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(4)) + switch (getRandom(4)) { case 0: { @@ -758,9 +757,9 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Soul Crystal Fragment - else if (Rnd.get(10) < 3) // Chance to get reward (30%) + else if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(6)) + switch (getRandom(6)) { case 0: { @@ -795,7 +794,7 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Mysterious Belt - else if (Rnd.get(10) < 1) // Chance to get reward (10%) + else if (getRandom(10) < 1) // Chance to get reward (10%) { winner.addItem("CoC-Winner", 35565, 1, winner, true); // Mysterious Belt } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 7bbf4a0077..936e02d42f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -21,7 +21,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; @@ -152,7 +151,7 @@ public class MemoryOfDisaster extends AbstractInstance new Location(116925, -180420, -1200, 46585), new Location(116656, -180461, -1240, 56363), }; - private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, Rnd.get(65520)); + private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, getRandom(65520)); // Misc private static final int FIRE_IN_DWARVEN_VILLAGE = 23120700; private static final int TEMPLATE_ID = 200; @@ -221,7 +220,7 @@ public class MemoryOfDisaster extends AbstractInstance case "FIGHT": { addSpawn(npc, npc.getParameters().getInt("npcId"), npc.getLocation(), true, instance.getId()); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { @@ -553,7 +552,7 @@ public class MemoryOfDisaster extends AbstractInstance case "ATTACK_TIME": { final List tentacles = npc.getInstanceWorld().getAliveNpcs(TENTACLE).stream().filter(n -> n.getVariables().getBoolean("isLeaderKiller", false)).collect(Collectors.toList()); - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(Rnd.get(tentacles.size())))); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(getRandom(tentacles.size())))); break; } case "RUN_TIME": @@ -561,7 +560,7 @@ public class MemoryOfDisaster extends AbstractInstance npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> { n.setRunning(); - n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[Rnd.get(SHOUT_RUN.length)]); + n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[getRandom(SHOUT_RUN.length)]); n.getAI().moveTo(DWARVES_MOVE_1); }); break; @@ -640,7 +639,7 @@ public class MemoryOfDisaster extends AbstractInstance } case "TIMER_ID_DIE": { - npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[Rnd.get(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); + npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[getRandom(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); npc.doDie(npc); DecayTaskManager.getInstance().cancel(npc); break; @@ -675,7 +674,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if ((npc.getX() == DWARVES_MOVE_3.getX()) && (npc.getY() == DWARVES_MOVE_3.getY())) { - addMoveToDesire(npc, DWARVES_MOVE_RANDOM[Rnd.get(DWARVES_MOVE_RANDOM.length)], 23); + addMoveToDesire(npc, DWARVES_MOVE_RANDOM[getRandom(DWARVES_MOVE_RANDOM.length)], 23); } } switch (npc.getId()) @@ -864,7 +863,7 @@ public class MemoryOfDisaster extends AbstractInstance } else { - dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[Rnd.get(SHOUT_BRONK_DEATH.length)]); + dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[getRandom(SHOUT_BRONK_DEATH.length)]); } } npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.UGH_IF_I_SEE_YOU_IN_THE_SPIRIT_WORLD_FIRST_ROUND_IS_ON_ME); @@ -873,7 +872,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if (npc.getId() == SILVERA) { - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[Rnd.get(SHOUT_SILVERA_DEATH.length)])); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[getRandom(SHOUT_SILVERA_DEATH.length)])); } } @@ -970,7 +969,7 @@ public class MemoryOfDisaster extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance) && event.equals("SCE_J4D_DARK_ELF_START")) { - getTimers().addTimer("TIMER_ID_DIE", Rnd.get(60000) + 5000, receiver, null); + getTimers().addTimer("TIMER_ID_DIE", getRandom(60000) + 5000, receiver, null); } return super.onEventReceived(event, sender, receiver, reference); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java index 486084718b..a325fcb987 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java @@ -17,7 +17,6 @@ package quests.Q00181_DevilsStrikeBackAdventOfBalok; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; @@ -77,7 +76,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest giveAdena(player, 37128000, true); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); qs.exitQuest(QuestType.ONE_TIME, true); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java index f63e4684a7..24dc552a09 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java @@ -16,7 +16,6 @@ */ package quests.Q00620_FourGoblets; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -141,7 +140,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31454-13.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -149,10 +148,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -194,10 +193,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -230,10 +229,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -275,10 +274,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -311,10 +310,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -328,10 +327,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 50) + else if (getRandom(1000) < 50) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -348,10 +347,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -421,10 +420,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -469,7 +468,7 @@ public class Q00620_FourGoblets extends Quest } else if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31454-14.htm"; } @@ -590,7 +589,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31919-3.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -598,10 +597,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -643,10 +642,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -679,10 +678,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -724,10 +723,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -760,10 +759,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -777,11 +776,11 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 5) + else if (getRandom(1000) < 5) { reward = 1; } - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -797,10 +796,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -870,10 +869,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -918,7 +917,7 @@ public class Q00620_FourGoblets extends Quest } if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31919-4.htm"; } @@ -1158,7 +1157,7 @@ public class Q00620_FourGoblets extends Quest final int npcId = npc.getId(); if ((qs != null) && (qs.getCond() > 0) && (npcId >= 18120) && (npcId <= 18256)) { - if (Rnd.get(100) < 15) + if (getRandom(100) < 15) { giveItems(killer, SEALED_BOX, 1); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index e9f21fb91d..e012de30f8 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -673,7 +672,7 @@ public class Q00662_AGameOfCards extends Quest } } - final Player player = players.get(Rnd.get(players.size())); + final Player player = players.get(getRandom(players.size())); if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && (MONSTERS.get(npc.getId()) < getRandom(1000))) { final QuestState qs = getQuestState(player, false); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 6e54441f46..2198ee2165 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -19,7 +19,6 @@ package quests.Q00663_SeductiveWhispers; import java.util.Arrays; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -198,7 +197,7 @@ public class Q00663_SeductiveWhispers extends Quest { if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -233,7 +232,7 @@ public class Q00663_SeductiveWhispers extends Quest // Player draw a card (Always player start first !!) if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -346,7 +345,7 @@ public class Q00663_SeductiveWhispers extends Quest final QuestState qs = getQuestState(killer, false); if ((qs != null) && qs.isCond(1)) { - switch (Rnd.get(0, 5)) + switch (getRandom(0, 5)) { case 0: case 1: @@ -379,7 +378,7 @@ public class Q00663_SeductiveWhispers extends Quest private Card getRandomCard() { - final int index = Rnd.get(0, 7); + final int index = getRandom(0, 7); return Arrays.stream(cards).filter(card -> (!card.equals(playerCard)) && (!card.equals(npcCard))).collect(Collectors.toList()).get(index); } @@ -461,12 +460,12 @@ public class Q00663_SeductiveWhispers extends Quest private int getRandomRecipeBGrade() { - return RECIPES_B_GRADE[Rnd.get(0, RECIPES_B_GRADE.length - 1)]; + return RECIPES_B_GRADE[getRandom(0, RECIPES_B_GRADE.length - 1)]; } private int getRandomPartBGrade() { - return PART_B_GRADE[Rnd.get(0, PART_B_GRADE.length - 1)]; + return PART_B_GRADE[getRandom(0, PART_B_GRADE.length - 1)]; } private enum Side diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java index 93e8559ff9..4cb6303606 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java @@ -19,7 +19,6 @@ package ai.areas.EnchantedValley; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -53,7 +52,7 @@ public class FlowerBud extends AbstractNpcAI { if (event.equals("spawn") && npc.isDead()) { - final Npc elegant = addSpawn(FLOWER_SPAWNS.get(Rnd.get(FLOWER_SPAWNS.size())), npc, false, 120000, false); + final Npc elegant = addSpawn(FLOWER_SPAWNS.get(getRandom(FLOWER_SPAWNS.size())), npc, false, 120000, false); addAttackPlayerDesire(elegant, player); } return event; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java index b49d5c445c..5ffc401682 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java @@ -16,7 +16,6 @@ */ package ai.areas.RaidersCrossroads.Kaysen; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -105,7 +104,7 @@ public class Kaysen extends AbstractNpcAI } npc.setScriptValue(1); - if (Rnd.get(100) < REWARD_CHANCE) + if (getRandom(100) < REWARD_CHANCE) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_THOUGHT_I_D_BE_A_PUSHOVER_DIDN_T_YOU); giveItems(player, REWARD); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 7aa4961758..48dfe2211a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -313,7 +312,7 @@ public class Anakim extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && Rnd.nextBoolean()) + if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && getRandomBoolean()) { if (skill.getAbnormalType() == AbnormalType.HP_RECOVER) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 811959c8dc..992eae3c7c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -19,7 +19,6 @@ package ai.bosses.Balok; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; @@ -147,7 +146,7 @@ public class BalokWarzone extends AbstractInstance } case "stage_last_send_minions": { - final Npc minion = _minionList.get(Rnd.get(_minionList.size())); + final Npc minion = _minionList.get(getRandom(_minionList.size())); if (minion != null) { minion.setRunning(); @@ -186,7 +185,7 @@ public class BalokWarzone extends AbstractInstance } case "imprission_minions": { - final int[] randomJail = PRISONS_SPAWN[Rnd.get(PRISONS_SPAWN.length)]; // Random jail + final int[] randomJail = PRISONS_SPAWN[getRandom(PRISONS_SPAWN.length)]; // Random jail player.teleToLocation(randomJail[0], randomJail[1], randomJail[2]); world.broadcastPacket(new ExShowScreenMessage("$s1, locked away in the prison.".replace("$s1", player.getName()), 5000)); break; @@ -220,7 +219,7 @@ public class BalokWarzone extends AbstractInstance } World.getInstance().forEachVisibleObjectInRange(npc, Player.class, 300, instPlayer -> { - if ((instPlayer == null) || (Rnd.get(100) > 2)) + if ((instPlayer == null) || (getRandom(100) > 2)) { return; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 420276fe1d..a83cffe0cf 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -196,21 +195,21 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().addBoss(_kelbimBoss); _lastAction = Chronos.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); - startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; } case "stage_all_spawn_minions": { - for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) + for (int i = 0; i < getRandom((_bossStage * 5) / 2, _bossStage * 5); i++) { final Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } - for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) + for (int i = 0; i < getRandom((_bossStage * 2) / 2, _bossStage * 2); i++) { - final Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); + final Npc minion = addSpawn(KELBIM_GUARDIANS[getRandom(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); @@ -223,7 +222,7 @@ public class Kelbim extends AbstractNpcAI { if (_kelbimBoss.isInCombat()) { - final Skill randomAttackSkill = AREA_SKILLS[Rnd.get(AREA_SKILLS.length)]; + final Skill randomAttackSkill = AREA_SKILLS[getRandom(AREA_SKILLS.length)]; final List skillNpcs = new ArrayList<>(); for (Player pl : ZONE.getPlayersInside()) { @@ -231,7 +230,7 @@ public class Kelbim extends AbstractNpcAI { continue; } - if (Rnd.get(100) > 40) + if (getRandom(100) > 40) { final Npc skillMob = addSpawn(KELBIM_SHOUT, pl.getX(), pl.getY(), pl.getZ() + 10, 0, true, 60000, false, 0); skillNpcs.add(skillMob); @@ -247,7 +246,7 @@ public class Kelbim extends AbstractNpcAI skillNpc.doCast(randomAttackSkill); } } - startQuestTimer("stage_all_random_area_attack", Rnd.get(1, 2) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(1, 2) * 60000, null, null); } break; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index b5ad06c13f..c1596cfcbf 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -306,7 +305,7 @@ public class Lilith extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && Rnd.nextBoolean()) + if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && getRandomBoolean()) { if (skill.getAbnormalType() == AbnormalType.HP_RECOVER) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index f8b05abb47..6c6e11d07c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -946,8 +945,8 @@ public class Lindvior extends AbstractNpcAI int y = loc.getY(); if (radius > 0) { - x += Rnd.get(-radius, radius); - y += Rnd.get(-radius, radius); + x += getRandom(-radius, radius); + y += getRandom(-radius, radius); } for (int i = 0; i < count; i++) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index 8c77fe2a32..b41ffbd3ec 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -22,7 +22,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -233,7 +232,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 1) && _ramona1.isInCombat()) { - Skill randomAttackSkill = RAMONA1_SKILLS[Rnd.get(RAMONA1_SKILLS.length)]; + Skill randomAttackSkill = RAMONA1_SKILLS[getRandom(RAMONA1_SKILLS.length)]; if (getRandom(100) > 20) { _ramona1.doCast(randomAttackSkill); @@ -248,7 +247,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona2 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -262,7 +261,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 2) && _ramona2.isInCombat()) { - Skill randomAttackSkill = RAMONA2_SKILLS[Rnd.get(RAMONA2_SKILLS.length)]; + Skill randomAttackSkill = RAMONA2_SKILLS[getRandom(RAMONA2_SKILLS.length)]; if (getRandom(100) > 20) { _ramona2.doCast(randomAttackSkill); @@ -277,7 +276,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona3 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -291,7 +290,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 3) && _ramona3.isInCombat()) { - Skill randomAttackSkill = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill randomAttackSkill = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if (getRandom(100) > 20) { _ramona3.doCast(randomAttackSkill); @@ -510,7 +509,7 @@ public class Ramona extends AbstractNpcAI if ((player != null) && !player.isDead()) { - Skill skillToCast = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill skillToCast = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if ((skillToCast != null) && SkillCaster.checkUseConditions(npc, skillToCast)) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 44df549069..8b7e94342c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -626,7 +625,7 @@ public class Trasken extends AbstractNpcAI _tieTrasken.getSpawn().stopRespawn(); _tieTrasken.decayMe(); - final int[] spawn = TAIL_RANDOM_SPAWN[Rnd.get(TAIL_RANDOM_SPAWN.length)]; + final int[] spawn = TAIL_RANDOM_SPAWN[getRandom(TAIL_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TAIL_TRASKEN) == null) { ThreadPool.schedule(() -> @@ -647,7 +646,7 @@ public class Trasken extends AbstractNpcAI _trasken.getSpawn().stopRespawn(); _trasken.decayMe(); - final int[] spawn1 = TRASKEN_RANDOM_SPAWN[Rnd.get(TRASKEN_RANDOM_SPAWN.length)]; + final int[] spawn1 = TRASKEN_RANDOM_SPAWN[getRandom(TRASKEN_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TRASKEN) == null) { ThreadPool.schedule(() -> diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 86fe7f5ccc..362eb94e8b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ClassId; @@ -351,7 +350,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 219438b1f6..9487ca4098 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -724,16 +723,16 @@ public class CeremonyOfChaos extends AbstractNpcAI msg.addString(winner.getName()); // Rewards according to https://l2wiki.com/Ceremony_of_Chaos - final int marksRewarded = Rnd.get(2, 5); // Guessed - final int boxs = Rnd.get(1, 5); + final int marksRewarded = getRandom(2, 5); // Guessed + final int boxs = getRandom(1, 5); winner.addItem("CoC-Winner", 45584, marksRewarded, winner, true); // Mark of battle winner.addItem("CoC-Winner", 36333, boxs, winner, true); // Mysterious Box // Possible additional rewards // Improved Life Stone - if (Rnd.get(10) < 3) // Chance to get reward (30%) + if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(4)) + switch (getRandom(4)) { case 0: { @@ -758,9 +757,9 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Soul Crystal Fragment - else if (Rnd.get(10) < 3) // Chance to get reward (30%) + else if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(6)) + switch (getRandom(6)) { case 0: { @@ -795,7 +794,7 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Mysterious Belt - else if (Rnd.get(10) < 1) // Chance to get reward (10%) + else if (getRandom(10) < 1) // Chance to get reward (10%) { winner.addItem("CoC-Winner", 35565, 1, winner, true); // Mysterious Belt } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 7bbf4a0077..936e02d42f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -21,7 +21,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; @@ -152,7 +151,7 @@ public class MemoryOfDisaster extends AbstractInstance new Location(116925, -180420, -1200, 46585), new Location(116656, -180461, -1240, 56363), }; - private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, Rnd.get(65520)); + private static final Location DE_VILLAGE_START = new Location(10400, 17092, -4584, getRandom(65520)); // Misc private static final int FIRE_IN_DWARVEN_VILLAGE = 23120700; private static final int TEMPLATE_ID = 200; @@ -221,7 +220,7 @@ public class MemoryOfDisaster extends AbstractInstance case "FIGHT": { addSpawn(npc, npc.getParameters().getInt("npcId"), npc.getLocation(), true, instance.getId()); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { @@ -553,7 +552,7 @@ public class MemoryOfDisaster extends AbstractInstance case "ATTACK_TIME": { final List tentacles = npc.getInstanceWorld().getAliveNpcs(TENTACLE).stream().filter(n -> n.getVariables().getBoolean("isLeaderKiller", false)).collect(Collectors.toList()); - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(Rnd.get(tentacles.size())))); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> addAttackDesire(n, tentacles.get(getRandom(tentacles.size())))); break; } case "RUN_TIME": @@ -561,7 +560,7 @@ public class MemoryOfDisaster extends AbstractInstance npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> { n.setRunning(); - n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[Rnd.get(SHOUT_RUN.length)]); + n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_RUN[getRandom(SHOUT_RUN.length)]); n.getAI().moveTo(DWARVES_MOVE_1); }); break; @@ -640,7 +639,7 @@ public class MemoryOfDisaster extends AbstractInstance } case "TIMER_ID_DIE": { - npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[Rnd.get(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); + npc.broadcastSay(ChatType.NPC_GENERAL, SACRIFICED_DARK_ELF_SUICIDE_MESSAGES[getRandom(SACRIFICED_DARK_ELF_SUICIDE_MESSAGES.length)]); npc.doDie(npc); DecayTaskManager.getInstance().cancel(npc); break; @@ -675,7 +674,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if ((npc.getX() == DWARVES_MOVE_3.getX()) && (npc.getY() == DWARVES_MOVE_3.getY())) { - addMoveToDesire(npc, DWARVES_MOVE_RANDOM[Rnd.get(DWARVES_MOVE_RANDOM.length)], 23); + addMoveToDesire(npc, DWARVES_MOVE_RANDOM[getRandom(DWARVES_MOVE_RANDOM.length)], 23); } } switch (npc.getId()) @@ -864,7 +863,7 @@ public class MemoryOfDisaster extends AbstractInstance } else { - dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[Rnd.get(SHOUT_BRONK_DEATH.length)]); + dwarf.broadcastSay(ChatType.NPC_GENERAL, SHOUT_BRONK_DEATH[getRandom(SHOUT_BRONK_DEATH.length)]); } } npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.UGH_IF_I_SEE_YOU_IN_THE_SPIRIT_WORLD_FIRST_ROUND_IS_ON_ME); @@ -873,7 +872,7 @@ public class MemoryOfDisaster extends AbstractInstance } else if (npc.getId() == SILVERA) { - npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[Rnd.get(SHOUT_SILVERA_DEATH.length)])); + npc.getInstanceWorld().getNpcs(DWARVES).forEach(n -> n.broadcastSay(ChatType.NPC_GENERAL, SHOUT_SILVERA_DEATH[getRandom(SHOUT_SILVERA_DEATH.length)])); } } @@ -970,7 +969,7 @@ public class MemoryOfDisaster extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance) && event.equals("SCE_J4D_DARK_ELF_START")) { - getTimers().addTimer("TIMER_ID_DIE", Rnd.get(60000) + 5000, receiver, null); + getTimers().addTimer("TIMER_ID_DIE", getRandom(60000) + 5000, receiver, null); } return super.onEventReceived(event, sender, receiver, reference); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java index 486084718b..a325fcb987 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java @@ -17,7 +17,6 @@ package quests.Q00181_DevilsStrikeBackAdventOfBalok; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; @@ -77,7 +76,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest giveAdena(player, 37128000, true); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); qs.exitQuest(QuestType.ONE_TIME, true); - switch (Rnd.get(3)) + switch (getRandom(3)) { case 0: { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java index f63e4684a7..24dc552a09 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java @@ -16,7 +16,6 @@ */ package quests.Q00620_FourGoblets; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -141,7 +140,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31454-13.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -149,10 +148,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -194,10 +193,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -230,10 +229,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -275,10 +274,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -311,10 +310,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -328,10 +327,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 50) + else if (getRandom(1000) < 50) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -348,10 +347,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -421,10 +420,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -469,7 +468,7 @@ public class Q00620_FourGoblets extends Quest } else if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31454-14.htm"; } @@ -590,7 +589,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31919-3.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -598,10 +597,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -643,10 +642,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -679,10 +678,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -724,10 +723,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -760,10 +759,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -777,11 +776,11 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 5) + else if (getRandom(1000) < 5) { reward = 1; } - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -797,10 +796,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -870,10 +869,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -918,7 +917,7 @@ public class Q00620_FourGoblets extends Quest } if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31919-4.htm"; } @@ -1158,7 +1157,7 @@ public class Q00620_FourGoblets extends Quest final int npcId = npc.getId(); if ((qs != null) && (qs.getCond() > 0) && (npcId >= 18120) && (npcId <= 18256)) { - if (Rnd.get(100) < 15) + if (getRandom(100) < 15) { giveItems(killer, SEALED_BOX, 1); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index f7d09e64e0..54fcece258 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -669,7 +668,7 @@ public class Q00662_AGameOfCards extends Quest } } - final Player player = players.get(Rnd.get(players.size())); + final Player player = players.get(getRandom(players.size())); if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && (MONSTERS.get(npc.getId()) < getRandom(1000))) { final QuestState qs = getQuestState(player, false); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 6e54441f46..2198ee2165 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -19,7 +19,6 @@ package quests.Q00663_SeductiveWhispers; import java.util.Arrays; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -198,7 +197,7 @@ public class Q00663_SeductiveWhispers extends Quest { if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -233,7 +232,7 @@ public class Q00663_SeductiveWhispers extends Quest // Player draw a card (Always player start first !!) if (playerCard == null) { - playerCard = cards[Rnd.get(0, 9)]; + playerCard = cards[getRandom(0, 9)]; } else { @@ -346,7 +345,7 @@ public class Q00663_SeductiveWhispers extends Quest final QuestState qs = getQuestState(killer, false); if ((qs != null) && qs.isCond(1)) { - switch (Rnd.get(0, 5)) + switch (getRandom(0, 5)) { case 0: case 1: @@ -379,7 +378,7 @@ public class Q00663_SeductiveWhispers extends Quest private Card getRandomCard() { - final int index = Rnd.get(0, 7); + final int index = getRandom(0, 7); return Arrays.stream(cards).filter(card -> (!card.equals(playerCard)) && (!card.equals(npcCard))).collect(Collectors.toList()).get(index); } @@ -461,12 +460,12 @@ public class Q00663_SeductiveWhispers extends Quest private int getRandomRecipeBGrade() { - return RECIPES_B_GRADE[Rnd.get(0, RECIPES_B_GRADE.length - 1)]; + return RECIPES_B_GRADE[getRandom(0, RECIPES_B_GRADE.length - 1)]; } private int getRandomPartBGrade() { - return PART_B_GRADE[Rnd.get(0, PART_B_GRADE.length - 1)]; + return PART_B_GRADE[getRandom(0, PART_B_GRADE.length - 1)]; } private enum Side diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java index 93e8559ff9..4cb6303606 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/EnchantedValley/FlowerBud.java @@ -19,7 +19,6 @@ package ai.areas.EnchantedValley; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -53,7 +52,7 @@ public class FlowerBud extends AbstractNpcAI { if (event.equals("spawn") && npc.isDead()) { - final Npc elegant = addSpawn(FLOWER_SPAWNS.get(Rnd.get(FLOWER_SPAWNS.size())), npc, false, 120000, false); + final Npc elegant = addSpawn(FLOWER_SPAWNS.get(getRandom(FLOWER_SPAWNS.size())), npc, false, 120000, false); addAttackPlayerDesire(elegant, player); } return event; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java index b49d5c445c..5ffc401682 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java @@ -16,7 +16,6 @@ */ package ai.areas.RaidersCrossroads.Kaysen; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -105,7 +104,7 @@ public class Kaysen extends AbstractNpcAI } npc.setScriptValue(1); - if (Rnd.get(100) < REWARD_CHANCE) + if (getRandom(100) < REWARD_CHANCE) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_THOUGHT_I_D_BE_A_PUSHOVER_DIDN_T_YOU); giveItems(player, REWARD); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 7aa4961758..48dfe2211a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -313,7 +312,7 @@ public class Anakim extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && Rnd.nextBoolean()) + if (CommonUtil.contains(ANAKIM_MINIONS, npc.getId()) && getRandomBoolean()) { if (skill.getAbnormalType() == AbnormalType.HP_RECOVER) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 811959c8dc..992eae3c7c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -19,7 +19,6 @@ package ai.bosses.Balok; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; @@ -147,7 +146,7 @@ public class BalokWarzone extends AbstractInstance } case "stage_last_send_minions": { - final Npc minion = _minionList.get(Rnd.get(_minionList.size())); + final Npc minion = _minionList.get(getRandom(_minionList.size())); if (minion != null) { minion.setRunning(); @@ -186,7 +185,7 @@ public class BalokWarzone extends AbstractInstance } case "imprission_minions": { - final int[] randomJail = PRISONS_SPAWN[Rnd.get(PRISONS_SPAWN.length)]; // Random jail + final int[] randomJail = PRISONS_SPAWN[getRandom(PRISONS_SPAWN.length)]; // Random jail player.teleToLocation(randomJail[0], randomJail[1], randomJail[2]); world.broadcastPacket(new ExShowScreenMessage("$s1, locked away in the prison.".replace("$s1", player.getName()), 5000)); break; @@ -220,7 +219,7 @@ public class BalokWarzone extends AbstractInstance } World.getInstance().forEachVisibleObjectInRange(npc, Player.class, 300, instPlayer -> { - if ((instPlayer == null) || (Rnd.get(100) > 2)) + if ((instPlayer == null) || (getRandom(100) > 2)) { return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 420276fe1d..a83cffe0cf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -196,21 +195,21 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().addBoss(_kelbimBoss); _lastAction = Chronos.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); - startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; } case "stage_all_spawn_minions": { - for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) + for (int i = 0; i < getRandom((_bossStage * 5) / 2, _bossStage * 5); i++) { final Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } - for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) + for (int i = 0; i < getRandom((_bossStage * 2) / 2, _bossStage * 2); i++) { - final Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); + final Npc minion = addSpawn(KELBIM_GUARDIANS[getRandom(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); @@ -223,7 +222,7 @@ public class Kelbim extends AbstractNpcAI { if (_kelbimBoss.isInCombat()) { - final Skill randomAttackSkill = AREA_SKILLS[Rnd.get(AREA_SKILLS.length)]; + final Skill randomAttackSkill = AREA_SKILLS[getRandom(AREA_SKILLS.length)]; final List skillNpcs = new ArrayList<>(); for (Player pl : ZONE.getPlayersInside()) { @@ -231,7 +230,7 @@ public class Kelbim extends AbstractNpcAI { continue; } - if (Rnd.get(100) > 40) + if (getRandom(100) > 40) { final Npc skillMob = addSpawn(KELBIM_SHOUT, pl.getX(), pl.getY(), pl.getZ() + 10, 0, true, 60000, false, 0); skillNpcs.add(skillMob); @@ -247,7 +246,7 @@ public class Kelbim extends AbstractNpcAI skillNpc.doCast(randomAttackSkill); } } - startQuestTimer("stage_all_random_area_attack", Rnd.get(1, 2) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(1, 2) * 60000, null, null); } break; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index b5ad06c13f..c1596cfcbf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -306,7 +305,7 @@ public class Lilith extends AbstractNpcAI @Override public String onSkillSee(Npc npc, Player caster, Skill skill, WorldObject[] targets, boolean isPet) { - if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && Rnd.nextBoolean()) + if (CommonUtil.contains(LILITH_MINIONS, npc.getId()) && getRandomBoolean()) { if (skill.getAbnormalType() == AbnormalType.HP_RECOVER) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index f8b05abb47..6c6e11d07c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -946,8 +945,8 @@ public class Lindvior extends AbstractNpcAI int y = loc.getY(); if (radius > 0) { - x += Rnd.get(-radius, radius); - y += Rnd.get(-radius, radius); + x += getRandom(-radius, radius); + y += getRandom(-radius, radius); } for (int i = 0; i < count; i++) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index 8c77fe2a32..b41ffbd3ec 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -22,7 +22,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -233,7 +232,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 1) && _ramona1.isInCombat()) { - Skill randomAttackSkill = RAMONA1_SKILLS[Rnd.get(RAMONA1_SKILLS.length)]; + Skill randomAttackSkill = RAMONA1_SKILLS[getRandom(RAMONA1_SKILLS.length)]; if (getRandom(100) > 20) { _ramona1.doCast(randomAttackSkill); @@ -248,7 +247,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona2 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -262,7 +261,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 2) && _ramona2.isInCombat()) { - Skill randomAttackSkill = RAMONA2_SKILLS[Rnd.get(RAMONA2_SKILLS.length)]; + Skill randomAttackSkill = RAMONA2_SKILLS[getRandom(RAMONA2_SKILLS.length)]; if (getRandom(100) > 20) { _ramona2.doCast(randomAttackSkill); @@ -277,7 +276,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona3 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -291,7 +290,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 3) && _ramona3.isInCombat()) { - Skill randomAttackSkill = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill randomAttackSkill = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if (getRandom(100) > 20) { _ramona3.doCast(randomAttackSkill); @@ -510,7 +509,7 @@ public class Ramona extends AbstractNpcAI if ((player != null) && !player.isDead()) { - Skill skillToCast = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill skillToCast = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if ((skillToCast != null) && SkillCaster.checkUseConditions(npc, skillToCast)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 44df549069..8b7e94342c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -626,7 +625,7 @@ public class Trasken extends AbstractNpcAI _tieTrasken.getSpawn().stopRespawn(); _tieTrasken.decayMe(); - final int[] spawn = TAIL_RANDOM_SPAWN[Rnd.get(TAIL_RANDOM_SPAWN.length)]; + final int[] spawn = TAIL_RANDOM_SPAWN[getRandom(TAIL_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TAIL_TRASKEN) == null) { ThreadPool.schedule(() -> @@ -647,7 +646,7 @@ public class Trasken extends AbstractNpcAI _trasken.getSpawn().stopRespawn(); _trasken.decayMe(); - final int[] spawn1 = TRASKEN_RANDOM_SPAWN[Rnd.get(TRASKEN_RANDOM_SPAWN.length)]; + final int[] spawn1 = TRASKEN_RANDOM_SPAWN[getRandom(TRASKEN_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TRASKEN) == null) { ThreadPool.schedule(() -> diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 86fe7f5ccc..362eb94e8b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ClassId; @@ -351,7 +350,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index f6b3b39b1e..91a45e8295 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -724,16 +723,16 @@ public class CeremonyOfChaos extends AbstractNpcAI msg.addString(winner.getName()); // Rewards according to https://l2wiki.com/Ceremony_of_Chaos - final int marksRewarded = Rnd.get(2, 5); // Guessed - final int boxs = Rnd.get(1, 5); + final int marksRewarded = getRandom(2, 5); // Guessed + final int boxs = getRandom(1, 5); winner.addItem("CoC-Winner", 45584, marksRewarded, winner, true); // Mark of battle winner.addItem("CoC-Winner", 36333, boxs, winner, true); // Mysterious Box // Possible additional rewards // Improved Life Stone - if (Rnd.get(10) < 3) // Chance to get reward (30%) + if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(4)) + switch (getRandom(4)) { case 0: { @@ -758,9 +757,9 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Soul Crystal Fragment - else if (Rnd.get(10) < 3) // Chance to get reward (30%) + else if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(6)) + switch (getRandom(6)) { case 0: { @@ -795,7 +794,7 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Mysterious Belt - else if (Rnd.get(10) < 1) // Chance to get reward (10%) + else if (getRandom(10) < 1) // Chance to get reward (10%) { winner.addItem("CoC-Winner", 35565, 1, winner, true); // Mysterious Belt } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java index f63e4684a7..24dc552a09 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java @@ -16,7 +16,6 @@ */ package quests.Q00620_FourGoblets; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -141,7 +140,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31454-13.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -149,10 +148,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -194,10 +193,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -230,10 +229,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -275,10 +274,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -311,10 +310,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -328,10 +327,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 50) + else if (getRandom(1000) < 50) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -348,10 +347,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -421,10 +420,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -469,7 +468,7 @@ public class Q00620_FourGoblets extends Quest } else if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31454-14.htm"; } @@ -590,7 +589,7 @@ public class Q00620_FourGoblets extends Quest htmltext = "31919-3.htm"; takeItems(player, SEALED_BOX, 1); int reward = 0; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { giveItems(player, 57, 10000); @@ -598,10 +597,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { giveItems(player, 1884, 42); @@ -643,10 +642,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4043, 1); } } - else if (Rnd.get(1000) < 323) + else if (getRandom(1000) < 323) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { giveItems(player, 1888, 1); @@ -679,10 +678,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { giveItems(player, 1878, 8); @@ -724,10 +723,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 4044, 1); } } - else if (Rnd.get(1000) < 251) + else if (getRandom(1000) < 251) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { giveItems(player, 1887, 1); @@ -760,10 +759,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { giveItems(player, 730, 1); @@ -777,11 +776,11 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 960, 1); } } - else if (Rnd.get(1000) < 5) + else if (getRandom(1000) < 5) { reward = 1; } - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { giveItems(player, 729, 1); @@ -797,10 +796,10 @@ public class Q00620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { giveItems(player, 6698, 1); @@ -870,10 +869,10 @@ public class Q00620_FourGoblets extends Quest giveItems(player, 6714, 1); } } - else if (Rnd.get(1000) < 54) + else if (getRandom(1000) < 54) { reward = 1; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { giveItems(player, 6688, 1); @@ -918,7 +917,7 @@ public class Q00620_FourGoblets extends Quest } if (reward == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "31919-4.htm"; } @@ -1158,7 +1157,7 @@ public class Q00620_FourGoblets extends Quest final int npcId = npc.getId(); if ((qs != null) && (qs.getCond() > 0) && (npcId >= 18120) && (npcId <= 18256)) { - if (Rnd.get(100) < 15) + if (getRandom(100) < 15) { giveItems(killer, SEALED_BOX, 1); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java index e5e7b9802a..99c477512a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java @@ -16,7 +16,6 @@ */ package ai.areas.Aden.Lulu; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -127,7 +126,7 @@ public class Lulu extends AbstractNpcAI if (player.reduceAdena("Lulu", ADENA_COST, _luluNpc, true)) { - SkillCaster.triggerCast(_luluNpc, player, Rnd.get(100) < BUFF_CHANCE ? LULU_LUCK_LV2.getSkill() : LULU_LUCK_LV1.getSkill()); + SkillCaster.triggerCast(_luluNpc, player, getRandom(100) < BUFF_CHANCE ? LULU_LUCK_LV2.getSkill() : LULU_LUCK_LV1.getSkill()); } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java index de18a8bac6..81c20170a3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java @@ -16,7 +16,6 @@ */ package ai.areas.Giran.Grace; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -120,7 +119,7 @@ public class Grace extends AbstractNpcAI if (player.reduceAdena("Grace", ADENA_COST, _graceNpc, true)) { - SkillCaster.triggerCast(_graceNpc, player, Rnd.get(100) < BUFF_CHANCE ? GRACE_LUCK_LV2.getSkill() : GRACE_LUCK_LV1.getSkill()); + SkillCaster.triggerCast(_graceNpc, player, getRandom(100) < BUFF_CHANCE ? GRACE_LUCK_LV2.getSkill() : GRACE_LUCK_LV1.getSkill()); } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java index b49d5c445c..5ffc401682 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java @@ -16,7 +16,6 @@ */ package ai.areas.RaidersCrossroads.Kaysen; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -105,7 +104,7 @@ public class Kaysen extends AbstractNpcAI } npc.setScriptValue(1); - if (Rnd.get(100) < REWARD_CHANCE) + if (getRandom(100) < REWARD_CHANCE) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_THOUGHT_I_D_BE_A_PUSHOVER_DIDN_T_YOU); giveItems(player, REWARD); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 811959c8dc..992eae3c7c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -19,7 +19,6 @@ package ai.bosses.Balok; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; @@ -147,7 +146,7 @@ public class BalokWarzone extends AbstractInstance } case "stage_last_send_minions": { - final Npc minion = _minionList.get(Rnd.get(_minionList.size())); + final Npc minion = _minionList.get(getRandom(_minionList.size())); if (minion != null) { minion.setRunning(); @@ -186,7 +185,7 @@ public class BalokWarzone extends AbstractInstance } case "imprission_minions": { - final int[] randomJail = PRISONS_SPAWN[Rnd.get(PRISONS_SPAWN.length)]; // Random jail + final int[] randomJail = PRISONS_SPAWN[getRandom(PRISONS_SPAWN.length)]; // Random jail player.teleToLocation(randomJail[0], randomJail[1], randomJail[2]); world.broadcastPacket(new ExShowScreenMessage("$s1, locked away in the prison.".replace("$s1", player.getName()), 5000)); break; @@ -220,7 +219,7 @@ public class BalokWarzone extends AbstractInstance } World.getInstance().forEachVisibleObjectInRange(npc, Player.class, 300, instPlayer -> { - if ((instPlayer == null) || (Rnd.get(100) > 2)) + if ((instPlayer == null) || (getRandom(100) > 2)) { return; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 420276fe1d..a83cffe0cf 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -196,21 +195,21 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().addBoss(_kelbimBoss); _lastAction = Chronos.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); - startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; } case "stage_all_spawn_minions": { - for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) + for (int i = 0; i < getRandom((_bossStage * 5) / 2, _bossStage * 5); i++) { final Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } - for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) + for (int i = 0; i < getRandom((_bossStage * 2) / 2, _bossStage * 2); i++) { - final Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); + final Npc minion = addSpawn(KELBIM_GUARDIANS[getRandom(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); @@ -223,7 +222,7 @@ public class Kelbim extends AbstractNpcAI { if (_kelbimBoss.isInCombat()) { - final Skill randomAttackSkill = AREA_SKILLS[Rnd.get(AREA_SKILLS.length)]; + final Skill randomAttackSkill = AREA_SKILLS[getRandom(AREA_SKILLS.length)]; final List skillNpcs = new ArrayList<>(); for (Player pl : ZONE.getPlayersInside()) { @@ -231,7 +230,7 @@ public class Kelbim extends AbstractNpcAI { continue; } - if (Rnd.get(100) > 40) + if (getRandom(100) > 40) { final Npc skillMob = addSpawn(KELBIM_SHOUT, pl.getX(), pl.getY(), pl.getZ() + 10, 0, true, 60000, false, 0); skillNpcs.add(skillMob); @@ -247,7 +246,7 @@ public class Kelbim extends AbstractNpcAI skillNpc.doCast(randomAttackSkill); } } - startQuestTimer("stage_all_random_area_attack", Rnd.get(1, 2) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(1, 2) * 60000, null, null); } break; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index f8b05abb47..6c6e11d07c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -946,8 +945,8 @@ public class Lindvior extends AbstractNpcAI int y = loc.getY(); if (radius > 0) { - x += Rnd.get(-radius, radius); - y += Rnd.get(-radius, radius); + x += getRandom(-radius, radius); + y += getRandom(-radius, radius); } for (int i = 0; i < count; i++) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index 8c77fe2a32..b41ffbd3ec 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -22,7 +22,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -233,7 +232,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 1) && _ramona1.isInCombat()) { - Skill randomAttackSkill = RAMONA1_SKILLS[Rnd.get(RAMONA1_SKILLS.length)]; + Skill randomAttackSkill = RAMONA1_SKILLS[getRandom(RAMONA1_SKILLS.length)]; if (getRandom(100) > 20) { _ramona1.doCast(randomAttackSkill); @@ -248,7 +247,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona2 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -262,7 +261,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 2) && _ramona2.isInCombat()) { - Skill randomAttackSkill = RAMONA2_SKILLS[Rnd.get(RAMONA2_SKILLS.length)]; + Skill randomAttackSkill = RAMONA2_SKILLS[getRandom(RAMONA2_SKILLS.length)]; if (getRandom(100) > 20) { _ramona2.doCast(randomAttackSkill); @@ -277,7 +276,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona3 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -291,7 +290,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 3) && _ramona3.isInCombat()) { - Skill randomAttackSkill = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill randomAttackSkill = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if (getRandom(100) > 20) { _ramona3.doCast(randomAttackSkill); @@ -510,7 +509,7 @@ public class Ramona extends AbstractNpcAI if ((player != null) && !player.isDead()) { - Skill skillToCast = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill skillToCast = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if ((skillToCast != null) && SkillCaster.checkUseConditions(npc, skillToCast)) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 4103b15b4c..70b00e60a6 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -626,7 +625,7 @@ public class Trasken extends AbstractNpcAI _tieTrasken.getSpawn().stopRespawn(); _tieTrasken.decayMe(); - final int[] spawn = TAIL_RANDOM_SPAWN[Rnd.get(TAIL_RANDOM_SPAWN.length)]; + final int[] spawn = TAIL_RANDOM_SPAWN[getRandom(TAIL_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TAIL_TRASKEN) == null) { ThreadPool.schedule(() -> @@ -647,7 +646,7 @@ public class Trasken extends AbstractNpcAI _trasken.getSpawn().stopRespawn(); _trasken.decayMe(); - final int[] spawn1 = TRASKEN_RANDOM_SPAWN[Rnd.get(TRASKEN_RANDOM_SPAWN.length)]; + final int[] spawn1 = TRASKEN_RANDOM_SPAWN[getRandom(TRASKEN_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TRASKEN) == null) { ThreadPool.schedule(() -> diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java index d77f2379af..253c033433 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java @@ -23,7 +23,6 @@ import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -133,7 +132,7 @@ public class AetherDrops extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if ((killer.getLevel() >= PLAYER_LEVEL) && (Rnd.get(100) < CHANCE)) + if ((killer.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) { final int count = killer.getVariables().getInt(AETHER_DROP_COUNT_VAR, 0); if (count < DROP_DAILY) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 86fe7f5ccc..362eb94e8b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ClassId; @@ -351,7 +350,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index f6b3b39b1e..91a45e8295 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -724,16 +723,16 @@ public class CeremonyOfChaos extends AbstractNpcAI msg.addString(winner.getName()); // Rewards according to https://l2wiki.com/Ceremony_of_Chaos - final int marksRewarded = Rnd.get(2, 5); // Guessed - final int boxs = Rnd.get(1, 5); + final int marksRewarded = getRandom(2, 5); // Guessed + final int boxs = getRandom(1, 5); winner.addItem("CoC-Winner", 45584, marksRewarded, winner, true); // Mark of battle winner.addItem("CoC-Winner", 36333, boxs, winner, true); // Mysterious Box // Possible additional rewards // Improved Life Stone - if (Rnd.get(10) < 3) // Chance to get reward (30%) + if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(4)) + switch (getRandom(4)) { case 0: { @@ -758,9 +757,9 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Soul Crystal Fragment - else if (Rnd.get(10) < 3) // Chance to get reward (30%) + else if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(6)) + switch (getRandom(6)) { case 0: { @@ -795,7 +794,7 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Mysterious Belt - else if (Rnd.get(10) < 1) // Chance to get reward (10%) + else if (getRandom(10) < 1) // Chance to get reward (10%) { winner.addItem("CoC-Winner", 35565, 1, winner, true); // Mysterious Belt } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java index e5e7b9802a..99c477512a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java @@ -16,7 +16,6 @@ */ package ai.areas.Aden.Lulu; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -127,7 +126,7 @@ public class Lulu extends AbstractNpcAI if (player.reduceAdena("Lulu", ADENA_COST, _luluNpc, true)) { - SkillCaster.triggerCast(_luluNpc, player, Rnd.get(100) < BUFF_CHANCE ? LULU_LUCK_LV2.getSkill() : LULU_LUCK_LV1.getSkill()); + SkillCaster.triggerCast(_luluNpc, player, getRandom(100) < BUFF_CHANCE ? LULU_LUCK_LV2.getSkill() : LULU_LUCK_LV1.getSkill()); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java index de18a8bac6..81c20170a3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java @@ -16,7 +16,6 @@ */ package ai.areas.Giran.Grace; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -120,7 +119,7 @@ public class Grace extends AbstractNpcAI if (player.reduceAdena("Grace", ADENA_COST, _graceNpc, true)) { - SkillCaster.triggerCast(_graceNpc, player, Rnd.get(100) < BUFF_CHANCE ? GRACE_LUCK_LV2.getSkill() : GRACE_LUCK_LV1.getSkill()); + SkillCaster.triggerCast(_graceNpc, player, getRandom(100) < BUFF_CHANCE ? GRACE_LUCK_LV2.getSkill() : GRACE_LUCK_LV1.getSkill()); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java index b49d5c445c..5ffc401682 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java @@ -16,7 +16,6 @@ */ package ai.areas.RaidersCrossroads.Kaysen; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -105,7 +104,7 @@ public class Kaysen extends AbstractNpcAI } npc.setScriptValue(1); - if (Rnd.get(100) < REWARD_CHANCE) + if (getRandom(100) < REWARD_CHANCE) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_THOUGHT_I_D_BE_A_PUSHOVER_DIDN_T_YOU); giveItems(player, REWARD); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 811959c8dc..992eae3c7c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -19,7 +19,6 @@ package ai.bosses.Balok; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; @@ -147,7 +146,7 @@ public class BalokWarzone extends AbstractInstance } case "stage_last_send_minions": { - final Npc minion = _minionList.get(Rnd.get(_minionList.size())); + final Npc minion = _minionList.get(getRandom(_minionList.size())); if (minion != null) { minion.setRunning(); @@ -186,7 +185,7 @@ public class BalokWarzone extends AbstractInstance } case "imprission_minions": { - final int[] randomJail = PRISONS_SPAWN[Rnd.get(PRISONS_SPAWN.length)]; // Random jail + final int[] randomJail = PRISONS_SPAWN[getRandom(PRISONS_SPAWN.length)]; // Random jail player.teleToLocation(randomJail[0], randomJail[1], randomJail[2]); world.broadcastPacket(new ExShowScreenMessage("$s1, locked away in the prison.".replace("$s1", player.getName()), 5000)); break; @@ -220,7 +219,7 @@ public class BalokWarzone extends AbstractInstance } World.getInstance().forEachVisibleObjectInRange(npc, Player.class, 300, instPlayer -> { - if ((instPlayer == null) || (Rnd.get(100) > 2)) + if ((instPlayer == null) || (getRandom(100) > 2)) { return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 420276fe1d..a83cffe0cf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -196,21 +195,21 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().addBoss(_kelbimBoss); _lastAction = Chronos.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); - startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; } case "stage_all_spawn_minions": { - for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) + for (int i = 0; i < getRandom((_bossStage * 5) / 2, _bossStage * 5); i++) { final Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } - for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) + for (int i = 0; i < getRandom((_bossStage * 2) / 2, _bossStage * 2); i++) { - final Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); + final Npc minion = addSpawn(KELBIM_GUARDIANS[getRandom(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); @@ -223,7 +222,7 @@ public class Kelbim extends AbstractNpcAI { if (_kelbimBoss.isInCombat()) { - final Skill randomAttackSkill = AREA_SKILLS[Rnd.get(AREA_SKILLS.length)]; + final Skill randomAttackSkill = AREA_SKILLS[getRandom(AREA_SKILLS.length)]; final List skillNpcs = new ArrayList<>(); for (Player pl : ZONE.getPlayersInside()) { @@ -231,7 +230,7 @@ public class Kelbim extends AbstractNpcAI { continue; } - if (Rnd.get(100) > 40) + if (getRandom(100) > 40) { final Npc skillMob = addSpawn(KELBIM_SHOUT, pl.getX(), pl.getY(), pl.getZ() + 10, 0, true, 60000, false, 0); skillNpcs.add(skillMob); @@ -247,7 +246,7 @@ public class Kelbim extends AbstractNpcAI skillNpc.doCast(randomAttackSkill); } } - startQuestTimer("stage_all_random_area_attack", Rnd.get(1, 2) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(1, 2) * 60000, null, null); } break; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index f8b05abb47..6c6e11d07c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -946,8 +945,8 @@ public class Lindvior extends AbstractNpcAI int y = loc.getY(); if (radius > 0) { - x += Rnd.get(-radius, radius); - y += Rnd.get(-radius, radius); + x += getRandom(-radius, radius); + y += getRandom(-radius, radius); } for (int i = 0; i < count; i++) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index 8c77fe2a32..b41ffbd3ec 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -22,7 +22,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -233,7 +232,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 1) && _ramona1.isInCombat()) { - Skill randomAttackSkill = RAMONA1_SKILLS[Rnd.get(RAMONA1_SKILLS.length)]; + Skill randomAttackSkill = RAMONA1_SKILLS[getRandom(RAMONA1_SKILLS.length)]; if (getRandom(100) > 20) { _ramona1.doCast(randomAttackSkill); @@ -248,7 +247,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona2 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -262,7 +261,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 2) && _ramona2.isInCombat()) { - Skill randomAttackSkill = RAMONA2_SKILLS[Rnd.get(RAMONA2_SKILLS.length)]; + Skill randomAttackSkill = RAMONA2_SKILLS[getRandom(RAMONA2_SKILLS.length)]; if (getRandom(100) > 20) { _ramona2.doCast(randomAttackSkill); @@ -277,7 +276,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona3 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -291,7 +290,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 3) && _ramona3.isInCombat()) { - Skill randomAttackSkill = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill randomAttackSkill = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if (getRandom(100) > 20) { _ramona3.doCast(randomAttackSkill); @@ -510,7 +509,7 @@ public class Ramona extends AbstractNpcAI if ((player != null) && !player.isDead()) { - Skill skillToCast = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill skillToCast = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if ((skillToCast != null) && SkillCaster.checkUseConditions(npc, skillToCast)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 4103b15b4c..70b00e60a6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -626,7 +625,7 @@ public class Trasken extends AbstractNpcAI _tieTrasken.getSpawn().stopRespawn(); _tieTrasken.decayMe(); - final int[] spawn = TAIL_RANDOM_SPAWN[Rnd.get(TAIL_RANDOM_SPAWN.length)]; + final int[] spawn = TAIL_RANDOM_SPAWN[getRandom(TAIL_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TAIL_TRASKEN) == null) { ThreadPool.schedule(() -> @@ -647,7 +646,7 @@ public class Trasken extends AbstractNpcAI _trasken.getSpawn().stopRespawn(); _trasken.decayMe(); - final int[] spawn1 = TRASKEN_RANDOM_SPAWN[Rnd.get(TRASKEN_RANDOM_SPAWN.length)]; + final int[] spawn1 = TRASKEN_RANDOM_SPAWN[getRandom(TRASKEN_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TRASKEN) == null) { ThreadPool.schedule(() -> diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java index d77f2379af..253c033433 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java @@ -23,7 +23,6 @@ import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -133,7 +132,7 @@ public class AetherDrops extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if ((killer.getLevel() >= PLAYER_LEVEL) && (Rnd.get(100) < CHANCE)) + if ((killer.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) { final int count = killer.getVariables().getInt(AETHER_DROP_COUNT_VAR, 0); if (count < DROP_DAILY) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java index adc26ebe67..28863a4c9b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -163,8 +162,8 @@ public final class GreedyTreasureChests extends AbstractNpcAI } // Misc private static final int TREASURE_CHEST_CHANCE = 15; // 15% chance to spawn + private static final int RND_OFFSET = 10800000; // 3 hours = 10.800.000 milliseconds private static final long RESPAWN_DELAY = 43200000; // 12 hours = 43.200.000 milliseconds - private static final long RND_OFFSET = 10800000; // 3 hours = 10.800.000 milliseconds private GreedyTreasureChests() { @@ -215,12 +214,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SV_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SV_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SV_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SV_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SV_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SV_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_IT, npcId)) @@ -228,12 +227,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_IT_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IT_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IT_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_IT_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IT_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IT_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_TC, npcId)) @@ -241,12 +240,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_TC_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_TC_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_TC_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_TC_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_TC_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_TC_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_AI, npcId)) @@ -254,12 +253,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_AI_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_AI_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_AI_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_AI_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_AI_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_AI_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_FS, npcId)) @@ -267,12 +266,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FS_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FS_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FS_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FS_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FS_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FS_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_FM, npcId)) @@ -280,22 +279,22 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FM_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FM_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FM_3", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_3", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_3", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FM_4", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_4", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_4", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_VS, npcId)) @@ -303,12 +302,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_VS_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_VS_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_VS_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_VS_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_VS_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_VS_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_KO, npcId)) @@ -316,12 +315,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_KO_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_KO_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_KO_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_KO_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_KO_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_KO_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_FW, npcId)) @@ -329,12 +328,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FW_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FW_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FW_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FW_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FW_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FW_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_IP, npcId)) @@ -342,12 +341,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_IP_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IP_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IP_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_IP_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IP_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IP_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_BS, npcId)) @@ -355,12 +354,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_BS_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_BS_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_BS_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_BS_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_BS_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_BS_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_SM, npcId)) @@ -368,12 +367,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SM_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SM_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SM_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SM_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SM_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SM_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_PL, npcId)) @@ -381,12 +380,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_PL_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_PL_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_PL_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_PL_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_PL_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_PL_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_FOM, npcId)) @@ -394,12 +393,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FOM_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FOM_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FOM_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FOM_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FOM_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FOM_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_SS, npcId)) @@ -407,12 +406,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SS_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SS_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SS_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SS_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SS_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SS_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_DV, npcId)) @@ -420,12 +419,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_DV_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_DV_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_DV_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_DV_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_DV_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_DV_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_FT, npcId)) @@ -433,12 +432,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FT_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FT_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FT_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FT_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FT_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FT_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_WS, npcId)) @@ -446,17 +445,17 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_WS_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_WS_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_WS_3", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_3", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_3", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 86fe7f5ccc..362eb94e8b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ClassId; @@ -351,7 +350,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java index fbb795f8e3..305a69de73 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java @@ -17,7 +17,6 @@ package events.DreamMaker; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -65,7 +64,7 @@ public class DreamMaker extends LongTimeEvent { if (!player.getVariables().getBoolean("DREAM_MAKER_GIFT_RECEIVED", false)) { - giveItems(player, Rnd.get(LUCKY_POUCH_GROWTH, LUCKY_POUCH_HARMONY), 1); + giveItems(player, getRandom(LUCKY_POUCH_GROWTH, LUCKY_POUCH_HARMONY), 1); player.getVariables().set("DREAM_MAKER_GIFT_RECEIVED", true); htmltext = "34590-successful.htm"; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java index f0a962a3b6..2cc4b4ae1e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java @@ -23,7 +23,6 @@ import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -287,7 +286,7 @@ public class LegendsMark extends LongTimeEvent @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (isEventPeriod() && (killer.getLevel() >= PLAYER_LEVEL) && (Rnd.get(100) < CHANCE)) + if (isEventPeriod() && (killer.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) { final int count = killer.getVariables().getInt(PROPHECY_FRAGMENTS_DROP_COUNT_VAR, 0); if (count < DROP_DAILY) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index f6b3b39b1e..91a45e8295 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -724,16 +723,16 @@ public class CeremonyOfChaos extends AbstractNpcAI msg.addString(winner.getName()); // Rewards according to https://l2wiki.com/Ceremony_of_Chaos - final int marksRewarded = Rnd.get(2, 5); // Guessed - final int boxs = Rnd.get(1, 5); + final int marksRewarded = getRandom(2, 5); // Guessed + final int boxs = getRandom(1, 5); winner.addItem("CoC-Winner", 45584, marksRewarded, winner, true); // Mark of battle winner.addItem("CoC-Winner", 36333, boxs, winner, true); // Mysterious Box // Possible additional rewards // Improved Life Stone - if (Rnd.get(10) < 3) // Chance to get reward (30%) + if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(4)) + switch (getRandom(4)) { case 0: { @@ -758,9 +757,9 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Soul Crystal Fragment - else if (Rnd.get(10) < 3) // Chance to get reward (30%) + else if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(6)) + switch (getRandom(6)) { case 0: { @@ -795,7 +794,7 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Mysterious Belt - else if (Rnd.get(10) < 1) // Chance to get reward (10%) + else if (getRandom(10) < 1) // Chance to get reward (10%) { winner.addItem("CoC-Winner", 35565, 1, winner, true); // Mysterious Belt } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java index e5e7b9802a..99c477512a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Aden/Lulu/Lulu.java @@ -16,7 +16,6 @@ */ package ai.areas.Aden.Lulu; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -127,7 +126,7 @@ public class Lulu extends AbstractNpcAI if (player.reduceAdena("Lulu", ADENA_COST, _luluNpc, true)) { - SkillCaster.triggerCast(_luluNpc, player, Rnd.get(100) < BUFF_CHANCE ? LULU_LUCK_LV2.getSkill() : LULU_LUCK_LV1.getSkill()); + SkillCaster.triggerCast(_luluNpc, player, getRandom(100) < BUFF_CHANCE ? LULU_LUCK_LV2.getSkill() : LULU_LUCK_LV1.getSkill()); } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java index de18a8bac6..81c20170a3 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Giran/Grace/Grace.java @@ -16,7 +16,6 @@ */ package ai.areas.Giran.Grace; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -120,7 +119,7 @@ public class Grace extends AbstractNpcAI if (player.reduceAdena("Grace", ADENA_COST, _graceNpc, true)) { - SkillCaster.triggerCast(_graceNpc, player, Rnd.get(100) < BUFF_CHANCE ? GRACE_LUCK_LV2.getSkill() : GRACE_LUCK_LV1.getSkill()); + SkillCaster.triggerCast(_graceNpc, player, getRandom(100) < BUFF_CHANCE ? GRACE_LUCK_LV2.getSkill() : GRACE_LUCK_LV1.getSkill()); } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java index b49d5c445c..5ffc401682 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/RaidersCrossroads/Kaysen/Kaysen.java @@ -16,7 +16,6 @@ */ package ai.areas.RaidersCrossroads.Kaysen; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -105,7 +104,7 @@ public class Kaysen extends AbstractNpcAI } npc.setScriptValue(1); - if (Rnd.get(100) < REWARD_CHANCE) + if (getRandom(100) < REWARD_CHANCE) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_THOUGHT_I_D_BE_A_PUSHOVER_DIDN_T_YOU); giveItems(player, REWARD); diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index f1eeec879d..14f812e335 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -19,7 +19,6 @@ package ai.bosses.Balok; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; @@ -147,7 +146,7 @@ public class BalokWarzone extends AbstractInstance } case "stage_last_send_minions": { - final Npc minion = _minionList.get(Rnd.get(_minionList.size())); + final Npc minion = _minionList.get(getRandom(_minionList.size())); if (minion != null) { minion.setRunning(); @@ -186,7 +185,7 @@ public class BalokWarzone extends AbstractInstance } case "imprission_minions": { - final int[] randomJail = PRISONS_SPAWN[Rnd.get(PRISONS_SPAWN.length)]; // Random jail + final int[] randomJail = PRISONS_SPAWN[getRandom(PRISONS_SPAWN.length)]; // Random jail player.teleToLocation(randomJail[0], randomJail[1], randomJail[2]); world.broadcastPacket(new ExShowScreenMessage("$s1, locked away in the prison.".replace("$s1", player.getName()), 5000)); break; @@ -220,7 +219,7 @@ public class BalokWarzone extends AbstractInstance } World.getInstance().forEachVisibleObjectInRange(npc, Player.class, 300, instPlayer -> { - if ((instPlayer == null) || (Rnd.get(100) > 2)) + if ((instPlayer == null) || (getRandom(100) > 2)) { return; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 420276fe1d..a83cffe0cf 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -196,21 +195,21 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().addBoss(_kelbimBoss); _lastAction = Chronos.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); - startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; } case "stage_all_spawn_minions": { - for (int i = 0; i < Rnd.get((_bossStage * 5) / 2, _bossStage * 5); i++) + for (int i = 0; i < getRandom((_bossStage * 5) / 2, _bossStage * 5); i++) { final Npc minion = addSpawn(KELBIM_GUARD, _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); } - for (int i = 0; i < Rnd.get((_bossStage * 2) / 2, _bossStage * 2); i++) + for (int i = 0; i < getRandom((_bossStage * 2) / 2, _bossStage * 2); i++) { - final Npc minion = addSpawn(KELBIM_GUARDIANS[Rnd.get(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); + final Npc minion = addSpawn(KELBIM_GUARDIANS[getRandom(KELBIM_GUARDIANS.length)], _kelbimBoss.getX(), _kelbimBoss.getY(), _kelbimBoss.getZ(), 0, true, 0, true, 0); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); _minions.add(minion); @@ -223,7 +222,7 @@ public class Kelbim extends AbstractNpcAI { if (_kelbimBoss.isInCombat()) { - final Skill randomAttackSkill = AREA_SKILLS[Rnd.get(AREA_SKILLS.length)]; + final Skill randomAttackSkill = AREA_SKILLS[getRandom(AREA_SKILLS.length)]; final List skillNpcs = new ArrayList<>(); for (Player pl : ZONE.getPlayersInside()) { @@ -231,7 +230,7 @@ public class Kelbim extends AbstractNpcAI { continue; } - if (Rnd.get(100) > 40) + if (getRandom(100) > 40) { final Npc skillMob = addSpawn(KELBIM_SHOUT, pl.getX(), pl.getY(), pl.getZ() + 10, 0, true, 60000, false, 0); skillNpcs.add(skillMob); @@ -247,7 +246,7 @@ public class Kelbim extends AbstractNpcAI skillNpc.doCast(randomAttackSkill); } } - startQuestTimer("stage_all_random_area_attack", Rnd.get(1, 2) * 60000, null, null); + startQuestTimer("stage_all_random_area_attack", getRandom(1, 2) * 60000, null, null); } break; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index f8b05abb47..6c6e11d07c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -946,8 +945,8 @@ public class Lindvior extends AbstractNpcAI int y = loc.getY(); if (radius > 0) { - x += Rnd.get(-radius, radius); - y += Rnd.get(-radius, radius); + x += getRandom(-radius, radius); + y += getRandom(-radius, radius); } for (int i = 0; i < count; i++) diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index 8c77fe2a32..b41ffbd3ec 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -22,7 +22,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -233,7 +232,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 1) && _ramona1.isInCombat()) { - Skill randomAttackSkill = RAMONA1_SKILLS[Rnd.get(RAMONA1_SKILLS.length)]; + Skill randomAttackSkill = RAMONA1_SKILLS[getRandom(RAMONA1_SKILLS.length)]; if (getRandom(100) > 20) { _ramona1.doCast(randomAttackSkill); @@ -248,7 +247,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona2 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona2.getX() + getRandom(-200, 200), _ramona2.getY() + getRandom(-200, 200), _ramona2.getZ(), _ramona2.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -262,7 +261,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 2) && _ramona2.isInCombat()) { - Skill randomAttackSkill = RAMONA2_SKILLS[Rnd.get(RAMONA2_SKILLS.length)]; + Skill randomAttackSkill = RAMONA2_SKILLS[getRandom(RAMONA2_SKILLS.length)]; if (getRandom(100) > 20) { _ramona2.doCast(randomAttackSkill); @@ -277,7 +276,7 @@ public class Ramona extends AbstractNpcAI { if (_ramona3 != null) { - final Npc minion = addSpawn(MINION_LIST[Rnd.get(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); + final Npc minion = addSpawn(MINION_LIST[getRandom(MINION_LIST.length)], _ramona3.getX() + getRandom(-200, 200), _ramona3.getY() + getRandom(-200, 200), _ramona3.getZ(), _ramona3.getHeading(), false, 600000); minion.setRunning(); ((Attackable) minion).setIsRaidMinion(true); addAttackPlayerDesire(minion, player); @@ -291,7 +290,7 @@ public class Ramona extends AbstractNpcAI { if ((_bossStage == 3) && _ramona3.isInCombat()) { - Skill randomAttackSkill = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill randomAttackSkill = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if (getRandom(100) > 20) { _ramona3.doCast(randomAttackSkill); @@ -510,7 +509,7 @@ public class Ramona extends AbstractNpcAI if ((player != null) && !player.isDead()) { - Skill skillToCast = RAMONA3_SKILLS[Rnd.get(RAMONA3_SKILLS.length)]; + Skill skillToCast = RAMONA3_SKILLS[getRandom(RAMONA3_SKILLS.length)]; if ((skillToCast != null) && SkillCaster.checkUseConditions(npc, skillToCast)) { diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 4103b15b4c..70b00e60a6 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -626,7 +625,7 @@ public class Trasken extends AbstractNpcAI _tieTrasken.getSpawn().stopRespawn(); _tieTrasken.decayMe(); - final int[] spawn = TAIL_RANDOM_SPAWN[Rnd.get(TAIL_RANDOM_SPAWN.length)]; + final int[] spawn = TAIL_RANDOM_SPAWN[getRandom(TAIL_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TAIL_TRASKEN) == null) { ThreadPool.schedule(() -> @@ -647,7 +646,7 @@ public class Trasken extends AbstractNpcAI _trasken.getSpawn().stopRespawn(); _trasken.decayMe(); - final int[] spawn1 = TRASKEN_RANDOM_SPAWN[Rnd.get(TRASKEN_RANDOM_SPAWN.length)]; + final int[] spawn1 = TRASKEN_RANDOM_SPAWN[getRandom(TRASKEN_RANDOM_SPAWN.length)]; if (SpawnTable.getInstance().getSpawns(TRASKEN) == null) { ThreadPool.schedule(() -> diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java index 1fa5605502..cf6a83780b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java @@ -23,7 +23,6 @@ import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -292,7 +291,7 @@ public class AetherDrops extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if ((killer.getLevel() >= PLAYER_LEVEL) && (Rnd.get(100) < CHANCE)) + if ((killer.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) { final int count = killer.getVariables().getInt(AETHER_DROP_COUNT_VAR, 0); if (count < DROP_DAILY) diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java index adc26ebe67..28863a4c9b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -163,8 +162,8 @@ public final class GreedyTreasureChests extends AbstractNpcAI } // Misc private static final int TREASURE_CHEST_CHANCE = 15; // 15% chance to spawn + private static final int RND_OFFSET = 10800000; // 3 hours = 10.800.000 milliseconds private static final long RESPAWN_DELAY = 43200000; // 12 hours = 43.200.000 milliseconds - private static final long RND_OFFSET = 10800000; // 3 hours = 10.800.000 milliseconds private GreedyTreasureChests() { @@ -215,12 +214,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SV_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SV_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SV_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SV_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SV_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SV_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_IT, npcId)) @@ -228,12 +227,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_IT_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IT_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IT_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_IT_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IT_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IT_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_TC, npcId)) @@ -241,12 +240,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_TC_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_TC_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_TC_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_TC_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_TC_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_TC_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_AI, npcId)) @@ -254,12 +253,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_AI_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_AI_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_AI_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_AI_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_AI_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_AI_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_FS, npcId)) @@ -267,12 +266,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FS_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FS_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FS_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FS_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FS_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FS_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_FM, npcId)) @@ -280,22 +279,22 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FM_1", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FM_2", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FM_3", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_3", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_3", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FM_4", 0)) { addSpawn(CHEST_LV110, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_4", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_4", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_VS, npcId)) @@ -303,12 +302,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_VS_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_VS_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_VS_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_VS_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_VS_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_VS_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_KO, npcId)) @@ -316,12 +315,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_KO_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_KO_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_KO_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_KO_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_KO_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_KO_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_FW, npcId)) @@ -329,12 +328,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FW_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FW_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FW_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FW_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FW_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FW_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_IP, npcId)) @@ -342,12 +341,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_IP_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IP_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IP_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_IP_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IP_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_IP_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_BS, npcId)) @@ -355,12 +354,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_BS_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_BS_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_BS_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_BS_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_BS_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_BS_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_SM, npcId)) @@ -368,12 +367,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SM_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SM_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SM_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SM_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SM_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SM_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_PL, npcId)) @@ -381,12 +380,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_PL_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_PL_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_PL_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_PL_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_PL_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_PL_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_FOM, npcId)) @@ -394,12 +393,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FOM_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FOM_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FOM_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FOM_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FOM_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FOM_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_SS, npcId)) @@ -407,12 +406,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SS_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SS_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SS_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SS_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SS_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_SS_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_DV, npcId)) @@ -420,12 +419,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_DV_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_DV_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_DV_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_DV_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_DV_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_DV_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_FT, npcId)) @@ -433,12 +432,12 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FT_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FT_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FT_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FT_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FT_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FT_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } else if (CommonUtil.contains(TRIGGER_MOBS_LV120_CHEST_WS, npcId)) @@ -446,17 +445,17 @@ public final class GreedyTreasureChests extends AbstractNpcAI if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_WS_1", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_1", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_1", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_WS_2", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_2", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_WS_3", 0)) { addSpawn(CHEST_LV120, npc, true, 0, true); - GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_3", Long.toString(currentTime + RESPAWN_DELAY + Rnd.get(RND_OFFSET))); + GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_WS_3", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET))); } } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index f7bad0c5a7..abd483995f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ClassId; @@ -351,7 +350,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java index fbb795f8e3..305a69de73 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java @@ -17,7 +17,6 @@ package events.DreamMaker; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -65,7 +64,7 @@ public class DreamMaker extends LongTimeEvent { if (!player.getVariables().getBoolean("DREAM_MAKER_GIFT_RECEIVED", false)) { - giveItems(player, Rnd.get(LUCKY_POUCH_GROWTH, LUCKY_POUCH_HARMONY), 1); + giveItems(player, getRandom(LUCKY_POUCH_GROWTH, LUCKY_POUCH_HARMONY), 1); player.getVariables().set("DREAM_MAKER_GIFT_RECEIVED", true); htmltext = "34590-successful.htm"; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java index f0a962a3b6..2cc4b4ae1e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java @@ -23,7 +23,6 @@ import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -287,7 +286,7 @@ public class LegendsMark extends LongTimeEvent @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (isEventPeriod() && (killer.getLevel() >= PLAYER_LEVEL) && (Rnd.get(100) < CHANCE)) + if (isEventPeriod() && (killer.getLevel() >= PLAYER_LEVEL) && (getRandom(100) < CHANCE)) { final int count = killer.getVariables().getInt(PROPHECY_FRAGMENTS_DROP_COUNT_VAR, 0); if (count < DROP_DAILY) diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 1caed4e648..3e248828bb 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -724,16 +723,16 @@ public class CeremonyOfChaos extends AbstractNpcAI msg.addString(winner.getName()); // Rewards according to https://l2wiki.com/Ceremony_of_Chaos - final int marksRewarded = Rnd.get(2, 5); // Guessed - final int boxs = Rnd.get(1, 5); + final int marksRewarded = getRandom(2, 5); // Guessed + final int boxs = getRandom(1, 5); winner.addItem("CoC-Winner", 45584, marksRewarded, winner, true); // Mark of battle winner.addItem("CoC-Winner", 36333, boxs, winner, true); // Mysterious Box // Possible additional rewards // Improved Life Stone - if (Rnd.get(10) < 3) // Chance to get reward (30%) + if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(4)) + switch (getRandom(4)) { case 0: { @@ -758,9 +757,9 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Soul Crystal Fragment - else if (Rnd.get(10) < 3) // Chance to get reward (30%) + else if (getRandom(10) < 3) // Chance to get reward (30%) { - switch (Rnd.get(6)) + switch (getRandom(6)) { case 0: { @@ -795,7 +794,7 @@ public class CeremonyOfChaos extends AbstractNpcAI } } // Mysterious Belt - else if (Rnd.get(10) < 1) // Chance to get reward (10%) + else if (getRandom(10) < 1) // Chance to get reward (10%) { winner.addItem("CoC-Winner", 35565, 1, winner, true); // Mysterious Belt } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java index 01442b6c2f..09835042af 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java @@ -16,7 +16,6 @@ */ package ai.areas.HotSprings; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; @@ -56,12 +55,12 @@ public class HotSprings extends Quest @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) { - if (Rnd.get(100) < DISEASE_CHANCE) + if (getRandom(100) < DISEASE_CHANCE) { tryToInfect(npc, attacker, MALARIA); } - if (Rnd.get(100) < DISEASE_CHANCE) + if (getRandom(100) < DISEASE_CHANCE) { switch (npc.getNpcId()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java index d98e89d0bc..d9d857e0db 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -510,7 +509,7 @@ public class Antharas extends Quest // Move at random. if (FWA_MOVEATRANDOM) { - final Location pos = new Location(Rnd.get(175000, 178500), Rnd.get(112400, 116000), -7707, 0); + final Location pos = new Location(getRandom(175000, 178500), getRandom(112400, 116000), -7707, 0); _moveAtRandomTask = ThreadPool.schedule(new MoveAtRandom(_antharas, pos), 500); } if (_socialTask != null) @@ -549,7 +548,7 @@ public class Antharas extends Quest { NpcTemplate template1; Spawn tempSpawn; - final boolean isBehemoth = Rnd.get(100) < FWA_PERCENTOFBEHEMOTH; + final boolean isBehemoth = getRandom(100) < FWA_PERCENTOFBEHEMOTH; try { final int mobNumber = (isBehemoth ? 2 : 3); @@ -567,7 +566,7 @@ public class Antharas extends Quest } else { - npcId = Rnd.get(29070, 29076); + npcId = getRandom(29070, 29076); } template1 = NpcTable.getInstance().getTemplate(npcId); tempSpawn = new Spawn(template1); @@ -579,8 +578,8 @@ public class Antharas extends Quest int dt = ((_antharas.getX() - x) * (_antharas.getX() - x)) + ((_antharas.getY() - y) * (_antharas.getY() - y)); while ((tried++ < 25) && notFound) { - final int rx = Rnd.get(175000, 179900); - final int ry = Rnd.get(112400, 116000); + final int rx = getRandom(175000, 179900); + final int ry = getRandom(112400, 116000); final int rdt = ((_antharas.getX() - rx) * (_antharas.getX() - rx)) + ((_antharas.getY() - ry) * (_antharas.getY() - ry)); final Location randomLocation = new Location(rx, ry, -7704); if (GeoEngine.getInstance().canSeeLocation(_antharas, randomLocation) && (rdt < dt)) @@ -915,7 +914,7 @@ public class Antharas extends Quest npc.broadcastPacket(new PlaySound(1, "BS01_D", npc)); _cubeSpawnTask = ThreadPool.schedule(new CubeSpawn(0), 10000); GrandBossManager.getInstance().setBossStatus(npc.getNpcId(), DEAD); - final long respawnTime = (Config.ANTHARAS_RESP_FIRST + Rnd.get(Config.ANTHARAS_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.ANTHARAS_RESP_FIRST + getRandom(Config.ANTHARAS_RESP_SECOND)) * 3600000; ThreadPool.schedule(new UnlockAntharas(npc.getNpcId()), respawnTime); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(npc.getNpcId()); @@ -924,8 +923,8 @@ public class Antharas extends Quest } else if (npc.getNpcId() == 29069) { - final int hpHerbCount = Rnd.get(6, 18); - final int mpHerbCount = Rnd.get(6, 18); + final int hpHerbCount = getRandom(6, 18); + final int mpHerbCount = getRandom(6, 18); for (int i = 0; i < hpHerbCount; i++) { ((Monster) npc).dropItem(killer, 8602, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java index 752e155bac..ec7defc852 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -403,7 +402,7 @@ public class Baium extends Quest // Spawn the "Teleportation Cubic" for 15 minutes (to allow players to exit the lair). addSpawn(29055, 115203, 16620, 10078, 0, false, 900000); // Should we teleport everyone out if the cubic despawns?? // Lock baium for 5 days and 1 to 8 hours [i.e. 432,000,000 + 1*3,600,000 + random-less-than(8*3,600,000) millisecs] - final long respawnTime = (Config.BAIUM_RESP_FIRST + Rnd.get(Config.BAIUM_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.BAIUM_RESP_FIRST + getRandom(Config.BAIUM_RESP_SECOND)) * 3600000; GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, DEAD); startQuestTimer("baium_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. @@ -535,11 +534,11 @@ public class Baium extends Quest int skill; if (npc.getCurrentHp() > ((npc.getMaxHp() * 3) / 4.0)) { - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { skill = 4128; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4129; } @@ -550,15 +549,15 @@ public class Baium extends Quest } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 2) / 4.0)) { - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { skill = 4131; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4128; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4129; } @@ -569,19 +568,19 @@ public class Baium extends Quest } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 1) / 4.0)) { - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { skill = 4130; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4131; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4128; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4129; } @@ -590,19 +589,19 @@ public class Baium extends Quest skill = 4127; } } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4130; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4131; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4128; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4129; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java index 7ea377be3c..e5c40db9a3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; @@ -154,7 +153,7 @@ public class Core extends Quest for (Entry spawn : MINNION_SPAWNS.entrySet()) { spawnLocation = spawn.getValue(); - mob = (Attackable) addSpawn(spawn.getKey(), spawnLocation.getX(), spawnLocation.getY(), spawnLocation.getZ(), Rnd.get(61794), false, 0); + mob = (Attackable) addSpawn(spawn.getKey(), spawnLocation.getX(), spawnLocation.getY(), spawnLocation.getZ(), getRandom(61794), false, 0); _minions.add(mob); } } @@ -202,7 +201,7 @@ public class Core extends Quest { if (_firstAttacked) { - if (Rnd.get(100) == 0) + if (getRandom(100) == 0) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Removing intruders.")); } @@ -233,7 +232,7 @@ public class Core extends Quest addSpawn(31842, 18948, 110166, -6397, 0, false, 900000); GrandBossManager.getInstance().setBossStatus(CORE, DEAD); // Calculate Min and Max respawn times randomly. - final long respawnTime = (Config.CORE_RESP_FIRST + Rnd.get(Config.CORE_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.CORE_RESP_FIRST + getRandom(Config.CORE_RESP_SECOND)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java index 477a0cfb4f..9f74b7a401 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java @@ -18,7 +18,6 @@ package ai.bosses; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -208,7 +207,7 @@ public class Orfen extends Quest npc.teleToLocation(43577, 15985, -4396); startQuestTimer("ORFEN_REFRESH", 10000, npc, null); } - else if (npc.isInsideRadius2D(attacker, 1000) && !npc.isInsideRadius2D(attacker, 300) && (Rnd.get(10) == 0)) + else if (npc.isInsideRadius2D(attacker, 1000) && !npc.isInsideRadius2D(attacker, 300) && (getRandom(10) == 0)) { attacker.teleToLocation(npc.getX(), npc.getY(), npc.getZ()); npc.setTarget(attacker); @@ -231,7 +230,7 @@ public class Orfen extends Quest npc.broadcastPacket(new PlaySound(1, "BS02_D", npc)); GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD); // Time is 48hour +/- 20hour. - final long respawnTime = (Config.ORFEN_RESP_FIRST + Rnd.get(Config.ORFEN_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.ORFEN_RESP_FIRST + getRandom(Config.ORFEN_RESP_SECOND)) * 3600000; cancelQuestTimer("ORFEN_REFRESH", npc, null); startQuestTimer("ORFEN_SPAWN", respawnTime, null, null); // Also save the respawn time so that the info is maintained past restarts. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java index 2b8345026a..dfa3a34e80 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java @@ -21,7 +21,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -150,7 +149,7 @@ public class QueenAnt extends Quest startQuestTimer("CHECK_MINIONS_ZONE", 30000, npc, null, true); startQuestTimer("HEAL", 1000, null, null, true); _queen = npc; - _larva = (Monster) addSpawn(LARVA, -21600, 179482, -5846, Rnd.get(360), false, 0); + _larva = (Monster) addSpawn(LARVA, -21600, 179482, -5846, getRandom(360), false, 0); _larva.setUnkillable(true); _larva.setImmobilized(true); _larva.setPhysicalAttackMuted(true); @@ -265,9 +264,9 @@ public class QueenAnt extends Quest } case ACTION: { - if (Rnd.get(3) == 0) + if (getRandom(3) == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { npc.broadcastPacket(new SocialAction(npc.getObjectId(), 3)); } @@ -359,7 +358,7 @@ public class QueenAnt extends Quest npc.broadcastPacket(new PlaySound(1, "BS02_D", npc)); GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD); // Time is 36hour +/- 17hour. - final long respawnTime = (Config.QA_RESP_FIRST + Rnd.get(Config.QA_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.QA_RESP_FIRST + getRandom(Config.QA_RESP_SECOND)) * 3600000; startQuestTimer("QUEEN_SPAWN", respawnTime, null, null); startQuestTimer("LARVA_DESPAWN", 4 * 60 * 60 * 1000, null, null); cancelQuestTimer("ACTION", npc, null); @@ -388,7 +387,7 @@ public class QueenAnt extends Quest if (npcId == ROYAL) { - startQuestTimer("RESPAWN_ROYAL", (Config.QA_RESP_ROYAL + Rnd.get(40)) * 1000, npc, null); + startQuestTimer("RESPAWN_ROYAL", (Config.QA_RESP_ROYAL + getRandom(40)) * 1000, npc, null); } else // if (npcId == NURSE) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java index c1a034820d..8abf66d71a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -426,21 +425,21 @@ public class Valakas extends Quest { if (((damage * 1000) + 1000) > i_quest2) { - i_quest2 = ((damage * 1000) + Rnd.get(3000)); + i_quest2 = ((damage * 1000) + getRandom(3000)); } } else if (attacker == c_quest3) { if (((damage * 1000) + 1000) > i_quest3) { - i_quest3 = ((damage * 1000) + Rnd.get(3000)); + i_quest3 = ((damage * 1000) + getRandom(3000)); } } else if (attacker == c_quest4) { if (((damage * 1000) + 1000) > i_quest4) { - i_quest4 = ((damage * 1000) + Rnd.get(3000)); + i_quest4 = ((damage * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -449,7 +448,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -470,7 +469,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -492,7 +491,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -508,17 +507,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = (damage * 1000) + Rnd.get(3000); + i_quest2 = (damage * 1000) + getRandom(3000); c_quest2 = attacker; } else if (i1 == 3) { - i_quest3 = (damage * 1000) + Rnd.get(3000); + i_quest3 = (damage * 1000) + getRandom(3000); c_quest3 = attacker; } else if (i1 == 4) { - i_quest4 = (damage * 1000) + Rnd.get(3000); + i_quest4 = (damage * 1000) + getRandom(3000); c_quest4 = attacker; } @@ -530,7 +529,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -552,7 +551,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -568,17 +567,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = (((damage / 150) * 1000) + Rnd.get(3000)); + i_quest2 = (((damage / 150) * 1000) + getRandom(3000)); c_quest2 = attacker; } else if (i1 == 3) { - i_quest3 = (((damage / 150) * 1000) + Rnd.get(3000)); + i_quest3 = (((damage / 150) * 1000) + getRandom(3000)); c_quest3 = attacker; } else if (i1 == 4) { - i_quest4 = (((damage / 150) * 1000) + Rnd.get(3000)); + i_quest4 = (((damage / 150) * 1000) + getRandom(3000)); c_quest4 = attacker; } getRandomSkill(npc); @@ -592,7 +591,7 @@ public class Valakas extends Quest npc.broadcastPacket(new PlaySound(1, "B03_D", npc)); startQuestTimer("1111", 500, npc, null); GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD); - final long respawnTime = (Config.VALAKAS_RESP_FIRST + Rnd.get(Config.VALAKAS_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.VALAKAS_RESP_FIRST + getRandom(Config.VALAKAS_RESP_SECOND)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); @@ -660,7 +659,7 @@ public class Valakas extends Quest } if (i2 > 0) { - if (Rnd.get(100) < 70) + if (getRandom(100) < 70) { if (i1 == 2) { @@ -686,28 +685,28 @@ public class Valakas extends Quest } if (c2.getZ() < (npc.getZ() + 200)) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 15) + else if (getRandom(100) < 15) { skill = SkillTable.getInstance().getSkill(4689, 1); } - else if ((Rnd.get(100) < 15) && (i0 == 1) && (i_quest0 == 1)) + else if ((getRandom(100) < 15) && (i0 == 1) && (i_quest0 == 1)) { skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } - else if ((Rnd.get(100) < 10) && (i1 == 1)) + else if ((getRandom(100) < 10) && (i1 == 1)) { skill = SkillTable.getInstance().getSkill(4688, 1); } - else if (Rnd.get(100) < 35) + else if (getRandom(100) < 35) { skill = SkillTable.getInstance().getSkill(4683, 1); } - else if (Rnd.nextBoolean()) + else if (getRandomBoolean()) { skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } @@ -716,11 +715,11 @@ public class Valakas extends Quest skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } - else if (Rnd.get(100) < 20) + else if (getRandom(100) < 20) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 15) + else if (getRandom(100) < 15) { skill = SkillTable.getInstance().getSkill(4689, 1); } @@ -740,28 +739,28 @@ public class Valakas extends Quest } if (c2.getZ() < (npc.getZ() + 200)) { - if (Rnd.get(100) < 5) + if (getRandom(100) < 5) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = SkillTable.getInstance().getSkill(4689, 1); } - else if ((Rnd.get(100) < 10) && (i0 == 1) && (i_quest0 == 1)) + else if ((getRandom(100) < 10) && (i0 == 1) && (i_quest0 == 1)) { skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } - else if ((Rnd.get(100) < 10) && (i1 == 1)) + else if ((getRandom(100) < 10) && (i1 == 1)) { skill = SkillTable.getInstance().getSkill(4688, 1); } - else if (Rnd.get(100) < 20) + else if (getRandom(100) < 20) { skill = SkillTable.getInstance().getSkill(4683, 1); } - else if (Rnd.nextBoolean()) + else if (getRandomBoolean()) { skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } @@ -770,11 +769,11 @@ public class Valakas extends Quest skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } - else if (Rnd.get(100) < 5) + else if (getRandom(100) < 5) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = SkillTable.getInstance().getSkill(4689, 1); } @@ -794,28 +793,28 @@ public class Valakas extends Quest } if (c2.getZ() < (npc.getZ() + 200)) { - if (Rnd.get(100) < 0) + if (getRandom(100) < 0) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 5) + else if (getRandom(100) < 5) { skill = SkillTable.getInstance().getSkill(4689, 1); } - else if ((Rnd.get(100) < 5) && (i0 == 1) && (i_quest0 == 1)) + else if ((getRandom(100) < 5) && (i0 == 1) && (i_quest0 == 1)) { skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } - else if ((Rnd.get(100) < 10) && (i1 == 1)) + else if ((getRandom(100) < 10) && (i1 == 1)) { skill = SkillTable.getInstance().getSkill(4688, 1); } - else if (Rnd.get(100) < 15) + else if (getRandom(100) < 15) { skill = SkillTable.getInstance().getSkill(4683, 1); } - else if (Rnd.nextBoolean()) + else if (getRandomBoolean()) { skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } @@ -824,11 +823,11 @@ public class Valakas extends Quest skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } - else if (Rnd.get(100) < 0) + else if (getRandom(100) < 0) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 5) + else if (getRandom(100) < 5) { skill = SkillTable.getInstance().getSkill(4689, 1); } @@ -848,28 +847,28 @@ public class Valakas extends Quest } if (c2.getZ() < (npc.getZ() + 200)) { - if (Rnd.get(100) < 0) + if (getRandom(100) < 0) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = SkillTable.getInstance().getSkill(4689, 1); } - else if ((Rnd.get(100) < 5) && (i0 == 1) && (i_quest0 == 1)) + else if ((getRandom(100) < 5) && (i0 == 1) && (i_quest0 == 1)) { skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } - else if ((Rnd.get(100) < 10) && (i1 == 1)) + else if ((getRandom(100) < 10) && (i1 == 1)) { skill = SkillTable.getInstance().getSkill(4688, 1); } - else if (Rnd.get(100) < 15) + else if (getRandom(100) < 15) { skill = SkillTable.getInstance().getSkill(4683, 1); } - else if (Rnd.nextBoolean()) + else if (getRandomBoolean()) { skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } @@ -878,11 +877,11 @@ public class Valakas extends Quest skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } - else if (Rnd.get(100) < 0) + else if (getRandom(100) < 0) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = SkillTable.getInstance().getSkill(4689, 1); } @@ -974,7 +973,7 @@ public class Valakas extends Quest } if (!result.isEmpty()) { - return result.get(Rnd.get(result.size())); + return result.get(getRandom(result.size())); } return null; } @@ -1007,21 +1006,21 @@ public class Valakas extends Quest { if (((10 * 1000) + 1000) > i_quest2) { - i_quest2 = ((10 * 1000) + Rnd.get(3000)); + i_quest2 = ((10 * 1000) + getRandom(3000)); } } else if (player == c_quest3) { if (((10 * 1000) + 1000) > i_quest3) { - i_quest3 = ((10 * 1000) + Rnd.get(3000)); + i_quest3 = ((10 * 1000) + getRandom(3000)); } } else if (player == c_quest4) { if (((10 * 1000) + 1000) > i_quest4) { - i_quest4 = ((10 * 1000) + Rnd.get(3000)); + i_quest4 = ((10 * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -1030,7 +1029,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1051,7 +1050,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1073,7 +1072,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -1089,17 +1088,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = ((10 * 1000) + Rnd.get(3000)); + i_quest2 = ((10 * 1000) + getRandom(3000)); c_quest2 = player; } else if (i1 == 3) { - i_quest3 = ((10 * 1000) + Rnd.get(3000)); + i_quest3 = ((10 * 1000) + getRandom(3000)); c_quest3 = player; } else if (i1 == 4) { - i_quest4 = ((10 * 1000) + Rnd.get(3000)); + i_quest4 = ((10 * 1000) + getRandom(3000)); c_quest4 = player; } } @@ -1109,21 +1108,21 @@ public class Valakas extends Quest { if (((6 * 1000) + 1000) > i_quest2) { - i_quest2 = ((6 * 1000) + Rnd.get(3000)); + i_quest2 = ((6 * 1000) + getRandom(3000)); } } else if (player == c_quest3) { if (((6 * 1000) + 1000) > i_quest3) { - i_quest3 = ((6 * 1000) + Rnd.get(3000)); + i_quest3 = ((6 * 1000) + getRandom(3000)); } } else if (player == c_quest4) { if (((6 * 1000) + 1000) > i_quest4) { - i_quest4 = ((6 * 1000) + Rnd.get(3000)); + i_quest4 = ((6 * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -1132,7 +1131,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1153,7 +1152,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1175,7 +1174,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -1191,17 +1190,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = ((6 * 1000) + Rnd.get(3000)); + i_quest2 = ((6 * 1000) + getRandom(3000)); c_quest2 = player; } else if (i1 == 3) { - i_quest3 = ((6 * 1000) + Rnd.get(3000)); + i_quest3 = ((6 * 1000) + getRandom(3000)); c_quest3 = player; } else if (i1 == 4) { - i_quest4 = ((6 * 1000) + Rnd.get(3000)); + i_quest4 = ((6 * 1000) + getRandom(3000)); c_quest4 = player; } } @@ -1211,21 +1210,21 @@ public class Valakas extends Quest { if (((3 * 1000) + 1000) > i_quest2) { - i_quest2 = ((3 * 1000) + Rnd.get(3000)); + i_quest2 = ((3 * 1000) + getRandom(3000)); } } else if (player == c_quest3) { if (((3 * 1000) + 1000) > i_quest3) { - i_quest3 = ((3 * 1000) + Rnd.get(3000)); + i_quest3 = ((3 * 1000) + getRandom(3000)); } } else if (player == c_quest4) { if (((3 * 1000) + 1000) > i_quest4) { - i_quest4 = ((3 * 1000) + Rnd.get(3000)); + i_quest4 = ((3 * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -1234,7 +1233,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1255,7 +1254,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1277,7 +1276,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -1293,17 +1292,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = ((3 * 1000) + Rnd.get(3000)); + i_quest2 = ((3 * 1000) + getRandom(3000)); c_quest2 = player; } else if (i1 == 3) { - i_quest3 = ((3 * 1000) + Rnd.get(3000)); + i_quest3 = ((3 * 1000) + getRandom(3000)); c_quest3 = player; } else if (i1 == 4) { - i_quest4 = ((3 * 1000) + Rnd.get(3000)); + i_quest4 = ((3 * 1000) + getRandom(3000)); c_quest4 = player; } } @@ -1311,21 +1310,21 @@ public class Valakas extends Quest { if (((2 * 1000) + 1000) > i_quest2) { - i_quest2 = ((2 * 1000) + Rnd.get(3000)); + i_quest2 = ((2 * 1000) + getRandom(3000)); } } else if (player == c_quest3) { if (((2 * 1000) + 1000) > i_quest3) { - i_quest3 = ((2 * 1000) + Rnd.get(3000)); + i_quest3 = ((2 * 1000) + getRandom(3000)); } } else if (player == c_quest4) { if (((2 * 1000) + 1000) > i_quest4) { - i_quest4 = ((2 * 1000) + Rnd.get(3000)); + i_quest4 = ((2 * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -1334,7 +1333,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1355,7 +1354,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1377,7 +1376,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -1393,17 +1392,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = ((2 * 1000) + Rnd.get(3000)); + i_quest2 = ((2 * 1000) + getRandom(3000)); c_quest2 = player; } else if (i1 == 3) { - i_quest3 = ((2 * 1000) + Rnd.get(3000)); + i_quest3 = ((2 * 1000) + getRandom(3000)); c_quest3 = player; } else if (i1 == 4) { - i_quest4 = ((2 * 1000) + Rnd.get(3000)); + i_quest4 = ((2 * 1000) + getRandom(3000)); c_quest4 = player; } } @@ -1411,21 +1410,21 @@ public class Valakas extends Quest { if (((1 * 1000) + 1000) > i_quest2) { - i_quest2 = ((1 * 1000) + Rnd.get(3000)); + i_quest2 = ((1 * 1000) + getRandom(3000)); } } else if (player == c_quest3) { if (((1 * 1000) + 1000) > i_quest3) { - i_quest3 = ((1 * 1000) + Rnd.get(3000)); + i_quest3 = ((1 * 1000) + getRandom(3000)); } } else if (player == c_quest4) { if (((1 * 1000) + 1000) > i_quest4) { - i_quest4 = ((1 * 1000) + Rnd.get(3000)); + i_quest4 = ((1 * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -1434,7 +1433,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1455,7 +1454,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1477,7 +1476,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -1493,17 +1492,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = ((1 * 1000) + Rnd.get(3000)); + i_quest2 = ((1 * 1000) + getRandom(3000)); c_quest2 = player; } else if (i1 == 3) { - i_quest3 = ((1 * 1000) + Rnd.get(3000)); + i_quest3 = ((1 * 1000) + getRandom(3000)); c_quest3 = player; } else if (i1 == 4) { - i_quest4 = ((1 * 1000) + Rnd.get(3000)); + i_quest4 = ((1 * 1000) + getRandom(3000)); c_quest4 = player; } if (status == FIGHTING) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java index c713ee5cf3..d9984c5ddf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -355,16 +354,16 @@ public class Zaken extends Quest if (i1 == 1) { _quest0 = 0; - final int i2 = Rnd.get(15); - _ai1 = X_COORDS[i2] + Rnd.get(650); - _ai2 = Y_COORDS[i2] + Rnd.get(650); + final int i2 = getRandom(15); + _ai1 = X_COORDS[i2] + getRandom(650); + _ai2 = Y_COORDS[i2] + getRandom(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); } } } - if ((Rnd.get(20) < 1) && (_ai0 == 0)) + if ((getRandom(20) < 1) && (_ai0 == 0)) { _ai1 = npc.getX(); _ai2 = npc.getY(); @@ -417,11 +416,11 @@ public class Zaken extends Quest npc.setTarget(npc); npc.doCast(SkillTable.getInstance().getSkill(4242, 1)); } - if (Rnd.get(40) < 1) + if (getRandom(40) < 1) { - final int i2 = Rnd.get(15); - _ai1 = X_COORDS[i2] + Rnd.get(650); - _ai2 = Y_COORDS[i2] + Rnd.get(650); + final int i2 = getRandom(15); + _ai1 = X_COORDS[i2] + getRandom(650); + _ai2 = Y_COORDS[i2] + getRandom(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); @@ -442,132 +441,132 @@ public class Zaken extends Quest { case 1: { - final int rr = Rnd.get(15); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, X_COORDS[rr] + Rnd.get(650), Y_COORDS[rr] + Rnd.get(650), Z_COORDS[rr], Rnd.get(65536), false, 0); + final int rr = getRandom(15); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, X_COORDS[rr] + getRandom(650), Y_COORDS[rr] + getRandom(650), Z_COORDS[rr], getRandom(65536), false, 0); _ai4 = 2; break; } case 2: { - final int rr = Rnd.get(15); - addSpawn(DOLL_BLADER_B, X_COORDS[rr] + Rnd.get(650), Y_COORDS[rr] + Rnd.get(650), Z_COORDS[rr], Rnd.get(65536), false, 0); + final int rr = getRandom(15); + addSpawn(DOLL_BLADER_B, X_COORDS[rr] + getRandom(650), Y_COORDS[rr] + getRandom(650), Z_COORDS[rr], getRandom(65536), false, 0); _ai4 = 3; break; } case 3: { - addSpawn(VALE_MASTER_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); + addSpawn(VALE_MASTER_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); _ai4 = 4; break; } case 4: { - addSpawn(PIRATES_ZOMBIE_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); _ai4 = 5; break; } case 5: { - addSpawn(DOLL_BLADER_B, 52675, 219371, -3290, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 52687, 219596, -3368, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 52672, 219740, -3418, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 52857, 219992, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 52959, 219997, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 53381, 220151, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 56276, 220783, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 57173, 220234, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56294, 219482, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56364, 218967, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 57113, 218079, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56186, 217153, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54226, 218797, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54394, 219067, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 54262, 219480, -3488, Rnd.get(65536), false, 0); + addSpawn(DOLL_BLADER_B, 52675, 219371, -3290, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 52687, 219596, -3368, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 52672, 219740, -3418, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 52857, 219992, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 52959, 219997, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 53381, 220151, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 56276, 220783, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 57173, 220234, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56294, 219482, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56364, 218967, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 57113, 218079, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56186, 217153, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54226, 218797, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54394, 219067, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 54262, 219480, -3488, getRandom(65536), false, 0); _ai4 = 6; break; } case 6: { - addSpawn(PIRATES_ZOMBIE_B, 53412, 218077, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54413, 217132, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 54841, 217132, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 55372, 217128, -3343, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 55893, 217122, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56282, 217237, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 56963, 218080, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -3216, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56294, 219482, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -3216, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56364, 218967, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 56276, 220783, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 57173, 220234, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54464, 219095, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54226, 218797, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54394, 219067, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -3216, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 54262, 219480, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -3216, Rnd.get(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 53412, 218077, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54413, 217132, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 54841, 217132, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 55372, 217128, -3343, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 55893, 217122, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56282, 217237, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 56963, 218080, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -3216, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56294, 219482, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -3216, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56364, 218967, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 56276, 220783, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 57173, 220234, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54464, 219095, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54226, 218797, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54394, 219067, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -3216, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 54262, 219480, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -3216, getRandom(65536), false, 0); _ai4 = 7; break; } case 7: { - addSpawn(PIRATES_ZOMBIE_B, 54228, 217504, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54181, 217168, -3216, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 54714, 217123, -3168, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 55298, 217127, -3073, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 55787, 217130, -2993, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56284, 217216, -2944, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 56963, 218080, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -2944, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56294, 219482, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -2944, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56364, 218967, -2944, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 56276, 220783, -2944, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 57173, 220234, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54464, 219095, -2944, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54226, 218797, -2944, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54394, 219067, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -2944, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 54262, 219480, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54280, 217200, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -2944, Rnd.get(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54228, 217504, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54181, 217168, -3216, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 54714, 217123, -3168, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 55298, 217127, -3073, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 55787, 217130, -2993, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56284, 217216, -2944, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 56963, 218080, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -2944, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56294, 219482, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -2944, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56364, 218967, -2944, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 56276, 220783, -2944, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 57173, 220234, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54464, 219095, -2944, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54226, 218797, -2944, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54394, 219067, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -2944, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 54262, 219480, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54280, 217200, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -2944, getRandom(65536), false, 0); _ai4 = 8; cancelQuestTimer("1003", null, null); break; @@ -607,7 +606,7 @@ public class Zaken extends Quest if ((getTimeHour() < 5) && (callerId != ZAKEN) && (npcId == ZAKEN)) { final int damage = 0; - if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) && (_ai0 == 0) && (damage < 10) && (Rnd.get((30 * 15)) < 1))// todo - damage missing + if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) && (_ai0 == 0) && (damage < 10) && (getRandom((30 * 15)) < 1))// todo - damage missing { _ai0 = 1; _ai1 = caller.getX(); @@ -632,8 +631,8 @@ public class Zaken extends Quest } else if (skillId == 4216) { - final int i1 = Rnd.get(15); - player.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + final int i1 = getRandom(15); + player.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(player); final Creature nextTarget = ((Attackable) npc).getMostHated(); if (nextTarget != null) @@ -644,8 +643,8 @@ public class Zaken extends Quest else if (skillId == 4217) { int i0 = 0; - int i1 = Rnd.get(15); - player.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + int i1 = getRandom(15); + player.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(player); if ((c_quest0 != null) && (_quest0 > 0) && (c_quest0 != player) && (c_quest0.getZ() > (player.getZ() - 100)) && (c_quest0.getZ() < (player.getZ() + 100))) { @@ -659,8 +658,8 @@ public class Zaken extends Quest } if (i0 == 0) { - i1 = Rnd.get(15); - c_quest0.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + i1 = getRandom(15); + c_quest0.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(c_quest0); } } @@ -676,8 +675,8 @@ public class Zaken extends Quest } if (i0 == 0) { - i1 = Rnd.get(15); - c_quest1.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + i1 = getRandom(15); + c_quest1.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(c_quest1); } } @@ -693,8 +692,8 @@ public class Zaken extends Quest } if (i0 == 0) { - i1 = Rnd.get(15); - c_quest2.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + i1 = getRandom(15); + c_quest2.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(c_quest2); } } @@ -710,8 +709,8 @@ public class Zaken extends Quest } if (i0 == 0) { - i1 = Rnd.get(15); - c_quest3.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + i1 = getRandom(15); + c_quest3.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(c_quest3); } } @@ -727,8 +726,8 @@ public class Zaken extends Quest } if (i0 == 0) { - i1 = Rnd.get(15); - c_quest4.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + i1 = getRandom(15); + c_quest4.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(c_quest4); } } @@ -767,9 +766,9 @@ public class Zaken extends Quest final Creature originalAttacker = isPet ? attacker.getPet() : attacker; final int hate = (int) (((damage / npc.getMaxHp()) / 0.05) * 20000); ((Attackable) npc).addDamageHate(originalAttacker, 0, hate); - if (Rnd.get(10) < 1) + if (getRandom(10) < 1) { - final int i0 = Rnd.get((15 * 15)); + final int i0 = getRandom((15 * 15)); if (i0 < 1) { npc.setTarget(attacker); @@ -805,7 +804,7 @@ public class Zaken extends Quest } } } - if (Rnd.nextBoolean() && (attacker == ((Attackable) npc).getMostHated())) + if (getRandomBoolean() && (attacker == ((Attackable) npc).getMostHated())) { npc.setTarget(attacker); npc.doCast(SkillTable.getInstance().getSkill(4220, 1)); @@ -814,9 +813,9 @@ public class Zaken extends Quest if ((getTimeHour() >= 5) && (npc.getCurrentHp() < ((npc.getMaxHp() * _quest2) / 4.0))) { _quest2 = (_quest2 - 1); - final int i2 = Rnd.get(15); - _ai1 = X_COORDS[i2] + Rnd.get(650); - _ai2 = Y_COORDS[i2] + Rnd.get(650); + final int i2 = getRandom(15); + _ai1 = X_COORDS[i2] + getRandom(650); + _ai2 = Y_COORDS[i2] + getRandom(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); @@ -835,7 +834,7 @@ public class Zaken extends Quest npc.broadcastPacket(new PlaySound(1, "BS02_D", npc)); GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD); // Time is 36hour +/- 17hour. - final long respawnTime = (Config.ZAKEN_RESP_FIRST + Rnd.get(Config.ZAKEN_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.ZAKEN_RESP_FIRST + getRandom(Config.ZAKEN_RESP_SECOND)) * 3600000; startQuestTimer("zaken_unlock", respawnTime, null, null); cancelQuestTimer("1001", npc, null); cancelQuestTimer("1003", npc, null); @@ -846,7 +845,7 @@ public class Zaken extends Quest } else if (status == ALIVE) { - startQuestTimer("CreateOnePrivateEx", ((30 + Rnd.get(60)) * 1000), npc, null); + startQuestTimer("CreateOnePrivateEx", ((30 + getRandom(60)) * 1000), npc, null); } return super.onKill(npc, killer, isPet); } @@ -864,7 +863,7 @@ public class Zaken extends Quest } if ((player.getZ() > (npc.getZ() - 100)) && (player.getZ() < (npc.getZ() + 100))) { - if ((_quest0 < 5) && (Rnd.get(3) < 1)) + if ((_quest0 < 5) && (getRandom(3) < 1)) { if (_quest0 == 0) { @@ -888,9 +887,9 @@ public class Zaken extends Quest } _quest0++; } - if (Rnd.get(15) < 1) + if (getRandom(15) < 1) { - final int i0 = Rnd.get((15 * 15)); + final int i0 = getRandom((15 * 15)); if (i0 < 1) { npc.setTarget(player); @@ -926,7 +925,7 @@ public class Zaken extends Quest } } } - if (Rnd.nextBoolean() && (player == ((Attackable) npc).getMostHated())) + if (getRandomBoolean() && (player == ((Attackable) npc).getMostHated())) { npc.setTarget(player); npc.doCast(SkillTable.getInstance().getSkill(4220, 1)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/CatsEyeBandit.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/CatsEyeBandit.java index 9100173f0b..01e17c7499 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/CatsEyeBandit.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/CatsEyeBandit.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -45,7 +44,7 @@ public class CatsEyeBandit extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "You childish fool, do you think you can catch me?")); } @@ -60,7 +59,7 @@ public class CatsEyeBandit extends Quest @Override public String onKill(Npc npc, Player killer, boolean isPet) { - if (Rnd.get(100) < 80) + if (getRandom(100) < 80) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "I must do something about this shameful incident...")); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Chests.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Chests.java index f1501c5741..45bd490cfe 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Chests.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Chests.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; @@ -70,7 +69,7 @@ public class Chests extends Quest { chest.setInteracted(); final boolean isDeluxeSkill = skill.getId() == SKILL_DELUXE_KEY; - if ((Rnd.get(100) < IS_BOX) || isDeluxeSkill) + if ((getRandom(100) < IS_BOX) || isDeluxeSkill) { // if it's a box, either it will be successfully opened by a proper key, or instantly disappear if (isDeluxeSkill) @@ -85,7 +84,7 @@ public class Chests extends Quest final int chance = BASE_CHANCE - (levelDiff * LEVEL_DECREASE); // success, pretend-death with rewards: npc.reduceCurrentHp(99999999, player) - if (Rnd.get(100) < chance) + if (getRandom(100) < chance) { chest.setMustRewardExpSp(false); chest.setSpecialDrop(); @@ -114,7 +113,7 @@ public class Chests extends Quest if (!chest.isInteracted()) { chest.setInteracted(); - if (Rnd.get(100) < IS_BOX) + if (getRandom(100) < IS_BOX) { chest.onDecay(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java index 31347d7c1c..08d99c0d35 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class DeluLizardmanSpecialAgent extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Hey! We're having a duel here!")); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java index 16ccda4885..9c6ca862e8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class DeluLizardmanSpecialCommander extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Come on, Ill take you on!")); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/EvaBox.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/EvaBox.java index f88dcf487a..d51ddc3fab 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/EvaBox.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/EvaBox.java @@ -19,7 +19,6 @@ package ai.others; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -64,7 +63,7 @@ public class EvaBox extends Quest { if (KISS_OF_EVA.contains(effect.getSkill().getId())) { - final Item reward = ItemTable.getInstance().createItem("EvaBox", Rnd.get(REWARDS.length), 1, killer); + final Item reward = ItemTable.getInstance().createItem("EvaBox", getRandom(REWARDS.length), 1, killer); reward.dropMe(npc, npc.getX(), npc.getY(), npc.getZ()); break; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/FeedableBeasts.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/FeedableBeasts.java index 5ea4e12fbe..30d962728e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/FeedableBeasts.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/FeedableBeasts.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -150,7 +149,7 @@ public class FeedableBeasts extends Quest { int[][] temp; temp = _spiceToMob.get(spice); - return temp[0][Rnd.get(temp[0].length)]; + return temp[0][getRandom(temp[0].length)]; } public Integer getChance() @@ -360,7 +359,7 @@ public class FeedableBeasts extends Quest if (growthLevel == 2) { // If tamed, the mob that will spawn depends on the class type (fighter/mage) of the player! - if (Rnd.get(2) == 0) + if (getRandom(2) == 0) { if (player.isMageClass()) { @@ -376,7 +375,7 @@ public class FeedableBeasts extends Quest /* * If not tamed, there is a small chance that have "mad cow" disease. that is a stronger-than-normal animal that attacks its feeder */ - if (Rnd.get(5) == 0) + if (getRandom(5) == 0) { nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 0, 1); } @@ -420,14 +419,14 @@ public class FeedableBeasts extends Quest // If player has Q020 going, give quest item final QuestState st = player.getQuestState(Q020_BringUpWithLove.class.getSimpleName()); - if ((st != null) && (Rnd.get(100) < 5) && !st.hasQuestItems(7185)) + if ((st != null) && (getRandom(100) < 5) && !st.hasQuestItems(7185)) { st.giveItems(7185, 1); st.setCond(2); } // Also, perform a rare random chat - final int rand = Rnd.get(20); + final int rand = getRandom(20); if (rand < 5) { npc.broadcastPacket(new CreatureSay(nextNpc.getObjectId(), ChatType.GENERAL, nextNpc.getName(), SPAWN_CHATS[rand].replace("$s1", player.getName()))); @@ -533,9 +532,9 @@ public class FeedableBeasts extends Quest } // Rare random talk... - if (Rnd.get(20) == 0) + if (getRandom(20) == 0) { - npc.broadcastPacket(new CreatureSay(objectId, ChatType.GENERAL, npc.getName(), TEXT[growthLevel][Rnd.get(TEXT[growthLevel].length)])); + npc.broadcastPacket(new CreatureSay(objectId, ChatType.GENERAL, npc.getName(), TEXT[growthLevel][getRandom(TEXT[growthLevel].length)])); } if ((growthLevel > 0) && (FEED_INFO.getOrDefault(objectId, 0) != caster.getObjectId())) @@ -546,7 +545,7 @@ public class FeedableBeasts extends Quest } // Polymorph the mob, with a certain chance, given its current growth level - if (Rnd.get(100) < GROWTH_CAPABLE_MONSTERS.get(npcId).getChance()) + if (getRandom(100) < GROWTH_CAPABLE_MONSTERS.get(npcId).getChance()) { spawnNext(npc, growthLevel, caster, food); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/KarulBugbear.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/KarulBugbear.java index 8e773e6053..b3b3744e37 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/KarulBugbear.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/KarulBugbear.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class KarulBugbear extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 4) + if (getRandom(100) < 4) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Your rear is practically unguarded!")); } @@ -52,7 +51,7 @@ public class KarulBugbear extends Quest else { npc.setScriptValue(1); - if (Rnd.get(100) < 4) + if (getRandom(100) < 4) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Watch your back!")); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java index 0ca0b27696..8a57698143 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -167,7 +166,7 @@ public class Monastery extends Quest if (Util.contains(MOBS_2, npc.getNpcId()) && (skill.getSkillType() == SkillType.AGGDAMAGE)) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), TEXT[Rnd.get(2) + 1].replace("name", player.getName()))); + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), TEXT[getRandom(2) + 1].replace("name", player.getName()))); ((Attackable) npc).addDamageHate(player, 0, 999); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java index 459b843cb7..52e9ddab9a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; @@ -396,7 +395,7 @@ public class NewbieHelper extends Quest qs2.showQuestionMark(3); qs2.set("Ex", "2"); } - else if ((ex <= 2) && (qs1.getState() == State.STARTED) && (qs2.getInt("Gemstone") == 0) && (Rnd.get(100) < 50)) + else if ((ex <= 2) && (qs1.getState() == State.STARTED) && (qs2.getInt("Gemstone") == 0) && (getRandom(100) < 50)) { ((Monster) npc).dropItem(player, BLUE_GEM, 1); qs1.playSound("ItemSound.quest_tutorial"); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/OlMahumGeneral.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/OlMahumGeneral.java index ff6468677e..f714ea864b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/OlMahumGeneral.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/OlMahumGeneral.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class OlMahumGeneral extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "We shall see about that!")); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/RetreatOnAttack.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/RetreatOnAttack.java index 84c3bac6d2..5348f18aca 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/RetreatOnAttack.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/RetreatOnAttack.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -65,11 +64,11 @@ public class RetreatOnAttack extends Quest public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { final int npcId = npc.getNpcId(); - if ((npcId == EPLY) || ((npc.getStatus().getCurrentHp() <= ((npc.getMaxHp() * 50) / 100)) && (Rnd.get(100) < 10))) + if ((npcId == EPLY) || ((npc.getStatus().getCurrentHp() <= ((npc.getMaxHp() * 50) / 100)) && (getRandom(100) < 10))) { if (npcId == OL_MAHUM_GUARD) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), OL_MAHUM_GUARD_TEXT[Rnd.get(OL_MAHUM_GUARD_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), OL_MAHUM_GUARD_TEXT[getRandom(OL_MAHUM_GUARD_TEXT.length)])); } int posX = npc.getX(); int posY = npc.getY(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java index cd2b0d5e07..e8023aa8ce 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -41,7 +40,7 @@ public class ScarletStakatoNoble extends Quest @Override public String onKill(Npc npc, Player killer, boolean isPet) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { addSpawn(SCARLET_STAKATO_NOBLE_B, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0); addSpawn(SCARLET_STAKATO_NOBLE_B, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Splendor.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Splendor.java index 7fae99ec19..9b96768047 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Splendor.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Splendor.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -64,7 +63,7 @@ public class Splendor extends Quest public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { final List npcData = NPCS.get(npc.getNpcId()); - if (Rnd.get(100) < (npcData.get(1) * Config.RATE_DROP_QUEST)) + if (getRandom(100) < (npcData.get(1) * Config.RATE_DROP_QUEST)) { if (npcData.get(2) == 1) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/SummonMinions.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/SummonMinions.java index b270212c6f..75ae3c89ba 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/SummonMinions.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/SummonMinions.java @@ -24,7 +24,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArraySet; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -164,12 +163,12 @@ public class SummonMinions extends Quest if (npc.getStatus().getCurrentHp() < (npc.getMaxHp() / 2)) { hasSpawned = 0; - if (Rnd.get(100) < 33) // mobs that summon minions only on certain chance + if (getRandom(100) < 33) // mobs that summon minions only on certain chance { final Integer[] minions = MINIONS.get(npcId); for (Integer minion : minions) { - final Attackable newNpc = (Attackable) addSpawn(minion, (npc.getX() + Rnd.get(-150, 150)), (npc.getY() + Rnd.get(-150, 150)), npc.getZ(), 0, false, 0); + final Attackable newNpc = (Attackable) addSpawn(minion, (npc.getX() + getRandom(-150, 150)), (npc.getY() + getRandom(-150, 150)), npc.getZ(), 0, false, 0); newNpc.setRunning(); newNpc.addDamageHate(attacker, 0, 999); newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker); @@ -218,7 +217,7 @@ public class SummonMinions extends Quest final Integer[] minions = MINIONS.get(npcId); for (Integer minion : minions) { - final Attackable newNpc = (Attackable) addSpawn(minion, npc.getX() + Rnd.get(-150, 150), npc.getY() + Rnd.get(-150, 150), npc.getZ(), 0, false, 0); + final Attackable newNpc = (Attackable) addSpawn(minion, npc.getX() + getRandom(-150, 150), npc.getY() + getRandom(-150, 150), npc.getZ(), 0, false, 0); newNpc.setRunning(); newNpc.addDamageHate(currentAttacker, 0, 999); newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, currentAttacker); @@ -233,7 +232,7 @@ public class SummonMinions extends Quest { for (Integer minion : minions) { - final Attackable newNpc = (Attackable) addSpawn(minion, npc.getX() + Rnd.get(-150, 150), npc.getY() + Rnd.get(-150, 150), npc.getZ(), 0, false, 0); + final Attackable newNpc = (Attackable) addSpawn(minion, npc.getX() + getRandom(-150, 150), npc.getY() + getRandom(-150, 150), npc.getZ(), 0, false, 0); newNpc.setRunning(); newNpc.addDamageHate(attacker, 0, 999); newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker); @@ -243,7 +242,7 @@ public class SummonMinions extends Quest { for (Integer minion : minions) { - addSpawn(minion, (npc.getX() + Rnd.get(-100, 100)), (npc.getY() + Rnd.get(-100, 100)), npc.getZ(), 0, false, 0); + addSpawn(minion, (npc.getX() + getRandom(-100, 100)), (npc.getY() + getRandom(-100, 100)), npc.getZ(), 0, false, 0); } } if (npcId == 20767) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TimakOrcOverlord.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TimakOrcOverlord.java index d990703a14..90bb5d83d0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TimakOrcOverlord.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TimakOrcOverlord.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class TimakOrcOverlord extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Dear ultimate power!!!")); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java index 5105d615b9..1cbec05c61 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class TimakOrcTroopLeader extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Destroy the enemy, my brothers!")); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Transform.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Transform.java index a052c1308b..cf657899dc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Transform.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Transform.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -144,11 +143,11 @@ public class Transform extends Quest { for (Transformer monster : _mobs) { - if ((npc.getNpcId() == monster.getId()) && (Rnd.get(100) <= (monster.getChance() * Config.RATE_DROP_QUEST))) + if ((npc.getNpcId() == monster.getId()) && (getRandom(100) <= (monster.getChance() * Config.RATE_DROP_QUEST))) { if (monster.getMessage() != 0) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), Message[Rnd.get(monster.getMessage())])); + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), Message[getRandom(monster.getMessage())])); } npc.onDecay(); final Attackable newNpc = (Attackable) addSpawn(monster.getIdPoly(), npc); @@ -178,7 +177,7 @@ public class Transform extends Quest { if (monster.getMessage() != 0) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), Message[Rnd.get(monster.getMessage())])); + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), Message[getRandom(monster.getMessage())])); } final Attackable newNpc = (Attackable) addSpawn(monster.getIdPoly(), npc); final Creature originalAttacker = isPet ? killer.getPet() : killer; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcFootman.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcFootman.java index d5a46f5df0..6febf3ee48 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcFootman.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcFootman.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class TurekOrcFootman extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "There is no reason for you to kill me! I have nothing you need!")); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcSupplier.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcSupplier.java index ee0c92d333..43fce2a8c2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcSupplier.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcSupplier.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class TurekOrcSupplier extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "You wont take me down easily.")); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcWarlord.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcWarlord.java index c985d281ec..5de380637a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcWarlord.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/TurekOrcWarlord.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class TurekOrcWarlord extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "You wont take me down easily.")); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java index 933d87ebd7..068c415aef 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java @@ -17,7 +17,6 @@ package quests.Q022_TragedyInVonHellmannForest; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -645,7 +644,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest else { final QuestState qs = killer.getQuestState(getName()); - if ((qs != null) && qs.isCond(4) && qs.hasQuestItems(CROSS_OF_EINHASAD) && !qs.hasQuestItems(LOST_SKULL_OF_ELF) && (Rnd.get(100) < 10)) + if ((qs != null) && qs.isCond(4) && qs.hasQuestItems(CROSS_OF_EINHASAD) && !qs.hasQuestItems(LOST_SKULL_OF_ELF) && (getRandom(100) < 10)) { qs.giveItems(LOST_SKULL_OF_ELF, 1); qs.setCond(5); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java index 441feb1ec1..985138929e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java @@ -19,7 +19,6 @@ package quests.Q038_DragonFangs; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -133,7 +132,7 @@ public class Q038_DragonFangs extends Quest { if (st.getQuestItemsCount(TOOTH_OF_DRAGON) >= 50) { - final int position = Rnd.get(REWARD.length); + final int position = getRandom(REWARD.length); htmltext = "30034-06.htm"; st.takeItems(TOOTH_OF_DRAGON, 50); st.giveItems(REWARD[position][0], 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java index 9efce7f229..ef0fb0cf47 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java @@ -16,7 +16,6 @@ */ package quests.Q105_SkirmishWithTheOrcs; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -80,7 +79,7 @@ public class Q105_SkirmishWithTheOrcs extends Quest if (event.equals("30218-03.htm")) { st.startQuest(); - st.giveItems(Rnd.get(1836, 1839), 1); // Kendell's orders 1 to 4. + st.giveItems(getRandom(1836, 1839), 1); // Kendell's orders 1 to 4. } return htmltext; @@ -131,7 +130,7 @@ public class Q105_SkirmishWithTheOrcs extends Quest st.takeItems(KENDELL_ORDER_2, 1); st.takeItems(KENDELL_ORDER_3, 1); st.takeItems(KENDELL_ORDER_4, 1); - st.giveItems(Rnd.get(1840, 1843), 1); // Kendell's orders 5 to 8. + st.giveItems(getRandom(1840, 1843), 1); // Kendell's orders 5 to 8. } else if (cond == 3) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java index e2e537de74..a20fdb1cda 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java @@ -16,7 +16,6 @@ */ package quests.Q108_JumbleTumbleDiamondFuss; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -342,7 +341,7 @@ public class Q108_JumbleTumbleDiamondFuss extends Quest } else if (cond == 11) { - htmltext = (Rnd.nextBoolean()) ? "30522-02.htm" : "30522-04.htm"; + htmltext = getRandomBoolean() ? "30522-02.htm" : "30522-04.htm"; } else if (cond == 12) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java index 245a46abbc..089655038e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java @@ -19,7 +19,6 @@ package quests.Q171_ActsOfEvil; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -336,7 +335,7 @@ public class Q171_ActsOfEvil extends Quest if (st.isCond(2) && !st.dropItems(BLADE_MOLD, 1, 20, CHANCES.get(npcId))) { final int count = st.getQuestItemsCount(BLADE_MOLD); - if ((count == 5) || ((count >= 10) && (Rnd.get(100) < 25))) + if ((count == 5) || ((count >= 10) && (getRandom(100) < 25))) { addSpawn(27190, player.getX(), player.getY(), player.getZ(), player.getHeading(), false, 0); } @@ -353,7 +352,7 @@ public class Q171_ActsOfEvil extends Quest st.giveItems(RANGER_REPORT_1, 1); st.playSound(QuestState.SOUND_ITEMGET); } - else if (Rnd.get(100) < 20) + else if (getRandom(100) < 20) { if (!st.hasQuestItems(RANGER_REPORT_2)) { @@ -376,7 +375,7 @@ public class Q171_ActsOfEvil extends Quest } case 20438: { - if (st.isCond(6) && (Rnd.get(100) < 10) && !st.hasQuestItems(WEAPON_TRADE_CONTRACT, ATTACK_DIRECTIVES)) + if (st.isCond(6) && (getRandom(100) < 10) && !st.hasQuestItems(WEAPON_TRADE_CONTRACT, ATTACK_DIRECTIVES)) { st.playSound(QuestState.SOUND_ITEMGET); st.giveItems(WEAPON_TRADE_CONTRACT, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java index ade15bb7f1..b7073bc27a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java @@ -16,7 +16,6 @@ */ package quests.Q211_TrialOfTheChallenger; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -108,12 +107,12 @@ public class Q211_TrialOfTheChallenger extends Quest { if (st.hasQuestItems(BROKEN_KEY)) { - if (Rnd.get(10) < 2) + if (getRandom(10) < 2) { htmltext = "30647-03.htm"; st.playSound(QuestState.SOUND_JACKPOT); st.takeItems(BROKEN_KEY, 1); - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance > 90) { st.rewardItems(BRIGANDINE_GAUNTLETS_PATTERN, 1); @@ -140,7 +139,7 @@ public class Q211_TrialOfTheChallenger extends Quest { htmltext = "30647-02.htm"; st.takeItems(BROKEN_KEY, 1); - st.rewardItems(ADENA, Rnd.get(1, 1000)); + st.rewardItems(ADENA, getRandom(1, 1000)); } } break; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java index ec1eefde43..13cc0c91cf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java @@ -16,7 +16,6 @@ */ package quests.Q212_TrialOfDuty; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -338,7 +337,7 @@ public class Q212_TrialOfDuty extends Quest case 20190: case 20191: { - if (st.isCond(2) && (Rnd.get(10) < 1)) + if (st.isCond(2) && (getRandom(10) < 1)) { st.playSound(QuestState.SOUND_BEFORE_BATTLE); addSpawn(27119, npc, false, 120000); @@ -368,7 +367,7 @@ public class Q212_TrialOfDuty extends Quest } case 20144: { - if ((st.isCond(7) || st.isCond(8)) && (Rnd.get(100) < 33)) + if ((st.isCond(7) || st.isCond(8)) && (getRandom(100) < 33)) { if (st.isCond(7)) { @@ -394,7 +393,7 @@ public class Q212_TrialOfDuty extends Quest } case 20270: { - if (st.isCond(14) && Rnd.nextBoolean()) + if (st.isCond(14) && getRandomBoolean()) { if (!st.hasQuestItems(ATHEBALDT_SKULL)) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java index 2d3767fb44..914908ee36 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java @@ -16,7 +16,6 @@ */ package quests.Q215_TrialOfThePilgrim; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -340,7 +339,7 @@ public class Q215_TrialOfThePilgrim extends Quest } else if (cond == 13) { - htmltext = (Rnd.nextBoolean()) ? "30362-02.htm" : "30362-02a.htm"; + htmltext = (getRandomBoolean()) ? "30362-02.htm" : "30362-02a.htm"; } else if (cond == 14) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java index 76f85bbd16..6402ab96c2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java @@ -16,7 +16,6 @@ */ package quests.Q216_TrialOfTheGuildsman; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -464,7 +463,7 @@ public class Q216_TrialOfTheGuildsman extends Quest case ANT_CAPTAIN: { // Different cases if player is a wannabe BH or WS. - if (st.hasQuestItems(PINTER_INSTRUCTIONS) && st.dropItemsAlways(AMBER_BEAD, ((player.getClassId() == ClassId.SCAVENGER) && (npc.getSpoiledBy() == player.getObjectId())) ? 10 : 5, 70) && (player.getClassId() == ClassId.ARTISAN) && Rnd.nextBoolean()) + if (st.hasQuestItems(PINTER_INSTRUCTIONS) && st.dropItemsAlways(AMBER_BEAD, ((player.getClassId() == ClassId.SCAVENGER) && (npc.getSpoiledBy() == player.getObjectId())) ? 10 : 5, 70) && (player.getClassId() == ClassId.ARTISAN) && getRandomBoolean()) { st.giveItems(AMBER_LUMP, 1); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java index 28e2ec3520..121b005b96 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java @@ -16,7 +16,6 @@ */ package quests.Q217_TestimonyOfTrust; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -497,7 +496,7 @@ public class Q217_TestimonyOfTrust extends Quest case DRYAD: case DRYAD_ELDER: { - if (st.isCond(2) && !st.hasQuestItems(SEED_OF_VERDURE) && (Rnd.get(100) < 33)) + if (st.isCond(2) && !st.hasQuestItems(SEED_OF_VERDURE) && (getRandom(100) < 33)) { addSpawn(ACTEA_OF_VERDANT_WILDS, npc, true, 200000); st.playSound(QuestState.SOUND_BEFORE_BATTLE); @@ -507,7 +506,7 @@ public class Q217_TestimonyOfTrust extends Quest case LIREIN: case LIREIN_ELDER: { - if (st.isCond(2) && !st.hasQuestItems(BREATH_OF_WINDS) && (Rnd.get(100) < 33)) + if (st.isCond(2) && !st.hasQuestItems(BREATH_OF_WINDS) && (getRandom(100) < 33)) { addSpawn(LUELL_OF_ZEPHYR_WINDS, npc, true, 200000); st.playSound(QuestState.SOUND_BEFORE_BATTLE); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java index 5eb7ea4205..8d75556c0b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java @@ -16,7 +16,6 @@ */ package quests.Q218_TestimonyOfLife; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -564,7 +563,7 @@ public class Q218_TestimonyOfLife extends Quest case 20581: case 20582: { - if (st.isCond(15) && Rnd.nextBoolean()) + if (st.isCond(15) && getRandomBoolean()) { for (int itemId : TALINS_PIECES) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java index c978f4353c..7ab5b62be5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java @@ -16,7 +16,6 @@ */ package quests.Q223_TestOfTheChampion; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -357,12 +356,12 @@ public class Q223_TestOfTheChampion extends Quest { case HARPY: // Possibility to spawn an HARPY _MATRIARCH. { - if (st.isCond(6) && Rnd.nextBoolean() && !npc.isScriptValue(1)) + if (st.isCond(6) && getRandomBoolean() && !npc.isScriptValue(1)) { final Creature originalKiller = isPet ? attacker.getPet() : attacker; // Spawn one or two matriarchs. - for (int i = 1; i < ((Rnd.get(10) < 7) ? 2 : 3); i++) + for (int i = 1; i < ((getRandom(10) < 7) ? 2 : 3); i++) { final Attackable collector = (Attackable) addSpawn(HARPY_MATRIARCH, npc, true, 0); @@ -376,12 +375,12 @@ public class Q223_TestOfTheChampion extends Quest } case ROAD_SCAVENGER: // Possibility to spawn a Road Collector. { - if (st.isCond(10) && Rnd.nextBoolean() && !npc.isScriptValue(1)) + if (st.isCond(10) && getRandomBoolean() && !npc.isScriptValue(1)) { final Creature originalKiller = isPet ? attacker.getPet() : attacker; // Spawn one or two collectors. - for (int i = 1; i < ((Rnd.get(10) < 7) ? 2 : 3); i++) + for (int i = 1; i < ((getRandom(10) < 7) ? 2 : 3); i++) { final Attackable collector = (Attackable) addSpawn(ROAD_COLLECTOR, npc, true, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java index c54daf458c..19b7b7a494 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java @@ -16,7 +16,6 @@ */ package quests.Q224_TestOfSagittarius; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -396,7 +395,7 @@ public class Q224_TestOfSagittarius extends Quest { if (st.isCond(13)) { - if (((st.getQuestItemsCount(BLOOD_OF_LIZARDMAN) - 120) * 5) > Rnd.get(100)) + if (((st.getQuestItemsCount(BLOOD_OF_LIZARDMAN) - 120) * 5) > getRandom(100)) { st.playSound(QuestState.SOUND_BEFORE_BATTLE); st.takeItems(BLOOD_OF_LIZARDMAN, -1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java index fd58c62289..d90c991fe9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java @@ -16,7 +16,6 @@ */ package quests.Q226_TestOfTheHealer; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -272,7 +271,7 @@ public class Q226_TestOfTheHealer extends Quest } case ORPHAN_GIRL: { - htmltext = "30659-0" + Rnd.get(1, 5) + ".htm"; + htmltext = "30659-0" + getRandom(1, 5) + ".htm"; break; } case ALLANA: diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java index d988df7445..637f3b900c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java @@ -19,7 +19,6 @@ package quests.Q230_TestOfTheSummoner; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -188,14 +187,14 @@ public class Q230_TestOfTheSummoner extends Quest st.setCond(2); st.playSound(QuestState.SOUND_MIDDLE); st.takeItems(GALATEA_LETTER, 1); - final int random = Rnd.get(5); + final int random = getRandom(5); st.giveItems(LARA_LISTS[random][0], 1); st.set("Lara", String.valueOf(random + 1)); // avoid 0 break; } case "30063-04.htm": { - final int random = Rnd.get(5); + final int random = getRandom(5); st.playSound(QuestState.SOUND_ITEMGET); st.giveItems(LARA_LISTS[random][0], 1); st.set("Lara", String.valueOf(random + 1)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java index 4024b0406d..e5716181cb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java @@ -16,7 +16,6 @@ */ package quests.Q233_TestOfTheWarSpirit; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; @@ -515,7 +514,7 @@ public class Q233_TestOfTheWarSpirit extends Quest { if (st.hasQuestItems(INSECT_DIAGRAM_BOOK)) { - final int rndAnt = Rnd.get(100); + final int rndAnt = getRandom(100); if (rndAnt > 70) { if (st.hasQuestItems(KIRUNA_THIGHBONE)) @@ -548,7 +547,7 @@ public class Q233_TestOfTheWarSpirit extends Quest case LETO_LIZARDMAN_SHAMAN: case LETO_LIZARDMAN_OVERLORD: { - if (st.hasQuestItems(PEKIRON_TOTEM) && Rnd.nextBoolean()) + if (st.hasQuestItems(PEKIRON_TOTEM) && getRandomBoolean()) { if (!st.hasQuestItems(TONAR_SKULL)) { @@ -575,7 +574,7 @@ public class Q233_TestOfTheWarSpirit extends Quest } case MEDUSA: { - if (st.hasQuestItems(MANAKIA_TOTEM) && Rnd.nextBoolean()) + if (st.hasQuestItems(MANAKIA_TOTEM) && getRandomBoolean()) { if (!st.hasQuestItems(HERMODT_RIBBONE)) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java index 73bf9685fb..2168e8be8e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java @@ -16,7 +16,6 @@ */ package quests.Q246_PossessorOfAPreciousSoul; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -254,7 +253,7 @@ public class Q246_PossessorOfAPreciousSoul extends Quest return null; } - if (Rnd.get(10) < 2) + if (getRandom(10) < 2) { final int neklaceOrRing = (npcId == PILGRIM_OF_SPLENDOR) ? WATERBINDER : EVERGREEN; if (!st.hasQuestItems(neklaceOrRing)) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java index 74c6214bcb..a44f03e2f3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java @@ -16,7 +16,6 @@ */ package quests.Q258_BringWolfPelts; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -87,7 +86,7 @@ public class Q258_BringWolfPelts extends Quest else { st.takeItems(WOLF_PELT, -1); - final int randomNumber = Rnd.get(16); + final int randomNumber = getRandom(16); // Reward is based on a random number (1D16). if (randomNumber == 0) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java index 68bca41f7f..8fe4f38ecb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java @@ -16,7 +16,6 @@ */ package quests.Q264_KeenClaws; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -91,7 +90,7 @@ public class Q264_KeenClaws extends Quest htmltext = "30136-05.htm"; st.takeItems(WOLF_CLAW, -1); - final int n = Rnd.get(17); + final int n = getRandom(17); if (n == 0) { st.giveItems(WOODEN_HELMET, 1); @@ -144,12 +143,12 @@ public class Q264_KeenClaws extends Quest if (npc.getNpcId() == 20003) { - if (st.dropItems(WOLF_CLAW, Rnd.nextBoolean() ? 2 : 4, 50, 500000)) + if (st.dropItems(WOLF_CLAW, getRandomBoolean() ? 2 : 4, 50, 500000)) { st.setCond(2); } } - else if (st.dropItemsAlways(WOLF_CLAW, (Rnd.get(5) < 4) ? 1 : 2, 50)) + else if (st.dropItemsAlways(WOLF_CLAW, (getRandom(5) < 4) ? 1 : 2, 50)) { st.setCond(2); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java index b1f3560db5..8e316e2202 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java @@ -16,7 +16,6 @@ */ package quests.Q266_PleasOfPixies; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -100,7 +99,7 @@ public class Q266_PleasOfPixies extends Quest htmltext = "31852-05.htm"; st.takeItems(PREDATOR_FANG, -1); - final int n = Rnd.get(100); + final int n = getRandom(100); if (n < 10) { st.playSound(QuestState.SOUND_JACKPOT); @@ -142,7 +141,7 @@ public class Q266_PleasOfPixies extends Quest { case 20525: { - if (st.dropItemsAlways(PREDATOR_FANG, Rnd.get(2, 3), 100)) + if (st.dropItemsAlways(PREDATOR_FANG, getRandom(2, 3), 100)) { st.setCond(2); } @@ -158,7 +157,7 @@ public class Q266_PleasOfPixies extends Quest } case 20534: { - if (st.dropItems(PREDATOR_FANG, (Rnd.get(3) == 0) ? 1 : 2, 100, 600000)) + if (st.dropItems(PREDATOR_FANG, (getRandom(3) == 0) ? 1 : 2, 100, 600000)) { st.setCond(2); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java index 4b508121ae..5c65539d1b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java @@ -16,7 +16,6 @@ */ package quests.Q271_ProofOfValor; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -101,7 +100,7 @@ public class Q271_ProofOfValor extends Quest { htmltext = "30577-05.htm"; st.takeItems(KASHA_WOLF_FANG, -1); - st.giveItems((Rnd.get(100) < 10) ? NECKLACE_OF_VALOR : NECKLACE_OF_COURAGE, 1); + st.giveItems((getRandom(100) < 10) ? NECKLACE_OF_VALOR : NECKLACE_OF_COURAGE, 1); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } @@ -121,7 +120,7 @@ public class Q271_ProofOfValor extends Quest return null; } - if (st.dropItemsAlways(KASHA_WOLF_FANG, (Rnd.get(4) == 0) ? 2 : 1, 50)) + if (st.dropItemsAlways(KASHA_WOLF_FANG, (getRandom(4) == 0) ? 2 : 1, 50)) { st.setCond(2); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java index 9953ccb26f..0871e9959d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java @@ -16,7 +16,6 @@ */ package quests.Q273_InvadersOfTheHolyLand; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -149,7 +148,7 @@ public class Q273_InvadersOfTheHolyLand extends Quest probability = 87; } - if (Rnd.get(100) <= probability) + if (getRandom(100) <= probability) { st.dropItemsAlways(BLACK_SOULSTONE, 1, 0); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java index 425f8bc7ef..f58a7e0598 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java @@ -16,7 +16,6 @@ */ package quests.Q274_SkirmishWithTheWerewolves; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -130,7 +129,7 @@ public class Q274_SkirmishWithTheWerewolves extends Quest st.setCond(2); } - if (Rnd.get(100) < 6) + if (getRandom(100) < 6) { st.giveItems(MARAKU_WOLFMEN_TOTEM, 1); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java index 43f2f4a040..dad09f8f7f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java @@ -16,7 +16,6 @@ */ package quests.Q275_DarkWingedSpies; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -127,7 +126,7 @@ public class Q275_DarkWingedSpies extends Quest { st.setCond(2); } - else if ((Rnd.get(100) < 10) && (st.getQuestItemsCount(DARKWING_BAT_FANG) > 10) && (st.getQuestItemsCount(DARKWING_BAT_FANG) < 66)) + else if ((getRandom(100) < 10) && (st.getQuestItemsCount(DARKWING_BAT_FANG) > 10) && (st.getQuestItemsCount(DARKWING_BAT_FANG) < 66)) { // Spawn of Varangka Tracker on the npc position. addSpawn(VARANGKA_TRACKER, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java index 30c40df99d..2de291fd6f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java @@ -16,7 +16,6 @@ */ package quests.Q276_TotemOfTheHestui; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -127,7 +126,7 @@ public class Q276_TotemOfTheHestui extends Quest case 20479: { final int count = st.getQuestItemsCount(KASHA_PARASITE); - final int random = Rnd.get(100); + final int random = getRandom(100); if ((count >= 79) || ((count >= 69) && (random <= 20)) || ((count >= 59) && (random <= 15)) || ((count >= 49) && (random <= 10)) || ((count >= 39) && (random < 2))) { addSpawn(27044, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java index 64ee105fcf..51a5a0cecc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java @@ -16,7 +16,6 @@ */ package quests.Q291_RevengeOfTheRedbonnet; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -90,7 +89,7 @@ public class Q291_RevengeOfTheRedbonnet extends Quest htmltext = "30553-05.htm"; st.takeItems(BLACK_WOLF_PELT, -1); - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 3) { st.rewardItems(GRANDMA_PEARL, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java index f6b01beeb1..b8e551b336 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java @@ -16,7 +16,6 @@ */ package quests.Q292_BrigandsSweep; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -185,7 +184,7 @@ public class Q292_BrigandsSweep extends Quest return null; } - final int chance = Rnd.get(10); + final int chance = getRandom(10); if (chance > 5) { switch (npc.getNpcId()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java index d37b8bbba6..01e57ed269 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java @@ -16,7 +16,6 @@ */ package quests.Q293_TheHiddenVeins; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -181,7 +180,7 @@ public class Q293_TheHiddenVeins extends Quest return null; } - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance > 50) { st.dropItemsAlways(CHRYSOLITE_ORE, 1, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java index dedfcedc82..688436a985 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java @@ -16,7 +16,6 @@ */ package quests.Q294_CovertBusiness; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -118,7 +117,7 @@ public class Q294_CovertBusiness extends Quest } int count = 1; - final int chance = Rnd.get(10); + final int chance = getRandom(10); final boolean isBarded = (npc.getNpcId() == 20370); if (chance < 3) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java index 871172b90c..5d51f221ae 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java @@ -16,7 +16,6 @@ */ package quests.Q295_DreamingOfTheSkies; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -115,7 +114,7 @@ public class Q295_DreamingOfTheSkies extends Quest return null; } - if (st.dropItemsAlways(FLOATING_STONE, (Rnd.get(100) > 25) ? 1 : 2, 50)) + if (st.dropItemsAlways(FLOATING_STONE, (getRandom(100) > 25) ? 1 : 2, 50)) { st.setCond(2); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java index f1d12631b5..6708da55b4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java @@ -16,7 +16,6 @@ */ package quests.Q296_TarantulasSpiderSilk; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -83,7 +82,7 @@ public class Q296_TarantulasSpiderSilk extends Quest { htmltext = "30548-03.htm"; st.takeItems(TARANTULA_SPINNERETTE, -1); - st.giveItems(TARANTULA_SPIDER_SILK, count * (15 + Rnd.get(10))); + st.giveItems(TARANTULA_SPIDER_SILK, count * (15 + getRandom(10))); } break; } @@ -149,7 +148,7 @@ public class Q296_TarantulasSpiderSilk extends Quest return null; } - final int rnd = Rnd.get(100); + final int rnd = getRandom(100); if (rnd > 95) { st.dropItemsAlways(TARANTULA_SPINNERETTE, 1, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java index 89e8614088..90ab30f644 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java @@ -19,7 +19,6 @@ package quests.Q300_HuntingLetoLizardman; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -75,7 +74,7 @@ public class Q300_HuntingLetoLizardman extends Quest htmltext = "30126-06.htm"; st.takeItems(BRACELET, -1); - final int luck = Rnd.get(3); + final int luck = getRandom(3); if (luck == 0) { st.rewardItems(57, 30000); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java index 9eec9bd2cd..aba0f9c434 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -167,7 +166,7 @@ public class Q325_GrimCollector extends Quest st.takeItems(RIB_BONE, 1); st.takeItems(THIGH_BONE, 1); - if (Rnd.get(10) < 9) + if (getRandom(10) < 9) { st.giveItems(COMPLETE_SKELETON, 1); } @@ -252,7 +251,7 @@ public class Q325_GrimCollector extends Quest if (st.hasQuestItems(ANATOMY_DIAGRAM)) { - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (ItemHolder drop : DROPLIST.get(npc.getNpcId())) { if (chance < drop.getCount()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java index b9fd8f8d5f..f0651c2ef7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java @@ -19,7 +19,6 @@ package quests.Q327_RecoverTheFarmland; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -133,7 +132,7 @@ public class Q327_RecoverTheFarmland extends Quest if (st.getQuestItemsCount(CLAY_URN_FRAGMENT) >= 5) { st.takeItems(CLAY_URN_FRAGMENT, 5); - if (Rnd.get(6) < 5) + if (getRandom(6) < 5) { htmltext = "30313-03.htm"; st.rewardItems(ANCIENT_CLAY_URN, 1); @@ -150,7 +149,7 @@ public class Q327_RecoverTheFarmland extends Quest if (st.getQuestItemsCount(BRASS_TRINKET_PIECE) >= 5) { st.takeItems(BRASS_TRINKET_PIECE, 5); - if (Rnd.get(7) < 6) + if (getRandom(7) < 6) { htmltext = "30313-05.htm"; st.rewardItems(ANCIENT_BRASS_TIARA, 1); @@ -167,7 +166,7 @@ public class Q327_RecoverTheFarmland extends Quest if (st.getQuestItemsCount(BRONZE_MIRROR_PIECE) >= 5) { st.takeItems(BRONZE_MIRROR_PIECE, 5); - if (Rnd.get(7) < 6) + if (getRandom(7) < 6) { htmltext = "30313-07.htm"; st.rewardItems(ANCIENT_BRONZE_MIRROR, 1); @@ -184,7 +183,7 @@ public class Q327_RecoverTheFarmland extends Quest if (st.getQuestItemsCount(JADE_NECKLACE_BEAD) >= 5) { st.takeItems(JADE_NECKLACE_BEAD, 5); - if (Rnd.get(8) < 7) + if (getRandom(8) < 7) { htmltext = "30313-09.htm"; st.rewardItems(ANCIENT_JADE_NECKLACE, 1); @@ -288,7 +287,7 @@ public class Q327_RecoverTheFarmland extends Quest else { st.takeItems(ANCIENT_CLAY_URN, 1); - st.rewardItems(SOULSHOT_D, 70 + Rnd.get(41)); + st.rewardItems(SOULSHOT_D, 70 + getRandom(41)); } break; } @@ -301,7 +300,7 @@ public class Q327_RecoverTheFarmland extends Quest else { st.takeItems(ANCIENT_BRASS_TIARA, 1); - final int rnd = Rnd.get(100); + final int rnd = getRandom(100); if (rnd < 40) { st.rewardItems(HEALING_POTION, 1); @@ -326,7 +325,7 @@ public class Q327_RecoverTheFarmland extends Quest else { st.takeItems(ANCIENT_BRONZE_MIRROR, 1); - st.rewardItems((Rnd.get(100) < 59) ? SCROLL_OF_ESCAPE : SCROLL_OF_RESURRECTION, 1); + st.rewardItems((getRandom(100) < 59) ? SCROLL_OF_ESCAPE : SCROLL_OF_RESURRECTION, 1); } break; } @@ -339,7 +338,7 @@ public class Q327_RecoverTheFarmland extends Quest else { st.takeItems(ANCIENT_JADE_NECKLACE, 1); - st.rewardItems(SPIRITSHOT_D, 50 + Rnd.get(41)); + st.rewardItems(SPIRITSHOT_D, 50 + getRandom(41)); } break; } @@ -449,7 +448,7 @@ public class Q327_RecoverTheFarmland extends Quest if (npcData[0] == npc.getNpcId()) { st.dropItemsAlways(npcData[2], 1, -1); - st.dropItems(Rnd.get(1848, 1851), 1, 0, npcData[1]); + st.dropItems(getRandom(1848, 1851), 1, 0, npcData[1]); break; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java index ae67bc7e7e..16929f1c9e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java @@ -19,7 +19,6 @@ package quests.Q328_SenseForBusiness; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -131,7 +130,7 @@ public class Q328_SenseForBusiness extends Quest final int chance = CHANCES.get(npcId); if (npcId < 20069) { - final int rnd = Rnd.get(100); + final int rnd = getRandom(100); if (rnd < (chance + 1)) { st.dropItemsAlways((rnd < chance) ? MONSTER_EYE_CARCASS : MONSTER_EYE_LENS, 1, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java index f806c250c8..8a88bfe210 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java @@ -16,7 +16,6 @@ */ package quests.Q329_CuriosityOfADwarf; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -108,7 +107,7 @@ public class Q329_CuriosityOfADwarf extends Quest return null; } - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance < 2) { st.dropItemsAlways(GOLEM_HEARTSTONE, 1, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java index 49fb137de3..479b86826c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java @@ -19,7 +19,6 @@ package quests.Q330_AdeptOfTaste; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -180,7 +179,7 @@ public class Q330_AdeptOfTaste extends Quest int dish; final int specialIngredientsNumber = st.getQuestItemsCount(WHITE_MANDRAGORA_SAP) + st.getQuestItemsCount(GOLDEN_HONEY) + st.getQuestItemsCount(BROWN_MOSS_BUNDLE); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30469-05t" + Integer.toString(specialIngredientsNumber + 2) + ".htm"; dish = 1443 + specialIngredientsNumber; @@ -502,7 +501,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(ROLANT_CREATURE_BOOK)) { - st.dropItems(MONSTER_EYE_BODY, (Rnd.get(97) < 77) ? 2 : 3, 30, 970000); + st.dropItems(MONSTER_EYE_BODY, (getRandom(97) < 77) ? 2 : 3, 30, 970000); } break; } @@ -510,7 +509,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(ROLANT_CREATURE_BOOK)) { - st.dropItemsAlways(MONSTER_EYE_BODY, (Rnd.get(10) < 7) ? 1 : 2, 30); + st.dropItemsAlways(MONSTER_EYE_BODY, (getRandom(10) < 7) ? 1 : 2, 30); } break; } @@ -518,7 +517,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(GLYVKA_BOTANY_BOOK)) { - st.dropItems(((Rnd.get(96) < 87) ? GREEN_MARSH_MOSS : BROWN_MARSH_MOSS), 1, 20, 960000); + st.dropItems(((getRandom(96) < 87) ? GREEN_MARSH_MOSS : BROWN_MARSH_MOSS), 1, 20, 960000); } break; } @@ -526,7 +525,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(GLYVKA_BOTANY_BOOK)) { - st.dropItemsAlways(((Rnd.get(10) < 9) ? GREEN_MARSH_MOSS : BROWN_MARSH_MOSS), 1, 20); + st.dropItemsAlways(((getRandom(10) < 9) ? GREEN_MARSH_MOSS : BROWN_MARSH_MOSS), 1, 20); } break; } @@ -543,7 +542,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(JACOB_INSECT_BOOK)) { - final int random = Rnd.get(100); + final int random = getRandom(100); final int[] chances = CHANCES.get(npcId); if (random < chances[0]) { @@ -563,7 +562,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(SONIA_BOTANY_BOOK)) { - final int random = Rnd.get(100); + final int random = getRandom(100); final int[] chances = CHANCES.get(npcId); if (random < chances[1]) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java index 2ddec81647..643b1089d0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java @@ -16,7 +16,6 @@ */ package quests.Q333_HuntOfTheBlackLion; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -187,7 +186,7 @@ public class Q333_HuntOfTheBlackLion extends Quest st.giveItems(LION_EYE, 1); - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 25) { st.giveItems(HEALING_POTION, 20); @@ -211,7 +210,7 @@ public class Q333_HuntOfTheBlackLion extends Quest st.giveItems(LION_EYE, 1); - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 25) { st.giveItems(HEALING_POTION, 25); @@ -233,7 +232,7 @@ public class Q333_HuntOfTheBlackLion extends Quest { htmltext = "30735-19b.htm"; - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 25) { st.giveItems(HEALING_POTION, 50); @@ -304,8 +303,8 @@ public class Q333_HuntOfTheBlackLion extends Quest st.takeItems(CARGO_BOX_4, 1); } - final int i0 = Rnd.get(100); - final int i1 = Rnd.get(100); + final int i0 = getRandom(100); + final int i1 = getRandom(100); if (i0 < 40) { if (i1 < 33) @@ -383,7 +382,7 @@ public class Q333_HuntOfTheBlackLion extends Quest htmltext = "30736-04m.htm"; st.giveItems(IMPERIAL_DIAMOND, 1); } - else if (Rnd.nextBoolean()) + else if (getRandomBoolean()) { htmltext = "30736-04n.htm"; @@ -439,7 +438,7 @@ public class Q333_HuntOfTheBlackLion extends Quest { if (state < 3) { - final int i0 = Rnd.get(100); + final int i0 = getRandom(100); if (i0 < 5) { htmltext = "30736-08a.htm"; @@ -540,7 +539,7 @@ public class Q333_HuntOfTheBlackLion extends Quest st.takeItems(STATUE_SHILIEN_ARM, 1); st.takeItems(STATUE_SHILIEN_LEG, 1); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30471-04.htm"; st.giveItems(COMPLETE_STATUE, 1); @@ -561,7 +560,7 @@ public class Q333_HuntOfTheBlackLion extends Quest st.takeItems(TABLET_FRAGMENT_3, 1); st.takeItems(TABLET_FRAGMENT_4, 1); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30471-07.htm"; st.giveItems(COMPLETE_TABLET, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java index 6e50ce604f..f8216603ca 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java @@ -16,7 +16,6 @@ */ package quests.Q334_TheWishingPotion; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -210,7 +209,7 @@ public class Q334_TheWishingPotion extends Quest if (st.getQuestItemsCount(WISH_POTION_ID) >= 1) { st.takeItems(WISH_POTION_ID, 1); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { st.addSpawn(SUCCUBUS_OF_SEDUCTION); st.addSpawn(SUCCUBUS_OF_SEDUCTION); @@ -232,7 +231,7 @@ public class Q334_TheWishingPotion extends Quest if (st.getQuestItemsCount(WISH_POTION_ID) >= 1) { st.takeItems(WISH_POTION_ID, 1); - final int WISH_CHANCE = Rnd.get(100) + 1; + final int WISH_CHANCE = getRandom(100) + 1; if (WISH_CHANCE <= 33) { st.addSpawn(GRIMA); @@ -243,9 +242,9 @@ public class Q334_TheWishingPotion extends Quest { st.giveItems(57, 10000); } - else if (Rnd.get(100) < 2) + else if (getRandom(100) < 2) { - st.giveItems(57, (Rnd.get(10) + 1) * 1000000); + st.giveItems(57, (getRandom(10) + 1) * 1000000); } else { @@ -265,7 +264,7 @@ public class Q334_TheWishingPotion extends Quest if (st.getQuestItemsCount(WISH_POTION_ID) >= 1) { st.takeItems(WISH_POTION_ID, 1); - final int WISH_CHANCE = Rnd.get(100) + 1; + final int WISH_CHANCE = getRandom(100) + 1; if (WISH_CHANCE <= 33) { st.giveItems(CERTIFICATE_OF_ROYALTY_ID, 1); @@ -290,7 +289,7 @@ public class Q334_TheWishingPotion extends Quest if (st.getQuestItemsCount(WISH_POTION_ID) >= 1) { st.takeItems(3467, 1); - final int WISH_CHANCE = Rnd.get(100) + 1; + final int WISH_CHANCE = getRandom(100) + 1; if (WISH_CHANCE <= 33) { st.giveItems(SPELLBOOK_ICEBOLT_ID, 1); @@ -404,7 +403,7 @@ public class Q334_TheWishingPotion extends Quest } case WISDOM_CHEST: { - final int dropChance = Rnd.get(100); + final int dropChance = getRandom(100); if (dropChance < 20) { st.giveItems(SPELLBOOK_ICEBOLT_ID, 1); @@ -421,13 +420,13 @@ public class Q334_TheWishingPotion extends Quest else { st.getPlayer().getTarget().decayMe(); - htmltext = "30743-0" + (Rnd.get(5) + 1) + ".htm"; + htmltext = "30743-0" + (getRandom(5) + 1) + ".htm"; } break; } case RUPINA: { - if (Rnd.get(100) < DROP_CHANCE_NECKLACE_OF_GRACE_ID) + if (getRandom(100) < DROP_CHANCE_NECKLACE_OF_GRACE_ID) { st.giveItems(NECKLACE_OF_GRACE_ID, 1); } @@ -460,12 +459,12 @@ public class Q334_TheWishingPotion extends Quest { if (element[5] == 0) { - if (Rnd.get(100) < element[6]) + if (getRandom(100) < element[6]) { st.giveItems(element[4], element[7]); } } - else if ((Rnd.get(100) < element[6]) && (st.getQuestItemsCount(element[4]) < element[5])) + else if ((getRandom(100) < element[6]) && (st.getQuestItemsCount(element[4]) < element[5])) { st.giveItems(element[4], element[7]); if (cond == 3) @@ -480,7 +479,7 @@ public class Q334_TheWishingPotion extends Quest } } } - final int dropChance = Rnd.get(100) + 1; + final int dropChance = getRandom(100) + 1; if ((npcId == SUCCUBUS_OF_SEDUCTION) && (dropChance <= DROP_CHANCE_FORBIDDEN_LOVE_SCROLL_ID)) { st.playSound(QuestState.SOUND_ITEMGET); @@ -489,21 +488,21 @@ public class Q334_TheWishingPotion extends Quest else if ((npcId == GRIMA) && (dropChance <= DROP_CHANCE_GOLD_BAR_ID)) { st.playSound(QuestState.SOUND_ITEMGET); - st.giveItems(GOLD_BAR_ID, Rnd.get(5) + 1); + st.giveItems(GOLD_BAR_ID, getRandom(5) + 1); } - else if ((npcId == SANCHES) && (Rnd.get(100) < 50)) + else if ((npcId == SANCHES) && (getRandom(100) < 50)) { st.addSpawn(BONAPARTERIUS); } - else if ((npcId == BONAPARTERIUS) && (Rnd.get(100) < 50)) + else if ((npcId == BONAPARTERIUS) && (getRandom(100) < 50)) { st.addSpawn(RAMSEBALIUS); } - else if ((npcId == RAMSEBALIUS) && (Rnd.get(100) < 50)) + else if ((npcId == RAMSEBALIUS) && (getRandom(100) < 50)) { st.addSpawn(GREAT_DEMON_KING); } - else if ((npcId == GREAT_DEMON_KING) && (Rnd.get(100) < 50)) + else if ((npcId == GREAT_DEMON_KING) && (getRandom(100) < 50)) { if (dropChance <= 25) { 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 fd9f415b36..e7e3775fcf 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 @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -294,37 +293,37 @@ public class Q335_TheSongOfTheHunter extends Quest final int[] list = new int[5]; if (Laurel_Leaf_Pin_count < 4L) { - if ((Laurel_Leaf_Pin_count == 0) || (Rnd.get(100) < 80)) + if ((Laurel_Leaf_Pin_count == 0) || (getRandom(100) < 80)) { for (int i = 0; i < 5; ++i) { - list[i] = Rnd.get(12); + list[i] = getRandom(12); } } else { - list[0] = 12 + Rnd.get(6); - list[1] = Rnd.get(12); - list[2] = Rnd.get(6); - list[3] = 6 + Rnd.get(6); - list[4] = Rnd.get(12); + list[0] = 12 + getRandom(6); + list[1] = getRandom(12); + list[2] = getRandom(6); + list[3] = 6 + getRandom(6); + list[4] = getRandom(12); } } - else if (Rnd.get(100) < 20) + else if (getRandom(100) < 20) { - list[0] = 12 + Rnd.get(6); - list[1] = Rnd.get(100) < 5 ? (18 + Rnd.get(3)) : Rnd.get(12); - list[2] = Rnd.get(6); - list[3] = 6 + Rnd.get(6); - list[4] = Rnd.get(12); + list[0] = 12 + getRandom(6); + list[1] = getRandom(100) < 5 ? (18 + getRandom(3)) : getRandom(12); + list[2] = getRandom(6); + list[3] = 6 + getRandom(6); + list[4] = getRandom(12); } else { - list[0] = Rnd.get(12); - list[1] = Rnd.get(100) < 5 ? (18 + Rnd.get(3)) : Rnd.get(12); - list[2] = Rnd.get(6); - list[3] = 6 + Rnd.get(6); - list[4] = Rnd.get(12); + list[0] = getRandom(12); + list[1] = getRandom(100) < 5 ? (18 + getRandom(3)) : getRandom(12); + list[2] = getRandom(6); + list[3] = 6 + getRandom(6); + list[4] = getRandom(12); } boolean sortFlag; do @@ -731,7 +730,7 @@ public class Q335_TheSongOfTheHunter extends Quest { for (int i = 2; i < itemCond.length; ++i) { - if ((npcId == itemCond[i][0]) && (Rnd.get(100) < itemCond[i][1]) && (st.getQuestItemsCount(itemCond[0][0]) < itemCond[1][0])) + if ((npcId == itemCond[i][0]) && (getRandom(100) < itemCond[i][1]) && (st.getQuestItemsCount(itemCond[0][0]) < itemCond[1][0])) { st.giveItems(itemCond[0][0], 1); } @@ -744,15 +743,15 @@ public class Q335_TheSongOfTheHunter extends Quest final long markasHeadCount = st.getQuestItemsCount(MARKAS_HEAD); if (npcId == BREKA_ORC_WARRIOR) { - if ((hakasHeadCount == 0) && (Rnd.get(100) < 10)) + if ((hakasHeadCount == 0) && (getRandom(100) < 10)) { st.addSpawn(BREKA_OVERLORD_HAKA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((jakasHeadCount == 0) && (Rnd.get(100) < 10)) + else if ((jakasHeadCount == 0) && (getRandom(100) < 10)) { st.addSpawn(BREKA_OVERLORD_JAKA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((markasHeadCount == 0) && (Rnd.get(100) < 10)) + else if ((markasHeadCount == 0) && (getRandom(100) < 10)) { st.addSpawn(BREKA_OVERLORD_MARKA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } @@ -778,7 +777,7 @@ public class Q335_TheSongOfTheHunter extends Quest st.giveItems(MARKAS_HEAD, 1); } } - else if ((npcId == WINDSUS) && (st.getQuestItemsCount(WINDSUS_ALEPH_SKIN) == 0) && (Rnd.get(100) < 10)) + else if ((npcId == WINDSUS) && (st.getQuestItemsCount(WINDSUS_ALEPH_SKIN) == 0) && (getRandom(100) < 10)) { st.addSpawn(WINDSUS_ALEPH, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } @@ -792,23 +791,23 @@ public class Q335_TheSongOfTheHunter extends Quest final long Kalaths_Head_count = st.getQuestItemsCount(KALATHS_HEAD); if (npcId == TARLK_BUGBEAR_WARRIOR) { - if ((Athus_Head_count == 0) && (Rnd.get(100) < 10)) + if ((Athus_Head_count == 0) && (getRandom(100) < 10)) { st.addSpawn(TARLK_RAIDER_ATHU, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((Lankas_Head_count == 0) && (Rnd.get(100) < 10)) + else if ((Lankas_Head_count == 0) && (getRandom(100) < 10)) { st.addSpawn(TARLK_RAIDER_LANKA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((Triskas_Head_count == 0) && (Rnd.get(100) < 10)) + else if ((Triskas_Head_count == 0) && (getRandom(100) < 10)) { st.addSpawn(TARLK_RAIDER_TRISKA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((Moturas_Head_count == 0) && (Rnd.get(100) < 10)) + else if ((Moturas_Head_count == 0) && (getRandom(100) < 10)) { st.addSpawn(TARLK_RAIDER_MOTURA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((Kalaths_Head_count == 0) && (Rnd.get(100) < 10)) + else if ((Kalaths_Head_count == 0) && (getRandom(100) < 10)) { st.addSpawn(TARLK_RAIDER_KALATH, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } @@ -858,7 +857,7 @@ public class Q335_TheSongOfTheHunter extends Quest { if (npcId == lizardmen_id) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { st.takeItems(Q_BLOOD_CRYSTAL[bloodCrystalLevel], -1); st.playSound((bloodCrystalLevel < 6) ? QuestState.SOUND_MIDDLE : QuestState.SOUND_JACKPOT); @@ -883,14 +882,14 @@ public class Q335_TheSongOfTheHunter extends Quest } if (request != null) { - if (request.droplist.containsKey(npcId) && (Rnd.get(100) < request.droplist.get(npcId)) && (st.getQuestItemsCount(request.request_item) < request.request_count)) + if (request.droplist.containsKey(npcId) && (getRandom(100) < request.droplist.get(npcId)) && (st.getQuestItemsCount(request.request_item) < request.request_count)) { st.giveItems(request.request_item, 1); } if (request.spawnlist.containsKey(npcId) && (st.getQuestItemsCount(request.request_item) < request.request_count)) { final int[] spawnChance = request.spawnlist.get(npcId); - if (Rnd.get(100) < spawnChance[1]) + if (getRandom(100) < spawnChance[1]) { st.addSpawn(spawnChance[0], npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); if (spawnChance[0] == 27149) @@ -901,7 +900,7 @@ public class Q335_TheSongOfTheHunter extends Quest } } } - if (((npcId == 27160) || (npcId == 27162) || (npcId == 27164)) && (Rnd.get(100) < 50)) + if (((npcId == 27160) || (npcId == 27162) || (npcId == 27164)) && (getRandom(100) < 50)) { npc.broadcastNpcSay("We'll take the property of the ancient empire!"); st.addSpawn(27150, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java index 1db4854182..11c71ac9de 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java @@ -16,7 +16,6 @@ */ package quests.Q336_CoinsOfMagic; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -352,7 +351,7 @@ public class Q336_CoinsOfMagic extends Quest final int npcId = npc.getNpcId(); if ((npcId == HARIT_LIZARDMAN_MATRIARCH) || (npcId == HARIT_LIZARDMAN_SHAMAN)) { - if ((cond == 2) && (Rnd.get(1000) < 63)) + if ((cond == 2) && (getRandom(1000) < 63)) { st.giveItems(KALDIS_COIN, 1); st.setCond(3); @@ -366,7 +365,7 @@ public class Q336_CoinsOfMagic extends Quest { if (e[0] == npcId) { - if (Rnd.get(100) < chance) + if (getRandom(100) < chance) { st.giveItems(e[1], 1); } @@ -378,9 +377,9 @@ public class Q336_CoinsOfMagic extends Quest { if (u == npcId) { - if (Rnd.get(100) < (chance * npc.getTemplate().getBaseHpConsumeRate())) + if (getRandom(100) < (chance * npc.getTemplate().getBaseHpConsumeRate())) { - st.giveItems(BASIC_COINS[Rnd.get(BASIC_COINS.length)], 1); + st.giveItems(BASIC_COINS[getRandom(BASIC_COINS.length)], 1); } return null; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java index 599aef5665..47284afa1a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java @@ -16,7 +16,6 @@ */ package quests.Q337_AudienceWithTheLandDragon; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -507,7 +506,7 @@ public class Q337_AudienceWithTheLandDragon extends Quest // reward jewel fragment if (percentHp < 33) { - if ((Rnd.get(100) < 33) && (st.getInt("drop" + npcInfo[2]) == 1)) + if ((getRandom(100) < 33) && (st.getInt("drop" + npcInfo[2]) == 1)) { final int itemId = npcInfo[3]; if (!st.hasQuestItems(itemId)) @@ -520,7 +519,7 @@ public class Q337_AudienceWithTheLandDragon extends Quest // spawn monsters and register spawned else if (percentHp < 66) { - if ((Rnd.get(100) < 33) && (st.getInt("drop" + npcInfo[2]) == 1)) + if ((getRandom(100) < 33) && (st.getInt("drop" + npcInfo[2]) == 1)) { boolean spawn; if (npcId == ABYSSAL_JEWEL_3) @@ -540,7 +539,7 @@ public class Q337_AudienceWithTheLandDragon extends Quest { for (int i = 0; i < npcInfo[4]; i++) { - final Npc mob = addSpawn(npcInfo[5], npc.getX() + Rnd.get(-150, 150), npc.getY() + Rnd.get(-150, 150), npc.getZ(), npc.getHeading(), true, 60000); + final Npc mob = addSpawn(npcInfo[5], npc.getX() + getRandom(-150, 150), npc.getY() + getRandom(-150, 150), npc.getZ(), npc.getHeading(), true, 60000); mob.setRunning(); ((Attackable) mob).addDamageHate(attacker, 0, 500); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker); @@ -631,7 +630,7 @@ public class Q337_AudienceWithTheLandDragon extends Quest { for (int i = 0; i < 8; i++) { - addSpawn(SACRIFICE_OF_THE_SACRIFICED, npc.getX() + Rnd.get(-100, 100), npc.getY() + Rnd.get(-100, 100), npc.getZ(), npc.getHeading(), true, 60000); + addSpawn(SACRIFICE_OF_THE_SACRIFICED, npc.getX() + getRandom(-100, 100), npc.getY() + getRandom(-100, 100), npc.getZ(), npc.getHeading(), true, 60000); } } break; @@ -639,11 +638,11 @@ public class Q337_AudienceWithTheLandDragon extends Quest case HARIT_LIZARDMAN_SHAMAN:// Kendra's request case HARIT_LIZARDMAN_MATRIARCH: { - if ((cond == 1) && (Rnd.get(5) == 0) && (st.getInt("drop2") == 1) && !st.hasQuestItems(TOTEM_OF_LAND_DRAGON)) + if ((cond == 1) && (getRandom(5) == 0) && (st.getInt("drop2") == 1) && !st.hasQuestItems(TOTEM_OF_LAND_DRAGON)) { for (int i = 0; i < 3; i++) { - addSpawn(HARIT_LIZARDMAN_ZEALOT, npc.getX() + Rnd.get(-50, 50), npc.getY() + Rnd.get(-50, 50), npc.getZ(), npc.getHeading(), true, 60000); + addSpawn(HARIT_LIZARDMAN_ZEALOT, npc.getX() + getRandom(-50, 50), npc.getY() + getRandom(-50, 50), npc.getZ(), npc.getHeading(), true, 60000); } } break; @@ -653,9 +652,9 @@ public class Q337_AudienceWithTheLandDragon extends Quest case CAVE_KEEPER_1: case CAVE_KEEPER_2: { - if ((cond == 4) && (Rnd.get(5) == 0) && !st.hasQuestItems(THIRD_FRAGMENT_OF_ABYSS_JEWEL)) + if ((cond == 4) && (getRandom(5) == 0) && !st.hasQuestItems(THIRD_FRAGMENT_OF_ABYSS_JEWEL)) { - addSpawn(ABYSSAL_JEWEL_3, npc.getX() + Rnd.get(-50, 50), npc.getY() + Rnd.get(-50, 50), npc.getZ(), npc.getHeading(), true, 60000); + addSpawn(ABYSSAL_JEWEL_3, npc.getX() + getRandom(-50, 50), npc.getY() + getRandom(-50, 50), npc.getZ(), npc.getHeading(), true, 60000); } break; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java index 22054d430a..3e1b531a63 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java @@ -16,7 +16,6 @@ */ package quests.Q343_UnderTheShadowOfTheIvoryTower; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -78,8 +77,8 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest return htmltext; } - final int random1 = Rnd.get(3); - final int random2 = Rnd.get(2); + final int random1 = getRandom(3); + final int random2 = getRandom(2); final int orbs = st.getQuestItemsCount(ORB); switch (event) { @@ -312,7 +311,7 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest if (st.getQuestItemsCount(ECTOPLASM) > 0) { st.takeItems(ECTOPLASM, 1); - final int random3 = Rnd.get(1000); + final int random3 = getRandom(1000); if (random3 <= 119) { st.giveItems(955, 1); @@ -323,11 +322,11 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest } else if (random3 <= 329) { - st.giveItems(2511, (Rnd.get(200) + 401)); + st.giveItems(2511, (getRandom(200) + 401)); } else if (random3 <= 559) { - st.giveItems(2510, (Rnd.get(200) + 401)); + st.giveItems(2510, (getRandom(200) + 401)); } else if (random3 <= 561) { @@ -435,7 +434,7 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest return null; } - if (Rnd.get(100) < CHANCE) + if (getRandom(100) < CHANCE) { st.giveItems(ORB, 1); st.playSound(QuestState.SOUND_ITEMGET); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java index c67a8c905d..88f638c2d4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java @@ -19,7 +19,6 @@ package quests.Q344_1000YearsTheEndOfLamentation; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -112,7 +111,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest st.giveItems(57, amount * 60); // Special item, % based on actual number of qItems. - if (Rnd.get(1000) < Math.min(10, Math.max(1, amount / 10))) + if (getRandom(1000) < Math.min(10, Math.max(1, amount / 10))) { htmltext = "30754-10.htm"; } @@ -121,7 +120,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest } case "30754-11.htm": { - final int random = Rnd.get(4); + final int random = getRandom(4); if (random < 1) { htmltext = "30754-12.htm"; @@ -218,7 +217,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest st.set("success", "1"); st.takeItems(CRUCIFIX, -1); - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance < 80) { st.giveItems(1875, 19); @@ -241,7 +240,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest st.set("success", "1"); st.takeItems(OLD_TOTEM, -1); - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance < 55) { st.giveItems(1882, 70); @@ -264,7 +263,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest st.set("success", "1"); st.takeItems(OLD_HILT, -1); - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance < 60) { st.giveItems(1874, 25); @@ -291,7 +290,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest st.set("success", "1"); st.takeItems(OLD_KEY, -1); - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance < 80) { st.giveItems(1879, 55); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java index 0ac8be8b54..bf1f019f6a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java @@ -16,7 +16,6 @@ */ package quests.Q345_MethodToRaiseTheDead; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -90,7 +89,7 @@ public class Q345_MethodToRaiseTheDead extends Quest { if (st.isCond(3)) { - final int chance = Rnd.get(3); + final int chance = getRandom(3); if (chance == 0) { st.setCond(6); @@ -194,7 +193,7 @@ public class Q345_MethodToRaiseTheDead extends Quest st.rewardItems(57, 3040 + amount); // Reward can be either an Imperial Diamond or bills. - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { st.giveItems(IMPERIAL_DIAMOND, 1); } @@ -254,9 +253,9 @@ public class Q345_MethodToRaiseTheDead extends Quest return null; } - if (Rnd.get(4) == 0) + if (getRandom(4) == 0) { - final int randomPart = Rnd.get(VICTIM_ARM_BONE, VICTIM_SPINE); + final int randomPart = getRandom(VICTIM_ARM_BONE, VICTIM_SPINE); if (!st.hasQuestItems(randomPart)) { st.playSound(QuestState.SOUND_ITEMGET); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java index e0f9c58ecd..a697cc5065 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java @@ -16,7 +16,6 @@ */ package quests.Q348_AnArrogantSearch; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -119,7 +118,7 @@ public class Q348_AnArrogantSearch extends Quest { st.setCond(24); st.playSound(QuestState.SOUND_MIDDLE); - st.rewardItems(57, Rnd.get(1, 2) * 12000); + st.rewardItems(57, getRandom(1, 2) * 12000); break; } case "30864-37.htm": @@ -823,7 +822,7 @@ public class Q348_AnArrogantSearch extends Quest case SEAL_ANGEL: case GUARDIAN_ANGEL: { - if (((cond == 26) || (cond == 29)) && (Rnd.get(4) < 1) && st.hasQuestItems(WHITE_FABRIC_ANGELS)) + if (((cond == 26) || (cond == 29)) && (getRandom(4) < 1) && st.hasQuestItems(WHITE_FABRIC_ANGELS)) { st.playSound(QuestState.SOUND_ITEMGET); st.takeItems(WHITE_FABRIC_ANGELS, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java index a0a980736a..5725db77a9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java @@ -16,7 +16,6 @@ */ package quests.Q351_BlackSwan; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -162,7 +161,7 @@ public class Q351_BlackSwan extends Quest return null; } - final int random = Rnd.get(4); + final int random = getRandom(4); if (random < 3) { st.dropItemsAlways(LIZARD_FANG, (random < 2) ? 1 : 2, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java index 08fe5e1a5c..9f940063c8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java @@ -16,7 +16,6 @@ */ package quests.Q352_HelpRoodRaiseANewPet; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -129,7 +128,7 @@ public class Q352_HelpRoodRaiseANewPet extends Quest } final int npcId = npc.getNpcId(); - final int random = Rnd.get(100); + final int random = getRandom(100); final int chance = ((npcId == 20786) || (npcId == 21644)) ? 44 : 58; if (random < chance) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java index 50c916fb9f..6ae4bbaf95 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java @@ -19,7 +19,6 @@ package quests.Q355_FamilyHonor; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -106,7 +105,7 @@ public class Q355_FamilyHonor extends Quest { st.takeItems(WORK_OF_BERONA, 1); - final int appraising = Rnd.get(100); + final int appraising = getRandom(100); if (appraising < 20) { htmltext = "30929-2.htm"; @@ -200,7 +199,7 @@ public class Q355_FamilyHonor extends Quest } final int[] chances = CHANCES.get(npc.getNpcId()); - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < chances[1]) { st.dropItemsAlways((random < chances[0]) ? GALIBREDO_BUST : WORK_OF_BERONA, 1, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java index 3e97eb7e97..a6a3eeea9b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java @@ -16,7 +16,6 @@ */ package quests.Q358_IllegitimateChildOfAGoddess; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -94,7 +93,7 @@ public class Q358_IllegitimateChildOfAGoddess extends Quest { htmltext = "30862-07.htm"; st.takeItems(SCALE, -1); - st.giveItems(REWARD[Rnd.get(REWARD.length)], 1); + st.giveItems(REWARD[getRandom(REWARD.length)], 1); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java index 39ad495c89..57b32813cd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java @@ -19,7 +19,6 @@ package quests.Q359_ForSleeplessDeadmen; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -80,7 +79,7 @@ public class Q359_ForSleeplessDeadmen extends Quest } else if (event.equals("30857-10.htm")) { - st.giveItems(REWARD[Rnd.get(REWARD.length)], 4); + st.giveItems(REWARD[getRandom(REWARD.length)], 4); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java index 7a29c22f31..1aaf4178d4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java @@ -16,7 +16,6 @@ */ package quests.Q364_JovialAccordion; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -78,7 +77,7 @@ public class Q364_JovialAccordion extends Quest if (st.hasQuestItems(KEY_2)) { st.takeItems(KEY_2, 1); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30960-02.htm"; st.giveItems(STOLEN_BEER, 1); @@ -92,7 +91,7 @@ public class Q364_JovialAccordion extends Quest if (st.hasQuestItems(KEY_1)) { st.takeItems(KEY_1, 1); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30961-02.htm"; st.giveItems(STOLEN_CLOTHES, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java index 6516dc37d3..3df348ca60 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java @@ -16,7 +16,6 @@ */ package quests.Q365_DevilsLegacy; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Npc; @@ -81,9 +80,9 @@ public class Q365_DevilsLegacy extends Quest st.takeItems(57, 600); int i0; - if (Rnd.get(100) < 80) + if (getRandom(100) < 80) { - i0 = Rnd.get(100); + i0 = getRandom(100); if (i0 < 1) { st.giveItems(955, 1); @@ -109,7 +108,7 @@ public class Q365_DevilsLegacy extends Quest } else { - i0 = Rnd.get(1000); + i0 = getRandom(1000); if (i0 < 10) { st.giveItems(951, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java index b15360a1d8..29acfb07f6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java @@ -16,7 +16,6 @@ */ package quests.Q367_ElectrifyingRecharge; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -157,7 +156,7 @@ public class Q367_ElectrifyingRecharge extends Quest { htmltext = "30673-06.htm"; st.takeItems(5879, 1); - st.rewardItems(REWARD[Rnd.get(REWARD.length)], 1); + st.rewardItems(REWARD[getRandom(REWARD.length)], 1); st.playSound(QuestState.SOUND_FINISH); } break; @@ -177,7 +176,7 @@ public class Q367_ElectrifyingRecharge extends Quest if ((skill.getId() == 4072) && st.hasQuestItems(LORAIN_LAMP)) { - final int randomItem = Rnd.get(5876, 5880); + final int randomItem = getRandom(5876, 5880); st.takeItems(LORAIN_LAMP, 1); st.giveItems(randomItem, 1); if (randomItem == 5879) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java index cdddfe20f6..11b6c57f82 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java @@ -19,7 +19,6 @@ package quests.Q371_ShriekOfGhosts; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -100,7 +99,7 @@ public class Q371_ShriekOfGhosts extends Quest { if (st.hasQuestItems(PORCELAIN)) { - final int chance = Rnd.get(100); + final int chance = getRandom(100); st.takeItems(PORCELAIN, 1); if (chance < 2) { @@ -200,7 +199,7 @@ public class Q371_ShriekOfGhosts extends Quest } final int[] chances = CHANCES.get(npc.getNpcId()); - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < chances[1]) { st.dropItemsAlways((random < chances[0]) ? URN : PORCELAIN, 1, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java index fa5645169f..486aec71ab 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java @@ -16,7 +16,6 @@ */ package quests.Q372_LegacyOfInsolence; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -221,7 +220,7 @@ public class Q372_LegacyOfInsolence extends Quest // Retrieve array with rewards. final int[][] rewards = REWARDS_MATRICE[rewardType]; - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] reward : rewards) { if (chance < reward[0]) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java index 18cb0a5c0b..3cf32e6016 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java @@ -19,7 +19,6 @@ package quests.Q373_SupplierOfReagents; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -240,7 +239,7 @@ public class Q373_SupplierOfReagents extends Quest continue; } - if (Rnd.get(100) < temperature[1]) + if (getRandom(100) < temperature[1]) { st.giveItems(formula[3], temperature[2]); return "31149-12-" + formula[3] + ".htm"; @@ -308,7 +307,7 @@ public class Q373_SupplierOfReagents extends Quest } else { - final int random = Rnd.get(1000); + final int random = getRandom(1000); if (random < drop[3]) { st.dropItemsAlways((random < drop[2]) ? drop[0] : drop[1], 1, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java index 16f50efdb2..3ddc42f0f8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java @@ -16,7 +16,6 @@ */ package quests.Q375_WhisperOfDreams_Part2; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -101,7 +100,7 @@ public class Q375_WhisperOfDreams_Part2 extends Quest st.playSound(QuestState.SOUND_MIDDLE); st.takeItems(KARIK_HORN, 100); st.takeItems(CAVE_HOWLER_SKULL, 100); - st.giveItems(REWARDS[Rnd.get(REWARDS.length)], 1); + st.giveItems(REWARDS[getRandom(REWARDS.length)], 1); } else { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java index e98dce4e16..a1c9ac94ac 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java @@ -16,7 +16,6 @@ */ package quests.Q376_ExplorationOfTheGiantsCave_Part1; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -232,7 +231,7 @@ public class Q376_ExplorationOfTheGiantsCave_Part1 extends Quest st.takeItems(book, 1); } - st.giveItems(RECIPES[type][Rnd.get(RECIPES[type].length)], 1); + st.giveItems(RECIPES[type][getRandom(RECIPES[type].length)], 1); return "31147-04.htm"; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java index 3eaa4061af..ffd7aeff38 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java @@ -16,7 +16,6 @@ */ package quests.Q377_ExplorationOfTheGiantsCave_Part2; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -150,7 +149,7 @@ public class Q377_ExplorationOfTheGiantsCave_Part2 extends Quest st.takeItems(book, 1); } - st.giveItems(RECIPES[type][Rnd.get(RECIPES[type].length)], 1); + st.giveItems(RECIPES[type][getRandom(RECIPES[type].length)], 1); return "31147-04.htm"; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java index d35582e72c..76867b5a90 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java @@ -16,7 +16,6 @@ */ package quests.Q379_FantasyWine; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -64,7 +63,7 @@ public class Q379_FantasyWine extends Quest { st.takeItems(LEAF, 80); st.takeItems(STONE, 100); - final int rand = Rnd.get(10); + final int rand = getRandom(10); if (rand < 3) { htmltext = "30074-6.htm"; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java index e2aa98ac47..f85b079807 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java @@ -16,7 +16,6 @@ */ package quests.Q380_BringOutTheFlavorOfIngredients; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -133,7 +132,7 @@ public class Q380_BringOutTheFlavorOfIngredients extends Quest else if (cond == 6) { st.giveItems(RITRON_JELLY, 1); - if (Rnd.get(100) < 55) + if (getRandom(100) < 55) { htmltext = "30069-11.htm"; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java index 88ecf29122..c0425c09ad 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java @@ -16,7 +16,6 @@ */ package quests.Q382_KailsMagicCoin; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -118,7 +117,7 @@ public class Q382_KailsMagicCoin extends Quest } case FALLEN_ORC_CAPTAIN: { - st.dropItems(5961 + Rnd.get(3), 1, 0, 100000); + st.dropItems(5961 + getRandom(3), 1, 0, 100000); break; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java index 031fdd0d8c..aa6f2fddd3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java @@ -16,7 +16,6 @@ */ package quests.Q383_SearchingForTreasure; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -101,7 +100,7 @@ public class Q383_SearchingForTreasure extends Quest // Adena reward. int i1 = 0; - int i0 = Rnd.get(100); + int i0 = getRandom(100); if (i0 < 5) { st.giveItems(2450, 1); @@ -123,7 +122,7 @@ public class Q383_SearchingForTreasure extends Quest i1 += 500; } - i0 = Rnd.get(1000); + i0 = getRandom(1000); if (i0 < 25) { st.giveItems(4481, 1); @@ -177,7 +176,7 @@ public class Q383_SearchingForTreasure extends Quest i1 += 300; } - i0 = Rnd.get(100); + i0 = getRandom(100); if (i0 < 4) { st.giveItems(1337, 1); @@ -211,7 +210,7 @@ public class Q383_SearchingForTreasure extends Quest i1 += 500; } - i0 = Rnd.get(100); + i0 = getRandom(100); if (i0 < 20) { st.giveItems(4408, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java index 5ba91a2b97..e60182bb5b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java @@ -19,7 +19,6 @@ package quests.Q384_WarehouseKeepersPastime; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -241,7 +240,7 @@ public class Q384_WarehouseKeepersPastime extends Quest { htmltext = getHtmlText(npcId + "-23.htm"); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] reward : ((st.get("bet") == "10") ? _rewards_10_win : _rewards_100_win)) { if (chance < reward[0]) @@ -259,7 +258,7 @@ public class Q384_WarehouseKeepersPastime extends Quest { htmltext = getHtmlText(npcId + "-25.htm"); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] reward : ((st.get("bet") == "10") ? _rewards_10_lose : _rewards_100_lose)) { if (chance < reward[0]) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java index 9a512c2616..00b95cdc26 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java @@ -19,7 +19,6 @@ package quests.Q386_StolenDignity; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -229,12 +228,12 @@ public class Q386_StolenDignity extends Quest if (winningLines == 3) { htmltext = getHtmlText("30843-22.htm"); - st.rewardItems(REWARDS[Rnd.get(REWARDS.length)], 4); + st.rewardItems(REWARDS[getRandom(REWARDS.length)], 4); } else if (winningLines == 0) { htmltext = getHtmlText("30843-24.htm"); - st.rewardItems(REWARDS[Rnd.get(REWARDS.length)], 10); + st.rewardItems(REWARDS[getRandom(REWARDS.length)], 10); } else { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java index 3bb9c6b842..baff70676d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java @@ -16,7 +16,6 @@ */ package quests.Q403_PathToARogue; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -241,7 +240,7 @@ public class Q403_PathToARogue extends Quest { if (st.isCond(5)) { - final int randomItem = Rnd.get(STOLEN_JEWELRY, STOLEN_NECKLACE); + final int randomItem = getRandom(STOLEN_JEWELRY, STOLEN_NECKLACE); if (!st.hasQuestItems(randomItem)) { st.giveItems(randomItem, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java index 323a42989f..23a3882db8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java @@ -16,7 +16,6 @@ */ package quests.Q414_PathToAnOrcRaider; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -231,7 +230,7 @@ public class Q414_PathToAnOrcRaider extends Quest { if (st.isCond(1)) { - if (st.getQuestItemsCount(GREEN_BLOOD) <= Rnd.get(20)) + if (st.getQuestItemsCount(GREEN_BLOOD) <= getRandom(20)) { st.playSound(QuestState.SOUND_ITEMGET); st.giveItems(GREEN_BLOOD, 1); @@ -254,7 +253,7 @@ public class Q414_PathToAnOrcRaider extends Quest } case UMBAR_ORC: { - if ((st.isCond(3) || st.isCond(4)) && (st.getQuestItemsCount(HEAD_OF_BETRAYER) < 2) && (Rnd.get(10) < 2)) + if ((st.isCond(3) || st.isCond(4)) && (st.getQuestItemsCount(HEAD_OF_BETRAYER) < 2) && (getRandom(10) < 2)) { if (st.isCond(3)) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java index 26be2ab500..6572c0011d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java @@ -16,7 +16,6 @@ */ package quests.Q416_PathToAnOrcShaman; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -464,7 +463,7 @@ public class Q416_PathToAnOrcShaman extends Quest if (st.isCond(9)) { final int count = st.getQuestItemsCount(DURKA_PARASITE); - final int rnd = Rnd.get(10); + final int rnd = getRandom(10); if (((count == 5) && (rnd < 1)) || (((count == 6) || (count == 7)) && (rnd < 2)) || (count >= 8)) { st.playSound(QuestState.SOUND_BEFORE_BATTLE); @@ -499,7 +498,7 @@ public class Q416_PathToAnOrcShaman extends Quest st.setCond(15); st.playSound(QuestState.SOUND_MIDDLE); - if (Rnd.get(3) < 2) + if (getRandom(3) < 2) { npc.broadcastNpcSay("My dear friend of " + player.getName() + ", who has gone on ahead of me!"); } @@ -514,7 +513,7 @@ public class Q416_PathToAnOrcShaman extends Quest st.setCond(17); st.playSound(QuestState.SOUND_MIDDLE); - if (Rnd.get(3) < 2) + if (getRandom(3) < 2) { npc.broadcastNpcSay("Listen to Tejakar Gandi, young Oroka! The spirit of the slain leopard is calling you, " + player.getName() + "!"); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java index d6aabebb4d..0820b2df4a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java @@ -16,7 +16,6 @@ */ package quests.Q417_PathToBecomeAScavenger; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -105,7 +104,7 @@ public class Q417_PathToBecomeAScavenger extends Quest } case "30519_1": { - final int random = Rnd.get(3); + final int random = getRandom(3); htmltext = "30519-0" + (random + 2) + ".htm"; st.setCond(2); st.playSound(QuestState.SOUND_MIDDLE); @@ -115,7 +114,7 @@ public class Q417_PathToBecomeAScavenger extends Quest } case "30519_2": { - final int random = Rnd.get(3); + final int random = getRandom(3); htmltext = "30519-0" + (random + 2) + ".htm"; st.takeItems(BRONK_PAY, -1); st.takeItems(SHARI_PAY, -1); @@ -154,7 +153,7 @@ public class Q417_PathToBecomeAScavenger extends Quest } case "30519-11.htm": { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30519-06.htm"; } @@ -474,7 +473,7 @@ public class Q417_PathToBecomeAScavenger extends Quest final int step = st.getInt("step"); if (step > 20) { - if (((step - 20) * 10) >= Rnd.get(100)) + if (((step - 20) * 10) >= getRandom(100)) { addSpawn(HONEY_BEAR, npc, false, 300000); st.unset("step"); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java index f6a44275b9..6832b4f12f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -259,7 +258,7 @@ public class Q419_GetAPet extends Quest if (answers < 10) { final String[] questions = st.getString("quiz").split(" "); - final int index = Rnd.get(questions.length - 1); + final int index = getRandom(questions.length - 1); final String question = questions[index]; if (questions.length > (10 - answers)) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java index 6887a54c62..5d37f0d601 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java @@ -16,7 +16,6 @@ */ package quests.Q420_LittleWing; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -225,7 +224,7 @@ public class Q420_LittleWing extends Quest { st.takeItems(FAIRY_DUST, 1); giveRandomPet(st, true); - if (Rnd.get(20) == 1) + if (getRandom(20) == 1) { st.giveItems(HATCHLING_SOFT_LEATHER, 1); } @@ -694,7 +693,7 @@ public class Q420_LittleWing extends Quest case 20598: case 20599: { - if (st.hasQuestItems(DELUXE_FAIRY_STONE) && (Rnd.get(100) < 30)) + if (st.hasQuestItems(DELUXE_FAIRY_STONE) && (getRandom(100) < 30)) { st.set("deluxestone", "2"); st.playSound(QuestState.SOUND_MIDDLE); @@ -735,7 +734,7 @@ public class Q420_LittleWing extends Quest private void giveRandomPet(QuestState st, boolean hasFairyDust) { int pet = DRAGONFLUTE_OF_TWILIGHT; - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (st.hasQuestItems(EGG_OF_DRAKE_EXARION)) { st.takeItems(EGG_OF_DRAKE_EXARION, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java index 27819e20bc..2ce5c8fb4b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java @@ -16,7 +16,6 @@ */ package quests.Q421_LittleWingsBigAdventure; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; @@ -260,7 +259,7 @@ public class Q421_LittleWingsBigAdventure extends Quest { for (Monster ghost : ((Monster) npc).getSpawnedMinions()) { - if (!ghost.isDead() && (Rnd.get(100) < 1)) + if (!ghost.isDead() && (getRandom(100) < 1)) { ghost.broadcastNpcSay("We must protect the fairy tree!"); } @@ -278,7 +277,7 @@ public class Q421_LittleWingsBigAdventure extends Quest if (isPet && (attacker.getPet().getControlItemId() == st.getInt("summonOid"))) { // Random luck is reached and you still have some leaves ; go further. - if ((Rnd.get(100) < 1) && st.hasQuestItems(FAIRY_LEAF)) + if ((getRandom(100) < 1) && st.hasQuestItems(FAIRY_LEAF)) { final int idMask = (int) Math.pow(2, (npc.getNpcId() - 27182) - 1); final int iCond = st.getInt("iCond"); @@ -312,7 +311,7 @@ public class Q421_LittleWingsBigAdventure extends Quest final Creature originalKiller = isPet ? killer.getPet() : killer; // Tree curses the killer. - if ((Rnd.get(100) < 30) && (originalKiller != null)) + if ((getRandom(100) < 30) && (originalKiller != null)) { final Skill skill = SkillTable.getInstance().getSkill(4243, 1); if ((skill != null) && (originalKiller.getFirstEffect(skill) == null)) @@ -324,7 +323,7 @@ public class Q421_LittleWingsBigAdventure extends Quest // Spawn 20 ghosts, attacking the killer. for (int i = 0; i < 20; i++) { - final Attackable newNpc = (Attackable) addSpawn(27189, npc.getX(), npc.getY(), npc.getZ(), Rnd.get(65536), true, 300000); + final Attackable newNpc = (Attackable) addSpawn(27189, npc.getX(), npc.getY(), npc.getZ(), getRandom(65536), true, 300000); newNpc.setRunning(); newNpc.addDamageHate(originalKiller, 0, 999); newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalKiller); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java index 9459350544..18c7e473ce 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java @@ -16,7 +16,6 @@ */ package quests.Q422_RepentYourSins; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; @@ -144,7 +143,7 @@ public class Q422_RepentYourSins extends Quest st.takeItems(PENITENT_MANACLES, 1); st.giveItems(LEFT_PENITENT_MANACLES, 1); - final int removePkAmount = Rnd.get(10) + 1; + final int removePkAmount = getRandom(10) + 1; // Player's PKs are lower than random amount ; finish the quest. if (player.getPkKills() <= removePkAmount) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java index 7b156237a4..01649d7430 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java @@ -19,7 +19,6 @@ package quests.Q426_QuestForFishingShot; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -412,7 +411,7 @@ public class Q426_QuestForFishingShot extends Quest drop = MOB_SPECIAL.get(npcId)[1]; } - if (Rnd.get(1000) <= chance) + if (getRandom(1000) <= chance) { drop++; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java index 529dc519a8..b8aa4ad5c7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Npc; @@ -158,7 +157,7 @@ public class Q501_ProofOfClanAlliance extends Quest } case "30757-03.htm": { - if (Rnd.get(10) > 5) + if (getRandom(10) > 5) { final QuestState st2 = getClanLeaderQuestState(player, npc); st.setState(State.STARTED); @@ -186,7 +185,7 @@ public class Q501_ProofOfClanAlliance extends Quest st.takeItems(ADENA, 10000); for (int[] coords : CHESTS_SPAWN) { - st.addSpawn(CHEST_IDS.get(Rnd.get(CHEST_IDS.size())), coords[0], coords[1], coords[2], 0, false, 0); + st.addSpawn(CHEST_IDS.get(getRandom(CHEST_IDS.size())), coords[0], coords[1], coords[2], 0, false, 0); } _isSpawned = true; @@ -457,7 +456,7 @@ public class Q501_ProofOfClanAlliance extends Quest { final int itemId = DROP.get(npcId); final List herbs = getHerbs(cl.getString("herbs")); - if ((Rnd.get(10) == 1) && !st.hasQuestItems(itemId) && !hasOtherItems(st, itemId) && !herbs.contains(itemId)) + if ((getRandom(10) == 1) && !st.hasQuestItems(itemId) && !hasOtherItems(st, itemId) && !herbs.contains(itemId)) { if (herbs.isEmpty()) { @@ -475,7 +474,7 @@ public class Q501_ProofOfClanAlliance extends Quest { final int chests = cl.getInt("chests"); final int bingo = cl.getInt("bingo"); - if ((((chests == 15) && (bingo == 3)) || ((chests == 14) && (bingo == 2)) || ((chests == 13) && (bingo == 1)) || ((chests == 12) && (bingo == 0))) || ((bingo < 4) && (Rnd.get(4) == 0))) + if ((((chests == 15) && (bingo == 3)) || ((chests == 14) && (bingo == 2)) || ((chests == 13) && (bingo == 1)) || ((chests == 12) && (bingo == 0))) || ((bingo < 4) && (getRandom(4) == 0))) { npc.broadcastNpcSay("##########Bingo!##########"); cl.set("bingo", String.valueOf(bingo + 1)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java index 5d570b59e6..81afe85039 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java @@ -16,7 +16,6 @@ */ package quests.Q503_PursuitOfClanAmbition; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -685,14 +684,14 @@ public class Q503_PursuitOfClanAmbition extends Quest final Npc coffer = addSpawn(COFFER, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 180000); coffer.broadcastNpcSay("Curse of the gods on the one that defiles the property of the empire!"); } - else if ((element[0] == GRAVE_GUARD) && (st.getQuestItemsCount(IMP_KEYS) < 6) && (Rnd.get(50) < chance)) + else if ((element[0] == GRAVE_GUARD) && (st.getQuestItemsCount(IMP_KEYS) < 6) && (getRandom(50) < chance)) { addSpawn(GRAVE_KEYMASTER, player.getX(), player.getY(), player.getZ(), player.getHeading(), true, 0); } } if ((item2 != 0) && (item3 != 0)) { - if (Rnd.get(4) == 0) + if (getRandom(4) == 0) { st.dropItems(item2, 1, maxCount, chance); } @@ -713,7 +712,7 @@ public class Q503_PursuitOfClanAmbition extends Quest { if ((npc.getMaxHp() / 2) > npc.getCurrentHp()) { - if (Rnd.get(100) < 4) + if (getRandom(100) < 4) { addSpawn(IMPERIAL_SLAVE, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java index 3756813fe3..2888693ba8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java @@ -16,7 +16,6 @@ */ package quests.Q601_WatchingEyes; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -72,7 +71,7 @@ public class Q601_WatchingEyes extends Quest { st.takeItems(PROOF_OF_AVENGER, -1); - final int random = Rnd.get(100); + final int random = getRandom(100); for (int[] element : REWARDS) { if (random < element[2]) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java index 1840a21e74..4986023024 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java @@ -16,7 +16,6 @@ */ package quests.Q602_ShadowOfLight; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -70,7 +69,7 @@ public class Q602_ShadowOfLight extends Quest { st.takeItems(EYE_OF_DARKNESS, -1); - final int random = Rnd.get(100); + final int random = getRandom(100); for (int[] element : REWARDS) { if (random < element[4]) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java index 5fd5a613e8..b668b740f1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java @@ -18,7 +18,6 @@ package quests.Q604_DaimonTheWhiteEyed_Part2; import java.util.logging.Level; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.RaidBossStatus; import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -130,7 +129,7 @@ public class Q604_DaimonTheWhiteEyed_Part2 extends Quest if (st.hasQuestItems(ESSENCE_OF_DAIMON)) { st.takeItems(ESSENCE_OF_DAIMON, 1); - st.rewardItems(REWARD_DYE[Rnd.get(REWARD_DYE.length)], 5); + st.rewardItems(REWARD_DYE[getRandom(REWARD_DYE.length)], 5); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } @@ -286,7 +285,7 @@ public class Q604_DaimonTheWhiteEyed_Part2 extends Quest if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE)) { // set temporarily spawn location (to provide correct behavior of RaidBoss.checkAndReturnToSpawn()) - // raid.getSpawn().setLoc(185900, -44000, -3160, Rnd.get(65536)); + // raid.getSpawn().setLoc(185900, -44000, -3160, getRandom(65536)); addSpawn(DAIMON_THE_WHITE_EYED, 185900, -44000, -3160, 100, false, 0); raid.broadcastNpcSay("Who called me?"); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java index c5ed251687..d3a502fa69 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java @@ -19,7 +19,6 @@ package quests.Q605_AllianceWithKetraOrcs; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -348,7 +347,7 @@ public class Q605_AllianceWithKetraOrcs extends Quest // Support for Q606. QuestState st = partyMember.getQuestState(Q606_WarWithVarkaSilenos.class.getSimpleName()); - if ((st != null) && Rnd.nextBoolean() && CHANCES_MANE.containsKey(npcId)) + if ((st != null) && getRandomBoolean() && CHANCES_MANE.containsKey(npcId)) { st.dropItems(VARKA_MANE, 1, 0, CHANCES_MANE.get(npcId)); return null; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java index 44ed5de638..27298a0f84 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java @@ -266,7 +266,7 @@ public class Q610_MagicalPowerOfWater_Part2 extends Quest if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE)) { // set temporarily spawn location (to provide correct behavior of RaidBoss.checkAndReturnToSpawn()) - // raid.getSpawn().setLoc(104771, -36993, -1149, Rnd.get(65536)); + // raid.getSpawn().setLoc(104771, -36993, -1149, getRandom(65536)); addSpawn(SOUL_OF_WATER_ASHUTAR, 104771, -36993, -1149, 100, false, 0); raid.broadcastNpcSay("You didn’t come into this world. You came out of it, like a wave from the ocean. You are not a stranger here."); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java index bad11c3e57..45de7655ad 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java @@ -19,7 +19,6 @@ package quests.Q611_AllianceWithVarkaSilenos; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -348,7 +347,7 @@ public class Q611_AllianceWithVarkaSilenos extends Quest // Support for Q612. QuestState st = partyMember.getQuestState(Q612_WarWithKetraOrcs.class.getSimpleName()); - if ((st != null) && Rnd.nextBoolean() && CHANCES_MOLAR.containsKey(npcId)) + if ((st != null) && getRandomBoolean() && CHANCES_MOLAR.containsKey(npcId)) { st.dropItems(MOLAR_OF_KETRA_ORC, 1, 0, CHANCES_MOLAR.get(npcId)); return null; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java index 9e5a60f43c..ba75aaadb5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java @@ -276,7 +276,7 @@ public class Q616_MagicalPowerOfFire_Part2 extends Quest if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE)) { // set temporarily spawn location (to provide correct behavior of RaidBoss.checkAndReturnToSpawn()) - // raid.getSpawn().setLoc(142624, -82285, -6491, Rnd.get(65536)); + // raid.getSpawn().setLoc(142624, -82285, -6491, getRandom(65536)); addSpawn(SOUL_OF_FIRE_NASTRON, 142624, -82285, -6491, 100, false, 0); raid.broadcastNpcSay("The fire you kindle for your enemy often burns yourself more than them."); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java index 94d51753b5..9f2edbdf0a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java @@ -19,7 +19,6 @@ package quests.Q617_GatherTheFlames; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -110,7 +109,7 @@ public class Q617_GatherTheFlames extends Quest { htmltext = "31539-07.htm"; st.takeItems(TORCH, 1000); - st.giveItems(REWARD[Rnd.get(REWARD.length)], 1); + st.giveItems(REWARD[getRandom(REWARD.length)], 1); } } else if (event.equals("31539-08.htm")) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java index a848794298..e81b26000d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java @@ -16,7 +16,6 @@ */ package quests.Q619_RelicsOfTheOldEmpire; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -88,7 +87,7 @@ public class Q619_RelicsOfTheOldEmpire extends Quest { htmltext = "31538-09.htm"; st.takeItems(RELICS, 1000); - st.giveItems(RCP_REWARDS[Rnd.get(RCP_REWARDS.length)], 1); + st.giveItems(RCP_REWARDS[getRandom(RCP_REWARDS.length)], 1); } else { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java index a43a1ac963..cba2e883eb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java @@ -16,7 +16,6 @@ */ package quests.Q620_FourGoblets; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.FourSepulchersManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -85,9 +84,9 @@ public class Q620_FourGoblets extends Quest if (event.equals("31452-05.htm")) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { - htmltext = (Rnd.nextBoolean()) ? "31452-03.htm" : "31452-04.htm"; + htmltext = (getRandomBoolean()) ? "31452-03.htm" : "31452-04.htm"; } } else if (event.equals("31452-06.htm")) @@ -134,7 +133,7 @@ public class Q620_FourGoblets extends Quest st.takeItems(SEALED_BOX, 1); if (!calculateBoxReward(st)) { - htmltext = (Rnd.nextBoolean()) ? "31454-09.htm" : "31454-10.htm"; + htmltext = (getRandomBoolean()) ? "31454-09.htm" : "31454-10.htm"; } else { @@ -183,7 +182,7 @@ public class Q620_FourGoblets extends Quest st.takeItems(SEALED_BOX, 1); if (!calculateBoxReward(st)) { - htmltext = (Rnd.nextBoolean()) ? "31919-04.htm" : "31919-05.htm"; + htmltext = (getRandomBoolean()) ? "31919-04.htm" : "31919-05.htm"; } else { @@ -303,7 +302,7 @@ public class Q620_FourGoblets extends Quest private static boolean calculateBoxReward(QuestState st) { boolean reward = false; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { st.giveItems(57, 10000); @@ -311,10 +310,10 @@ public class Q620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { st.giveItems(1884, 42); @@ -357,10 +356,10 @@ public class Q620_FourGoblets extends Quest } } - if (Rnd.get(1000) < 323) + if (getRandom(1000) < 323) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { st.giveItems(1888, 1); @@ -393,10 +392,10 @@ public class Q620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { st.giveItems(1878, 8); @@ -439,10 +438,10 @@ public class Q620_FourGoblets extends Quest } } - if (Rnd.get(1000) < 251) + if (getRandom(1000) < 251) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { st.giveItems(1887, 1); @@ -475,10 +474,10 @@ public class Q620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { st.giveItems(730, 1); @@ -493,10 +492,10 @@ public class Q620_FourGoblets extends Quest } } - if (Rnd.get(1000) < 5) + if (getRandom(1000) < 5) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { st.giveItems(729, 1); @@ -513,10 +512,10 @@ public class Q620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { st.giveItems(6698, 1); @@ -587,10 +586,10 @@ public class Q620_FourGoblets extends Quest } } - if (Rnd.get(1000) < 54) + if (getRandom(1000) < 54) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { st.giveItems(6688, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java index 55e0031efc..a9a132f31c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java @@ -16,7 +16,6 @@ */ package quests.Q621_EggDelivery; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -129,9 +128,9 @@ public class Q621_EggDelivery extends Quest } case "31584-02.htm": { - if (Rnd.get(5) < 1) + if (getRandom(5) < 1) { - st.rewardItems(RECIPES[Rnd.get(3)], 1); + st.rewardItems(RECIPES[getRandom(3)], 1); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java index 4692fe80cc..f7dda335cb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java @@ -16,7 +16,6 @@ */ package quests.Q622_SpecialtyLiquorDelivery; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -121,9 +120,9 @@ public class Q622_SpecialtyLiquorDelivery extends Quest } case "31267-02.htm": { - if (Rnd.get(5) < 1) + if (getRandom(5) < 1) { - st.giveItems(RECIPES[Rnd.get(RECIPES.length)], 1); + st.giveItems(RECIPES[getRandom(RECIPES.length)], 1); } else { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java index 7cbfd36775..cefd276664 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java @@ -16,7 +16,6 @@ */ package quests.Q623_TheFinestFood; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -72,7 +71,7 @@ public class Q623_TheFinestFood extends Quest st.takeItems(BUFFALO_MEAT, -1); st.takeItems(ANTELOPE_HORN, -1); - final int luck = Rnd.get(100); + final int luck = getRandom(100); if (luck < 11) { st.rewardItems(57, 25000); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java index cf09e35a99..ac7a73e2db 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java @@ -18,7 +18,6 @@ package quests.Q625_TheFinestIngredients_Part2; import java.util.logging.Level; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.RaidBossStatus; import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -131,7 +130,7 @@ public class Q625_TheFinestIngredients_Part2 extends Quest if (st.hasQuestItems(SPECIAL_YETI_MEAT)) { st.takeItems(SPECIAL_YETI_MEAT, 1); - st.rewardItems(REWARD_DYE[Rnd.get(REWARD_DYE.length)], 5); + st.rewardItems(REWARD_DYE[getRandom(REWARD_DYE.length)], 5); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } @@ -281,7 +280,7 @@ public class Q625_TheFinestIngredients_Part2 extends Quest if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE)) { // set temporarily spawn location (to provide correct behavior of RaidBoss.checkAndReturnToSpawn()) - // raid.getSpawn().setLoc(157117, -121939, -2397, Rnd.get(65536)); + // raid.getSpawn().setLoc(157117, -121939, -2397, getRandom(65536)); addSpawn(ICICLE_EMPEROR_BUMBALUMP, 157117, -121939, -2397, 100, false, 0); raid.broadcastNpcSay("I smell something delicious..."); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/SagasSuperClass.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/SagasSuperClass.java index e192bb27f1..c154412b6e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/SagasSuperClass.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/SagasSuperClass.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.Party; @@ -523,7 +522,7 @@ public class SagasSuperClass extends Quest if (st.getInt("Quest0") == 0) { startQuestTimer("Mob_2 Timer 3", 13000, npc, player); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { npc.broadcastNpcSay(_text[9].replace("PLAYERNAME", player.getName())); } @@ -1004,7 +1003,7 @@ public class SagasSuperClass extends Quest } if (!partyQuestMembers.isEmpty()) { - final QuestState st2 = partyQuestMembers.get(Rnd.get(partyQuestMembers.size())); + final QuestState st2 = partyQuestMembers.get(getRandom(partyQuestMembers.size())); giveHallishaMark(st2); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java index 4650538edc..32203966e2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java @@ -17,7 +17,6 @@ package teleports.GrandBossTeleporters; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -117,8 +116,8 @@ public class GrandBossTeleporters extends Quest { zone.allowPlayerEntry(player, 30); } - final int x = 179700 + Rnd.get(700); - final int y = 113800 + Rnd.get(2100); + final int x = 179700 + getRandom(700); + final int y = 113800 + getRandom(2100); player.teleToLocation(x, y, -7709); if (status == 0) { @@ -134,8 +133,8 @@ public class GrandBossTeleporters extends Quest } else if (npcId == 31859) // antharas teleport cube { - final int x = 79800 + Rnd.get(600); - final int y = 151200 + Rnd.get(1100); + final int x = 79800 + getRandom(600); + final int y = 151200 + getRandom(1100); player.teleToLocation(x, y, -3534); } else if (npcId == 31385) // heart of volcano @@ -159,8 +158,8 @@ public class GrandBossTeleporters extends Quest { zone.allowPlayerEntry(player, 30); } - final int x = 204328 + Rnd.get(600); - final int y = -111874 + Rnd.get(600); + final int x = 204328 + getRandom(600); + final int y = -111874 + getRandom(600); player.teleToLocation(x, y, 70); playerCount++; if (status == 0) @@ -226,8 +225,8 @@ public class GrandBossTeleporters extends Quest } else if (npcId == 31759) // valakas teleport cube { - final int x = 150037 + Rnd.get(500); - final int y = -57720 + Rnd.get(500); + final int x = 150037 + getRandom(500); + final int y = -57720 + getRandom(500); player.teleToLocation(x, y, -2976); } return htmltext; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java index 6354fc016c..30216ee57f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java @@ -16,7 +16,6 @@ */ package teleports.OracleTeleport; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -278,7 +277,7 @@ public class OracleTeleport extends Quest } else { - final Location loc = RETURN_LOCS[Rnd.get(RETURN_LOCS.length)]; + final Location loc = RETURN_LOCS[getRandom(RETURN_LOCS.length)]; player.teleToLocation(loc.getX(), loc.getY(), loc.getZ()); htmltext = "rift_back_unknown.htm"; player.setIn7sDungeon(false); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java index f8e2bab489..90d2fba6c8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java @@ -16,7 +16,6 @@ */ package teleports.ToIVortexExit; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -44,23 +43,23 @@ public class ToIVortexExit extends Quest int x; int y; int z; - final int chance = Rnd.get(3); + final int chance = getRandom(3); if (chance == 0) { - x = 108784 + Rnd.get(100); - y = 16000 + Rnd.get(100); + x = 108784 + getRandom(100); + y = 16000 + getRandom(100); z = -4928; } else if (chance == 1) { - x = 113824 + Rnd.get(100); - y = 10448 + Rnd.get(100); + x = 113824 + getRandom(100); + y = 10448 + getRandom(100); z = -5164; } else { - x = 115488 + Rnd.get(100); - y = 22096 + Rnd.get(100); + x = 115488 + getRandom(100); + y = 22096 + getRandom(100); z = -5168; } player.teleToLocation(x, y, z); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java index 01442b6c2f..09835042af 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java @@ -16,7 +16,6 @@ */ package ai.areas.HotSprings; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; @@ -56,12 +55,12 @@ public class HotSprings extends Quest @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) { - if (Rnd.get(100) < DISEASE_CHANCE) + if (getRandom(100) < DISEASE_CHANCE) { tryToInfect(npc, attacker, MALARIA); } - if (Rnd.get(100) < DISEASE_CHANCE) + if (getRandom(100) < DISEASE_CHANCE) { switch (npc.getNpcId()) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java index d98e89d0bc..d9d857e0db 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -510,7 +509,7 @@ public class Antharas extends Quest // Move at random. if (FWA_MOVEATRANDOM) { - final Location pos = new Location(Rnd.get(175000, 178500), Rnd.get(112400, 116000), -7707, 0); + final Location pos = new Location(getRandom(175000, 178500), getRandom(112400, 116000), -7707, 0); _moveAtRandomTask = ThreadPool.schedule(new MoveAtRandom(_antharas, pos), 500); } if (_socialTask != null) @@ -549,7 +548,7 @@ public class Antharas extends Quest { NpcTemplate template1; Spawn tempSpawn; - final boolean isBehemoth = Rnd.get(100) < FWA_PERCENTOFBEHEMOTH; + final boolean isBehemoth = getRandom(100) < FWA_PERCENTOFBEHEMOTH; try { final int mobNumber = (isBehemoth ? 2 : 3); @@ -567,7 +566,7 @@ public class Antharas extends Quest } else { - npcId = Rnd.get(29070, 29076); + npcId = getRandom(29070, 29076); } template1 = NpcTable.getInstance().getTemplate(npcId); tempSpawn = new Spawn(template1); @@ -579,8 +578,8 @@ public class Antharas extends Quest int dt = ((_antharas.getX() - x) * (_antharas.getX() - x)) + ((_antharas.getY() - y) * (_antharas.getY() - y)); while ((tried++ < 25) && notFound) { - final int rx = Rnd.get(175000, 179900); - final int ry = Rnd.get(112400, 116000); + final int rx = getRandom(175000, 179900); + final int ry = getRandom(112400, 116000); final int rdt = ((_antharas.getX() - rx) * (_antharas.getX() - rx)) + ((_antharas.getY() - ry) * (_antharas.getY() - ry)); final Location randomLocation = new Location(rx, ry, -7704); if (GeoEngine.getInstance().canSeeLocation(_antharas, randomLocation) && (rdt < dt)) @@ -915,7 +914,7 @@ public class Antharas extends Quest npc.broadcastPacket(new PlaySound(1, "BS01_D", npc)); _cubeSpawnTask = ThreadPool.schedule(new CubeSpawn(0), 10000); GrandBossManager.getInstance().setBossStatus(npc.getNpcId(), DEAD); - final long respawnTime = (Config.ANTHARAS_RESP_FIRST + Rnd.get(Config.ANTHARAS_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.ANTHARAS_RESP_FIRST + getRandom(Config.ANTHARAS_RESP_SECOND)) * 3600000; ThreadPool.schedule(new UnlockAntharas(npc.getNpcId()), respawnTime); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(npc.getNpcId()); @@ -924,8 +923,8 @@ public class Antharas extends Quest } else if (npc.getNpcId() == 29069) { - final int hpHerbCount = Rnd.get(6, 18); - final int mpHerbCount = Rnd.get(6, 18); + final int hpHerbCount = getRandom(6, 18); + final int mpHerbCount = getRandom(6, 18); for (int i = 0; i < hpHerbCount; i++) { ((Monster) npc).dropItem(killer, 8602, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java index 752e155bac..ec7defc852 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -403,7 +402,7 @@ public class Baium extends Quest // Spawn the "Teleportation Cubic" for 15 minutes (to allow players to exit the lair). addSpawn(29055, 115203, 16620, 10078, 0, false, 900000); // Should we teleport everyone out if the cubic despawns?? // Lock baium for 5 days and 1 to 8 hours [i.e. 432,000,000 + 1*3,600,000 + random-less-than(8*3,600,000) millisecs] - final long respawnTime = (Config.BAIUM_RESP_FIRST + Rnd.get(Config.BAIUM_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.BAIUM_RESP_FIRST + getRandom(Config.BAIUM_RESP_SECOND)) * 3600000; GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, DEAD); startQuestTimer("baium_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. @@ -535,11 +534,11 @@ public class Baium extends Quest int skill; if (npc.getCurrentHp() > ((npc.getMaxHp() * 3) / 4.0)) { - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { skill = 4128; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4129; } @@ -550,15 +549,15 @@ public class Baium extends Quest } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 2) / 4.0)) { - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { skill = 4131; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4128; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4129; } @@ -569,19 +568,19 @@ public class Baium extends Quest } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 1) / 4.0)) { - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { skill = 4130; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4131; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4128; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4129; } @@ -590,19 +589,19 @@ public class Baium extends Quest skill = 4127; } } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4130; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4131; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4128; } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = 4129; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java index 1590278634..a7f885a373 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java @@ -19,7 +19,6 @@ package ai.bosses; import java.util.Collection; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.ChatType; @@ -282,9 +281,9 @@ public class Benom extends Quest } case "Talk": { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, "Benom", TALK[Rnd.get(4)])); + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, "Benom", TALK[getRandom(4)])); } break; } @@ -308,8 +307,8 @@ public class Benom extends Quest { if (castleOwner == clanId) { - final int x = 12558 + (Rnd.get(200) - 100); - final int y = -49279 + (Rnd.get(200) - 100); + final int x = 12558 + (getRandom(200) - 100); + final int y = -49279 + (getRandom(200) - 100); player.teleToLocation(x, y, -3007); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java index 7ea377be3c..e5c40db9a3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; @@ -154,7 +153,7 @@ public class Core extends Quest for (Entry spawn : MINNION_SPAWNS.entrySet()) { spawnLocation = spawn.getValue(); - mob = (Attackable) addSpawn(spawn.getKey(), spawnLocation.getX(), spawnLocation.getY(), spawnLocation.getZ(), Rnd.get(61794), false, 0); + mob = (Attackable) addSpawn(spawn.getKey(), spawnLocation.getX(), spawnLocation.getY(), spawnLocation.getZ(), getRandom(61794), false, 0); _minions.add(mob); } } @@ -202,7 +201,7 @@ public class Core extends Quest { if (_firstAttacked) { - if (Rnd.get(100) == 0) + if (getRandom(100) == 0) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Removing intruders.")); } @@ -233,7 +232,7 @@ public class Core extends Quest addSpawn(31842, 18948, 110166, -6397, 0, false, 900000); GrandBossManager.getInstance().setBossStatus(CORE, DEAD); // Calculate Min and Max respawn times randomly. - final long respawnTime = (Config.CORE_RESP_FIRST + Rnd.get(Config.CORE_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.CORE_RESP_FIRST + getRandom(Config.CORE_RESP_SECOND)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java index 74f768612c..959579ebfc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -780,8 +779,8 @@ public class Frintezza extends Quest _scarletDummy = null; startQuestTimer("camera_23", 2000, _weakScarlet, null); startQuestTimer("start_pc", 2000, _weakScarlet, null); - startQuestTimer("songs_play", 10000 + Rnd.get(10000), _frintezza, null); - startQuestTimer("skill01", 10000 + Rnd.get(10000), _weakScarlet, null); + startQuestTimer("songs_play", 10000 + getRandom(10000), _frintezza, null); + startQuestTimer("skill01", 10000 + getRandom(10000), _weakScarlet, null); break; } case "camera_23": @@ -891,8 +890,8 @@ public class Frintezza extends Quest startQuestTimer("morph_end", 6000, _weakScarlet, null); startQuestTimer("start_pc", 3000, _weakScarlet, null); startQuestTimer("start_npc", 3000, _weakScarlet, null); - startQuestTimer("songs_play", 10000 + Rnd.get(10000), _frintezza, null); - startQuestTimer("skill02", 10000 + Rnd.get(10000), _weakScarlet, null); + startQuestTimer("songs_play", 10000 + getRandom(10000), _frintezza, null); + startQuestTimer("skill02", 10000 + getRandom(10000), _weakScarlet, null); break; } case "morph_05a": @@ -990,8 +989,8 @@ public class Frintezza extends Quest startQuestTimer("morph_end", 9000, _strongScarlet, null); startQuestTimer("start_pc", 6000, _strongScarlet, null); startQuestTimer("start_npc", 6000, _strongScarlet, null); - startQuestTimer("songs_play", 10000 + Rnd.get(10000), _frintezza, null); - startQuestTimer("skill03", 10000 + Rnd.get(10000), _strongScarlet, null); + startQuestTimer("songs_play", 10000 + getRandom(10000), _frintezza, null); + startQuestTimer("skill03", 10000 + getRandom(10000), _strongScarlet, null); break; } case "morph_16": @@ -1035,7 +1034,7 @@ public class Frintezza extends Quest { if ((_frintezza != null) && !_frintezza.isDead() && (_onMorph == 0)) { - _onSong = Rnd.get(1, 5); + _onSong = getRandom(1, 5); // To fix skill exception. if (_onSong == 3) { @@ -1081,34 +1080,34 @@ public class Frintezza extends Quest // Like L2OFF the skill name is printed on screen. _zone.broadcastPacket(new ExShowScreenMessage(songName, 6000)); - if ((_onSong == 1) && (_thirdMorph == 1) && (_strongScarlet.getCurrentHp() < (_strongScarlet.getMaxHp() * 0.6)) && (Rnd.get(100) < 80)) + if ((_onSong == 1) && (_thirdMorph == 1) && (_strongScarlet.getCurrentHp() < (_strongScarlet.getMaxHp() * 0.6)) && (getRandom(100) < 80)) { _zone.broadcastPacket(new MagicSkillUse(_frintezza, _frintezza, 5007, 1, 32000, 0)); startQuestTimer("songs_effect", 5000, _frintezza, null); - startQuestTimer("songs_play", 32000 + Rnd.get(10000), _frintezza, null); + startQuestTimer("songs_play", 32000 + getRandom(10000), _frintezza, null); } else if ((_onSong == 2) || (_onSong == 3)) { _zone.broadcastPacket(new MagicSkillUse(_frintezza, _frintezza, 5007, _onSong, 32000, 0)); startQuestTimer("songs_effect", 5000, _frintezza, null); - startQuestTimer("songs_play", 32000 + Rnd.get(10000), _frintezza, null); + startQuestTimer("songs_play", 32000 + getRandom(10000), _frintezza, null); } else if ((_onSong == 4) && (_secondMorph == 1)) { _zone.broadcastPacket(new MagicSkillUse(_frintezza, _frintezza, 5007, 4, 31000, 0)); startQuestTimer("songs_effect", 5000, _frintezza, null); - startQuestTimer("songs_play", 31000 + Rnd.get(10000), _frintezza, null); + startQuestTimer("songs_play", 31000 + getRandom(10000), _frintezza, null); } else if ((_onSong == 5) && (_thirdMorph == 1) && (_abnormal == 0)) { _abnormal = 1; _zone.broadcastPacket(new MagicSkillUse(_frintezza, _frintezza, 5007, 5, 35000, 0)); startQuestTimer("songs_effect", 5000, _frintezza, null); - startQuestTimer("songs_play", 35000 + Rnd.get(10000), _frintezza, null); + startQuestTimer("songs_play", 35000 + getRandom(10000), _frintezza, null); } else { - startQuestTimer("songs_play", 5000 + Rnd.get(5000), _frintezza, null); + startQuestTimer("songs_play", 5000 + getRandom(5000), _frintezza, null); } } break; @@ -1165,7 +1164,7 @@ public class Frintezza extends Quest { for (Creature creature : _zone.getCharactersInside()) { - if ((creature instanceof Player) && (Rnd.get(100) < 80)) + if ((creature instanceof Player) && (getRandom(100) < 80)) { skill.applyEffects(_frintezza, creature, false, false, false); creature.sendPacket(new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU).addSkillName(5008, 4)); @@ -1176,7 +1175,7 @@ public class Frintezza extends Quest { for (Creature creature : _zone.getCharactersInside()) { - if ((creature instanceof Player) && (Rnd.get(100) < 70)) + if ((creature instanceof Player) && (getRandom(100) < 70)) { creature.abortAttack(); creature.abortCast(); @@ -1253,7 +1252,7 @@ public class Frintezza extends Quest { if ((_weakScarlet != null) && !_weakScarlet.isDead() && (_secondMorph == 0) && (_thirdMorph == 0) && (_onMorph == 0)) { - final int i = Rnd.get(0, 1); + final int i = getRandom(0, 1); final Skill skill = SkillTable.getInstance().getSkill(SKILLS[i][0], SKILLS[i][1]); if (skill != null) { @@ -1261,7 +1260,7 @@ public class Frintezza extends Quest // weakScarlet.setCastingNow(true); _weakScarlet.doCast(skill); } - startQuestTimer("skill01", SKILLS[i][2] + 5000 + Rnd.get(10000), npc, null); + startQuestTimer("skill01", SKILLS[i][2] + 5000 + getRandom(10000), npc, null); } break; } @@ -1272,11 +1271,11 @@ public class Frintezza extends Quest int i = 0; if (_abnormal == 0) { - i = Rnd.get(2, 5); + i = getRandom(2, 5); } else { - i = Rnd.get(2, 4); + i = getRandom(2, 4); } final Skill skill = SkillTable.getInstance().getSkill(SKILLS[i][0], SKILLS[i][1]); @@ -1286,7 +1285,7 @@ public class Frintezza extends Quest // weakScarlet.setCastingNow(true); _weakScarlet.doCast(skill); } - startQuestTimer("skill02", SKILLS[i][2] + 5000 + Rnd.get(10000), npc, null); + startQuestTimer("skill02", SKILLS[i][2] + 5000 + getRandom(10000), npc, null); if (i == 5) { _abnormal = 1; @@ -1302,11 +1301,11 @@ public class Frintezza extends Quest int i = 0; if (_abnormal == 0) { - i = Rnd.get(6, 10); + i = getRandom(6, 10); } else { - i = Rnd.get(6, 9); + i = getRandom(6, 9); } final Skill skill = SkillTable.getInstance().getSkill(SKILLS[i][0], SKILLS[i][1]); @@ -1316,7 +1315,7 @@ public class Frintezza extends Quest // strongScarlet.setCastingNow(true); _strongScarlet.doCast(skill); } - startQuestTimer("skill03", SKILLS[i][2] + 5000 + Rnd.get(10000), npc, null); + startQuestTimer("skill03", SKILLS[i][2] + 5000 + getRandom(10000), npc, null); if (i == 10) { _abnormal = 1; @@ -1458,8 +1457,8 @@ public class Frintezza extends Quest { if (npc.getNpcId() == CUBE) { - final int x = 150037 + Rnd.get(500); - final int y = -57720 + Rnd.get(500); + final int x = 150037 + getRandom(500); + final int y = -57720 + getRandom(500); player.teleToLocation(x, y, -2976); return null; } @@ -1539,7 +1538,7 @@ public class Frintezza extends Quest } _playersInside.add(member); _zone.allowPlayerEntry(member, 300); - member.teleToLocation(INVADE_LOC[_locCycle][0] + Rnd.get(50), INVADE_LOC[_locCycle][1] + Rnd.get(50), INVADE_LOC[_locCycle][2]); + member.teleToLocation(INVADE_LOC[_locCycle][0] + getRandom(50), INVADE_LOC[_locCycle][1] + getRandom(50), INVADE_LOC[_locCycle][2]); } if (_playersInside.size() > 45) { @@ -1580,7 +1579,7 @@ public class Frintezza extends Quest } _zone.allowPlayerEntry(member, 300); - member.teleToLocation(INVADE_LOC[_locCycle][0] + Rnd.get(50), INVADE_LOC[_locCycle][1] + Rnd.get(50), INVADE_LOC[_locCycle][2]); + member.teleToLocation(INVADE_LOC[_locCycle][0] + getRandom(50), INVADE_LOC[_locCycle][1] + getRandom(50), INVADE_LOC[_locCycle][2]); } _locCycle++; @@ -1597,7 +1596,7 @@ public class Frintezza extends Quest _playersInside.add(player); } _zone.allowPlayerEntry(player, 300); - player.teleToLocation(INVADE_LOC[_locCycle][0] + Rnd.get(50), INVADE_LOC[_locCycle][1] + Rnd.get(50), INVADE_LOC[_locCycle][2]); + player.teleToLocation(INVADE_LOC[_locCycle][0] + getRandom(50), INVADE_LOC[_locCycle][1] + getRandom(50), INVADE_LOC[_locCycle][2]); } } else @@ -1629,7 +1628,7 @@ public class Frintezza extends Quest } _playersInside.add(member); _zone.allowPlayerEntry(member, 300); - member.teleToLocation(INVADE_LOC[_locCycle][0] + Rnd.get(50), INVADE_LOC[_locCycle][1] + Rnd.get(50), INVADE_LOC[_locCycle][2]); + member.teleToLocation(INVADE_LOC[_locCycle][0] + getRandom(50), INVADE_LOC[_locCycle][1] + getRandom(50), INVADE_LOC[_locCycle][2]); } if (_playersInside.size() > 45) { @@ -1693,7 +1692,7 @@ public class Frintezza extends Quest _onCheck = 1; startQuestTimer("check_hp", 0, npc, null); } - else if (((npc.getNpcId() == 29050) || (npc.getNpcId() == 29051)) && (_bomber == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.1)) && (Rnd.get(100) < 30)) + else if (((npc.getNpcId() == 29050) || (npc.getNpcId() == 29051)) && (_bomber == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.1)) && (getRandom(100) < 30)) { _bomber = 1; startQuestTimer("bomber", 3000, npc, null); @@ -1740,7 +1739,7 @@ public class Frintezza extends Quest startQuestTimer("minions_despawn", 60000, npc, null); startQuestTimer("remove_players", 900000, npc, null); GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DEAD); - final long respawnTime = (Config.FRINTEZZA_RESP_FIRST + Rnd.get(Config.FRINTEZZA_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.FRINTEZZA_RESP_FIRST + getRandom(Config.FRINTEZZA_RESP_SECOND)) * 3600000; startQuestTimer("frintezza_unlock", respawnTime, npc, null); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java index 477a0cfb4f..9f74b7a401 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java @@ -18,7 +18,6 @@ package ai.bosses; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -208,7 +207,7 @@ public class Orfen extends Quest npc.teleToLocation(43577, 15985, -4396); startQuestTimer("ORFEN_REFRESH", 10000, npc, null); } - else if (npc.isInsideRadius2D(attacker, 1000) && !npc.isInsideRadius2D(attacker, 300) && (Rnd.get(10) == 0)) + else if (npc.isInsideRadius2D(attacker, 1000) && !npc.isInsideRadius2D(attacker, 300) && (getRandom(10) == 0)) { attacker.teleToLocation(npc.getX(), npc.getY(), npc.getZ()); npc.setTarget(attacker); @@ -231,7 +230,7 @@ public class Orfen extends Quest npc.broadcastPacket(new PlaySound(1, "BS02_D", npc)); GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD); // Time is 48hour +/- 20hour. - final long respawnTime = (Config.ORFEN_RESP_FIRST + Rnd.get(Config.ORFEN_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.ORFEN_RESP_FIRST + getRandom(Config.ORFEN_RESP_SECOND)) * 3600000; cancelQuestTimer("ORFEN_REFRESH", npc, null); startQuestTimer("ORFEN_SPAWN", respawnTime, null, null); // Also save the respawn time so that the info is maintained past restarts. diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java index 2b8345026a..dfa3a34e80 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java @@ -21,7 +21,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -150,7 +149,7 @@ public class QueenAnt extends Quest startQuestTimer("CHECK_MINIONS_ZONE", 30000, npc, null, true); startQuestTimer("HEAL", 1000, null, null, true); _queen = npc; - _larva = (Monster) addSpawn(LARVA, -21600, 179482, -5846, Rnd.get(360), false, 0); + _larva = (Monster) addSpawn(LARVA, -21600, 179482, -5846, getRandom(360), false, 0); _larva.setUnkillable(true); _larva.setImmobilized(true); _larva.setPhysicalAttackMuted(true); @@ -265,9 +264,9 @@ public class QueenAnt extends Quest } case ACTION: { - if (Rnd.get(3) == 0) + if (getRandom(3) == 0) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { npc.broadcastPacket(new SocialAction(npc.getObjectId(), 3)); } @@ -359,7 +358,7 @@ public class QueenAnt extends Quest npc.broadcastPacket(new PlaySound(1, "BS02_D", npc)); GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD); // Time is 36hour +/- 17hour. - final long respawnTime = (Config.QA_RESP_FIRST + Rnd.get(Config.QA_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.QA_RESP_FIRST + getRandom(Config.QA_RESP_SECOND)) * 3600000; startQuestTimer("QUEEN_SPAWN", respawnTime, null, null); startQuestTimer("LARVA_DESPAWN", 4 * 60 * 60 * 1000, null, null); cancelQuestTimer("ACTION", npc, null); @@ -388,7 +387,7 @@ public class QueenAnt extends Quest if (npcId == ROYAL) { - startQuestTimer("RESPAWN_ROYAL", (Config.QA_RESP_ROYAL + Rnd.get(40)) * 1000, npc, null); + startQuestTimer("RESPAWN_ROYAL", (Config.QA_RESP_ROYAL + getRandom(40)) * 1000, npc, null); } else // if (npcId == NURSE) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Tyrannosaurus.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Tyrannosaurus.java index fec6e13143..5960a42cbb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Tyrannosaurus.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Tyrannosaurus.java @@ -17,7 +17,6 @@ package ai.bosses; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.SpawnTable; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -57,7 +56,7 @@ public class Tyrannosaurus extends Quest { super(-1, "ai/bosses"); addKillId(TREX); - addSpawn(TREX[Rnd.get(TREX.length)], SPAWNS[Rnd.get(SPAWNS.length)], false, 0); + addSpawn(TREX[getRandom(TREX.length)], SPAWNS[getRandom(SPAWNS.length)], false, 0); } @Override @@ -66,7 +65,7 @@ public class Tyrannosaurus extends Quest final Spawn spawn = npc.getSpawn(); spawn.stopRespawn(); SpawnTable.getInstance().deleteSpawn(spawn, false); - ThreadPool.schedule(() -> addSpawn(TREX[Rnd.get(TREX.length)], SPAWNS[Rnd.get(SPAWNS.length)], false, 0), 1800000); + ThreadPool.schedule(() -> addSpawn(TREX[getRandom(TREX.length)], SPAWNS[getRandom(SPAWNS.length)], false, 0), 1800000); return super.onKill(npc, killer, isPet); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java index c1a034820d..8abf66d71a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java @@ -23,7 +23,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -426,21 +425,21 @@ public class Valakas extends Quest { if (((damage * 1000) + 1000) > i_quest2) { - i_quest2 = ((damage * 1000) + Rnd.get(3000)); + i_quest2 = ((damage * 1000) + getRandom(3000)); } } else if (attacker == c_quest3) { if (((damage * 1000) + 1000) > i_quest3) { - i_quest3 = ((damage * 1000) + Rnd.get(3000)); + i_quest3 = ((damage * 1000) + getRandom(3000)); } } else if (attacker == c_quest4) { if (((damage * 1000) + 1000) > i_quest4) { - i_quest4 = ((damage * 1000) + Rnd.get(3000)); + i_quest4 = ((damage * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -449,7 +448,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -470,7 +469,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -492,7 +491,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -508,17 +507,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = (damage * 1000) + Rnd.get(3000); + i_quest2 = (damage * 1000) + getRandom(3000); c_quest2 = attacker; } else if (i1 == 3) { - i_quest3 = (damage * 1000) + Rnd.get(3000); + i_quest3 = (damage * 1000) + getRandom(3000); c_quest3 = attacker; } else if (i1 == 4) { - i_quest4 = (damage * 1000) + Rnd.get(3000); + i_quest4 = (damage * 1000) + getRandom(3000); c_quest4 = attacker; } @@ -530,7 +529,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -552,7 +551,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -568,17 +567,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = (((damage / 150) * 1000) + Rnd.get(3000)); + i_quest2 = (((damage / 150) * 1000) + getRandom(3000)); c_quest2 = attacker; } else if (i1 == 3) { - i_quest3 = (((damage / 150) * 1000) + Rnd.get(3000)); + i_quest3 = (((damage / 150) * 1000) + getRandom(3000)); c_quest3 = attacker; } else if (i1 == 4) { - i_quest4 = (((damage / 150) * 1000) + Rnd.get(3000)); + i_quest4 = (((damage / 150) * 1000) + getRandom(3000)); c_quest4 = attacker; } getRandomSkill(npc); @@ -592,7 +591,7 @@ public class Valakas extends Quest npc.broadcastPacket(new PlaySound(1, "B03_D", npc)); startQuestTimer("1111", 500, npc, null); GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD); - final long respawnTime = (Config.VALAKAS_RESP_FIRST + Rnd.get(Config.VALAKAS_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.VALAKAS_RESP_FIRST + getRandom(Config.VALAKAS_RESP_SECOND)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); @@ -660,7 +659,7 @@ public class Valakas extends Quest } if (i2 > 0) { - if (Rnd.get(100) < 70) + if (getRandom(100) < 70) { if (i1 == 2) { @@ -686,28 +685,28 @@ public class Valakas extends Quest } if (c2.getZ() < (npc.getZ() + 200)) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 15) + else if (getRandom(100) < 15) { skill = SkillTable.getInstance().getSkill(4689, 1); } - else if ((Rnd.get(100) < 15) && (i0 == 1) && (i_quest0 == 1)) + else if ((getRandom(100) < 15) && (i0 == 1) && (i_quest0 == 1)) { skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } - else if ((Rnd.get(100) < 10) && (i1 == 1)) + else if ((getRandom(100) < 10) && (i1 == 1)) { skill = SkillTable.getInstance().getSkill(4688, 1); } - else if (Rnd.get(100) < 35) + else if (getRandom(100) < 35) { skill = SkillTable.getInstance().getSkill(4683, 1); } - else if (Rnd.nextBoolean()) + else if (getRandomBoolean()) { skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } @@ -716,11 +715,11 @@ public class Valakas extends Quest skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } - else if (Rnd.get(100) < 20) + else if (getRandom(100) < 20) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 15) + else if (getRandom(100) < 15) { skill = SkillTable.getInstance().getSkill(4689, 1); } @@ -740,28 +739,28 @@ public class Valakas extends Quest } if (c2.getZ() < (npc.getZ() + 200)) { - if (Rnd.get(100) < 5) + if (getRandom(100) < 5) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = SkillTable.getInstance().getSkill(4689, 1); } - else if ((Rnd.get(100) < 10) && (i0 == 1) && (i_quest0 == 1)) + else if ((getRandom(100) < 10) && (i0 == 1) && (i_quest0 == 1)) { skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } - else if ((Rnd.get(100) < 10) && (i1 == 1)) + else if ((getRandom(100) < 10) && (i1 == 1)) { skill = SkillTable.getInstance().getSkill(4688, 1); } - else if (Rnd.get(100) < 20) + else if (getRandom(100) < 20) { skill = SkillTable.getInstance().getSkill(4683, 1); } - else if (Rnd.nextBoolean()) + else if (getRandomBoolean()) { skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } @@ -770,11 +769,11 @@ public class Valakas extends Quest skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } - else if (Rnd.get(100) < 5) + else if (getRandom(100) < 5) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = SkillTable.getInstance().getSkill(4689, 1); } @@ -794,28 +793,28 @@ public class Valakas extends Quest } if (c2.getZ() < (npc.getZ() + 200)) { - if (Rnd.get(100) < 0) + if (getRandom(100) < 0) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 5) + else if (getRandom(100) < 5) { skill = SkillTable.getInstance().getSkill(4689, 1); } - else if ((Rnd.get(100) < 5) && (i0 == 1) && (i_quest0 == 1)) + else if ((getRandom(100) < 5) && (i0 == 1) && (i_quest0 == 1)) { skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } - else if ((Rnd.get(100) < 10) && (i1 == 1)) + else if ((getRandom(100) < 10) && (i1 == 1)) { skill = SkillTable.getInstance().getSkill(4688, 1); } - else if (Rnd.get(100) < 15) + else if (getRandom(100) < 15) { skill = SkillTable.getInstance().getSkill(4683, 1); } - else if (Rnd.nextBoolean()) + else if (getRandomBoolean()) { skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } @@ -824,11 +823,11 @@ public class Valakas extends Quest skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } - else if (Rnd.get(100) < 0) + else if (getRandom(100) < 0) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 5) + else if (getRandom(100) < 5) { skill = SkillTable.getInstance().getSkill(4689, 1); } @@ -848,28 +847,28 @@ public class Valakas extends Quest } if (c2.getZ() < (npc.getZ() + 200)) { - if (Rnd.get(100) < 0) + if (getRandom(100) < 0) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = SkillTable.getInstance().getSkill(4689, 1); } - else if ((Rnd.get(100) < 5) && (i0 == 1) && (i_quest0 == 1)) + else if ((getRandom(100) < 5) && (i0 == 1) && (i_quest0 == 1)) { skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } - else if ((Rnd.get(100) < 10) && (i1 == 1)) + else if ((getRandom(100) < 10) && (i1 == 1)) { skill = SkillTable.getInstance().getSkill(4688, 1); } - else if (Rnd.get(100) < 15) + else if (getRandom(100) < 15) { skill = SkillTable.getInstance().getSkill(4683, 1); } - else if (Rnd.nextBoolean()) + else if (getRandomBoolean()) { skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } @@ -878,11 +877,11 @@ public class Valakas extends Quest skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } - else if (Rnd.get(100) < 0) + else if (getRandom(100) < 0) { skill = SkillTable.getInstance().getSkill(4690, 1); } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { skill = SkillTable.getInstance().getSkill(4689, 1); } @@ -974,7 +973,7 @@ public class Valakas extends Quest } if (!result.isEmpty()) { - return result.get(Rnd.get(result.size())); + return result.get(getRandom(result.size())); } return null; } @@ -1007,21 +1006,21 @@ public class Valakas extends Quest { if (((10 * 1000) + 1000) > i_quest2) { - i_quest2 = ((10 * 1000) + Rnd.get(3000)); + i_quest2 = ((10 * 1000) + getRandom(3000)); } } else if (player == c_quest3) { if (((10 * 1000) + 1000) > i_quest3) { - i_quest3 = ((10 * 1000) + Rnd.get(3000)); + i_quest3 = ((10 * 1000) + getRandom(3000)); } } else if (player == c_quest4) { if (((10 * 1000) + 1000) > i_quest4) { - i_quest4 = ((10 * 1000) + Rnd.get(3000)); + i_quest4 = ((10 * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -1030,7 +1029,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1051,7 +1050,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1073,7 +1072,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -1089,17 +1088,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = ((10 * 1000) + Rnd.get(3000)); + i_quest2 = ((10 * 1000) + getRandom(3000)); c_quest2 = player; } else if (i1 == 3) { - i_quest3 = ((10 * 1000) + Rnd.get(3000)); + i_quest3 = ((10 * 1000) + getRandom(3000)); c_quest3 = player; } else if (i1 == 4) { - i_quest4 = ((10 * 1000) + Rnd.get(3000)); + i_quest4 = ((10 * 1000) + getRandom(3000)); c_quest4 = player; } } @@ -1109,21 +1108,21 @@ public class Valakas extends Quest { if (((6 * 1000) + 1000) > i_quest2) { - i_quest2 = ((6 * 1000) + Rnd.get(3000)); + i_quest2 = ((6 * 1000) + getRandom(3000)); } } else if (player == c_quest3) { if (((6 * 1000) + 1000) > i_quest3) { - i_quest3 = ((6 * 1000) + Rnd.get(3000)); + i_quest3 = ((6 * 1000) + getRandom(3000)); } } else if (player == c_quest4) { if (((6 * 1000) + 1000) > i_quest4) { - i_quest4 = ((6 * 1000) + Rnd.get(3000)); + i_quest4 = ((6 * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -1132,7 +1131,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1153,7 +1152,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1175,7 +1174,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -1191,17 +1190,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = ((6 * 1000) + Rnd.get(3000)); + i_quest2 = ((6 * 1000) + getRandom(3000)); c_quest2 = player; } else if (i1 == 3) { - i_quest3 = ((6 * 1000) + Rnd.get(3000)); + i_quest3 = ((6 * 1000) + getRandom(3000)); c_quest3 = player; } else if (i1 == 4) { - i_quest4 = ((6 * 1000) + Rnd.get(3000)); + i_quest4 = ((6 * 1000) + getRandom(3000)); c_quest4 = player; } } @@ -1211,21 +1210,21 @@ public class Valakas extends Quest { if (((3 * 1000) + 1000) > i_quest2) { - i_quest2 = ((3 * 1000) + Rnd.get(3000)); + i_quest2 = ((3 * 1000) + getRandom(3000)); } } else if (player == c_quest3) { if (((3 * 1000) + 1000) > i_quest3) { - i_quest3 = ((3 * 1000) + Rnd.get(3000)); + i_quest3 = ((3 * 1000) + getRandom(3000)); } } else if (player == c_quest4) { if (((3 * 1000) + 1000) > i_quest4) { - i_quest4 = ((3 * 1000) + Rnd.get(3000)); + i_quest4 = ((3 * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -1234,7 +1233,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1255,7 +1254,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1277,7 +1276,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -1293,17 +1292,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = ((3 * 1000) + Rnd.get(3000)); + i_quest2 = ((3 * 1000) + getRandom(3000)); c_quest2 = player; } else if (i1 == 3) { - i_quest3 = ((3 * 1000) + Rnd.get(3000)); + i_quest3 = ((3 * 1000) + getRandom(3000)); c_quest3 = player; } else if (i1 == 4) { - i_quest4 = ((3 * 1000) + Rnd.get(3000)); + i_quest4 = ((3 * 1000) + getRandom(3000)); c_quest4 = player; } } @@ -1311,21 +1310,21 @@ public class Valakas extends Quest { if (((2 * 1000) + 1000) > i_quest2) { - i_quest2 = ((2 * 1000) + Rnd.get(3000)); + i_quest2 = ((2 * 1000) + getRandom(3000)); } } else if (player == c_quest3) { if (((2 * 1000) + 1000) > i_quest3) { - i_quest3 = ((2 * 1000) + Rnd.get(3000)); + i_quest3 = ((2 * 1000) + getRandom(3000)); } } else if (player == c_quest4) { if (((2 * 1000) + 1000) > i_quest4) { - i_quest4 = ((2 * 1000) + Rnd.get(3000)); + i_quest4 = ((2 * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -1334,7 +1333,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1355,7 +1354,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1377,7 +1376,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -1393,17 +1392,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = ((2 * 1000) + Rnd.get(3000)); + i_quest2 = ((2 * 1000) + getRandom(3000)); c_quest2 = player; } else if (i1 == 3) { - i_quest3 = ((2 * 1000) + Rnd.get(3000)); + i_quest3 = ((2 * 1000) + getRandom(3000)); c_quest3 = player; } else if (i1 == 4) { - i_quest4 = ((2 * 1000) + Rnd.get(3000)); + i_quest4 = ((2 * 1000) + getRandom(3000)); c_quest4 = player; } } @@ -1411,21 +1410,21 @@ public class Valakas extends Quest { if (((1 * 1000) + 1000) > i_quest2) { - i_quest2 = ((1 * 1000) + Rnd.get(3000)); + i_quest2 = ((1 * 1000) + getRandom(3000)); } } else if (player == c_quest3) { if (((1 * 1000) + 1000) > i_quest3) { - i_quest3 = ((1 * 1000) + Rnd.get(3000)); + i_quest3 = ((1 * 1000) + getRandom(3000)); } } else if (player == c_quest4) { if (((1 * 1000) + 1000) > i_quest4) { - i_quest4 = ((1 * 1000) + Rnd.get(3000)); + i_quest4 = ((1 * 1000) + getRandom(3000)); } } else if (i_quest2 > i_quest3) @@ -1434,7 +1433,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest3) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1455,7 +1454,7 @@ public class Valakas extends Quest } else if (i_quest2 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 2; } @@ -1477,7 +1476,7 @@ public class Valakas extends Quest } else if (i_quest3 == i_quest4) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { i1 = 3; } @@ -1493,17 +1492,17 @@ public class Valakas extends Quest } if (i1 == 2) { - i_quest2 = ((1 * 1000) + Rnd.get(3000)); + i_quest2 = ((1 * 1000) + getRandom(3000)); c_quest2 = player; } else if (i1 == 3) { - i_quest3 = ((1 * 1000) + Rnd.get(3000)); + i_quest3 = ((1 * 1000) + getRandom(3000)); c_quest3 = player; } else if (i1 == 4) { - i_quest4 = ((1 * 1000) + Rnd.get(3000)); + i_quest4 = ((1 * 1000) + getRandom(3000)); c_quest4 = player; } if (status == FIGHTING) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java index 3e94419a96..7777a3f83d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -1018,7 +1017,7 @@ public class VanHalter extends Quest targets.put(i, pc); } - _vanHalter.reduceCurrentHp(1, targets.get(Rnd.get(1, i))); + _vanHalter.reduceCurrentHp(1, targets.get(getRandom(1, i))); } public void callRoyalGuardHelper() @@ -1251,7 +1250,7 @@ public class VanHalter extends Quest final Integer status = GrandBossManager.getInstance().getBossStatus(29062); if (status != INTERVAL) { - final long interval = Rnd.get(Config.HPH_FIXINTERVALOFHALTER, Config.HPH_FIXINTERVALOFHALTER + Config.HPH_RANDOMINTERVALOFHALTER)/* * 3600000 */; + final long interval = getRandom(Config.HPH_FIXINTERVALOFHALTER, Config.HPH_FIXINTERVALOFHALTER + Config.HPH_RANDOMINTERVALOFHALTER)/* * 3600000 */; final StatSet info = GrandBossManager.getInstance().getStatSet(29062); info.set("respawn_time", (Chronos.currentTimeMillis() + interval)); GrandBossManager.getInstance().setStatSet(29062, info); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java index c713ee5cf3..d9984c5ddf 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -355,16 +354,16 @@ public class Zaken extends Quest if (i1 == 1) { _quest0 = 0; - final int i2 = Rnd.get(15); - _ai1 = X_COORDS[i2] + Rnd.get(650); - _ai2 = Y_COORDS[i2] + Rnd.get(650); + final int i2 = getRandom(15); + _ai1 = X_COORDS[i2] + getRandom(650); + _ai2 = Y_COORDS[i2] + getRandom(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); } } } - if ((Rnd.get(20) < 1) && (_ai0 == 0)) + if ((getRandom(20) < 1) && (_ai0 == 0)) { _ai1 = npc.getX(); _ai2 = npc.getY(); @@ -417,11 +416,11 @@ public class Zaken extends Quest npc.setTarget(npc); npc.doCast(SkillTable.getInstance().getSkill(4242, 1)); } - if (Rnd.get(40) < 1) + if (getRandom(40) < 1) { - final int i2 = Rnd.get(15); - _ai1 = X_COORDS[i2] + Rnd.get(650); - _ai2 = Y_COORDS[i2] + Rnd.get(650); + final int i2 = getRandom(15); + _ai1 = X_COORDS[i2] + getRandom(650); + _ai2 = Y_COORDS[i2] + getRandom(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); @@ -442,132 +441,132 @@ public class Zaken extends Quest { case 1: { - final int rr = Rnd.get(15); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, X_COORDS[rr] + Rnd.get(650), Y_COORDS[rr] + Rnd.get(650), Z_COORDS[rr], Rnd.get(65536), false, 0); + final int rr = getRandom(15); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, X_COORDS[rr] + getRandom(650), Y_COORDS[rr] + getRandom(650), Z_COORDS[rr], getRandom(65536), false, 0); _ai4 = 2; break; } case 2: { - final int rr = Rnd.get(15); - addSpawn(DOLL_BLADER_B, X_COORDS[rr] + Rnd.get(650), Y_COORDS[rr] + Rnd.get(650), Z_COORDS[rr], Rnd.get(65536), false, 0); + final int rr = getRandom(15); + addSpawn(DOLL_BLADER_B, X_COORDS[rr] + getRandom(650), Y_COORDS[rr] + getRandom(650), Z_COORDS[rr], getRandom(65536), false, 0); _ai4 = 3; break; } case 3: { - addSpawn(VALE_MASTER_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); + addSpawn(VALE_MASTER_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); _ai4 = 4; break; } case 4: { - addSpawn(PIRATES_ZOMBIE_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, X_COORDS[Rnd.get(15)] + Rnd.get(650), Y_COORDS[Rnd.get(15)] + Rnd.get(650), Z_COORDS[Rnd.get(15)], Rnd.get(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, X_COORDS[getRandom(15)] + getRandom(650), Y_COORDS[getRandom(15)] + getRandom(650), Z_COORDS[getRandom(15)], getRandom(65536), false, 0); _ai4 = 5; break; } case 5: { - addSpawn(DOLL_BLADER_B, 52675, 219371, -3290, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 52687, 219596, -3368, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 52672, 219740, -3418, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 52857, 219992, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 52959, 219997, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 53381, 220151, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 56276, 220783, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 57173, 220234, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56294, 219482, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56364, 218967, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 57113, 218079, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56186, 217153, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54226, 218797, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54394, 219067, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 54262, 219480, -3488, Rnd.get(65536), false, 0); + addSpawn(DOLL_BLADER_B, 52675, 219371, -3290, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 52687, 219596, -3368, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 52672, 219740, -3418, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 52857, 219992, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 52959, 219997, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 53381, 220151, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 56276, 220783, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 57173, 220234, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56294, 219482, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56364, 218967, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 57113, 218079, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56186, 217153, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54226, 218797, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54394, 219067, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 54262, 219480, -3488, getRandom(65536), false, 0); _ai4 = 6; break; } case 6: { - addSpawn(PIRATES_ZOMBIE_B, 53412, 218077, -3488, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54413, 217132, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 54841, 217132, -3488, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 55372, 217128, -3343, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 55893, 217122, -3488, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56282, 217237, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 56963, 218080, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -3216, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56294, 219482, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -3216, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56364, 218967, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 56276, 220783, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 57173, 220234, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54464, 219095, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54226, 218797, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54394, 219067, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -3216, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 54262, 219480, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -3216, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -3216, Rnd.get(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 53412, 218077, -3488, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54413, 217132, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 54841, 217132, -3488, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 55372, 217128, -3343, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 55893, 217122, -3488, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56282, 217237, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 56963, 218080, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -3216, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56294, 219482, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -3216, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56364, 218967, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 56276, 220783, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 57173, 220234, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54464, 219095, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54226, 218797, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54394, 219067, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -3216, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 54262, 219480, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -3216, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -3216, getRandom(65536), false, 0); _ai4 = 7; break; } case 7: { - addSpawn(PIRATES_ZOMBIE_B, 54228, 217504, -3216, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54181, 217168, -3216, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 54714, 217123, -3168, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 55298, 217127, -3073, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 55787, 217130, -2993, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56284, 217216, -2944, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 56963, 218080, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -2944, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56294, 219482, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -2944, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 56364, 218967, -2944, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 56276, 220783, -2944, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 57173, 220234, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54464, 219095, -2944, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54226, 218797, -2944, Rnd.get(65536), false, 0); - addSpawn(VALE_MASTER_B, 54394, 219067, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -2944, Rnd.get(65536), false, 0); - addSpawn(DOLL_BLADER_B, 54262, 219480, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54280, 217200, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -2944, Rnd.get(65536), false, 0); - addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -2944, Rnd.get(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54228, 217504, -3216, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54181, 217168, -3216, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 54714, 217123, -3168, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 55298, 217127, -3073, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 55787, 217130, -2993, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56284, 217216, -2944, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 56963, 218080, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 56267, 218826, -2944, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56294, 219482, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 56094, 219113, -2944, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 56364, 218967, -2944, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 56276, 220783, -2944, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 57173, 220234, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54885, 220144, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55264, 219860, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55399, 220263, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55679, 220129, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54236, 220948, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54464, 219095, -2944, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54226, 218797, -2944, getRandom(65536), false, 0); + addSpawn(VALE_MASTER_B, 54394, 219067, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54139, 219253, -2944, getRandom(65536), false, 0); + addSpawn(DOLL_BLADER_B, 54262, 219480, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 53412, 218077, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 54280, 217200, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55440, 218081, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_CAPTAIN_B, 55202, 217940, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 55225, 218236, -2944, getRandom(65536), false, 0); + addSpawn(PIRATES_ZOMBIE_B, 54973, 218075, -2944, getRandom(65536), false, 0); _ai4 = 8; cancelQuestTimer("1003", null, null); break; @@ -607,7 +606,7 @@ public class Zaken extends Quest if ((getTimeHour() < 5) && (callerId != ZAKEN) && (npcId == ZAKEN)) { final int damage = 0; - if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) && (_ai0 == 0) && (damage < 10) && (Rnd.get((30 * 15)) < 1))// todo - damage missing + if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) && (_ai0 == 0) && (damage < 10) && (getRandom((30 * 15)) < 1))// todo - damage missing { _ai0 = 1; _ai1 = caller.getX(); @@ -632,8 +631,8 @@ public class Zaken extends Quest } else if (skillId == 4216) { - final int i1 = Rnd.get(15); - player.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + final int i1 = getRandom(15); + player.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(player); final Creature nextTarget = ((Attackable) npc).getMostHated(); if (nextTarget != null) @@ -644,8 +643,8 @@ public class Zaken extends Quest else if (skillId == 4217) { int i0 = 0; - int i1 = Rnd.get(15); - player.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + int i1 = getRandom(15); + player.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(player); if ((c_quest0 != null) && (_quest0 > 0) && (c_quest0 != player) && (c_quest0.getZ() > (player.getZ() - 100)) && (c_quest0.getZ() < (player.getZ() + 100))) { @@ -659,8 +658,8 @@ public class Zaken extends Quest } if (i0 == 0) { - i1 = Rnd.get(15); - c_quest0.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + i1 = getRandom(15); + c_quest0.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(c_quest0); } } @@ -676,8 +675,8 @@ public class Zaken extends Quest } if (i0 == 0) { - i1 = Rnd.get(15); - c_quest1.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + i1 = getRandom(15); + c_quest1.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(c_quest1); } } @@ -693,8 +692,8 @@ public class Zaken extends Quest } if (i0 == 0) { - i1 = Rnd.get(15); - c_quest2.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + i1 = getRandom(15); + c_quest2.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(c_quest2); } } @@ -710,8 +709,8 @@ public class Zaken extends Quest } if (i0 == 0) { - i1 = Rnd.get(15); - c_quest3.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + i1 = getRandom(15); + c_quest3.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(c_quest3); } } @@ -727,8 +726,8 @@ public class Zaken extends Quest } if (i0 == 0) { - i1 = Rnd.get(15); - c_quest4.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]); + i1 = getRandom(15); + c_quest4.teleToLocation(X_COORDS[i1] + getRandom(650), Y_COORDS[i1] + getRandom(650), Z_COORDS[i1]); ((Attackable) npc).stopHating(c_quest4); } } @@ -767,9 +766,9 @@ public class Zaken extends Quest final Creature originalAttacker = isPet ? attacker.getPet() : attacker; final int hate = (int) (((damage / npc.getMaxHp()) / 0.05) * 20000); ((Attackable) npc).addDamageHate(originalAttacker, 0, hate); - if (Rnd.get(10) < 1) + if (getRandom(10) < 1) { - final int i0 = Rnd.get((15 * 15)); + final int i0 = getRandom((15 * 15)); if (i0 < 1) { npc.setTarget(attacker); @@ -805,7 +804,7 @@ public class Zaken extends Quest } } } - if (Rnd.nextBoolean() && (attacker == ((Attackable) npc).getMostHated())) + if (getRandomBoolean() && (attacker == ((Attackable) npc).getMostHated())) { npc.setTarget(attacker); npc.doCast(SkillTable.getInstance().getSkill(4220, 1)); @@ -814,9 +813,9 @@ public class Zaken extends Quest if ((getTimeHour() >= 5) && (npc.getCurrentHp() < ((npc.getMaxHp() * _quest2) / 4.0))) { _quest2 = (_quest2 - 1); - final int i2 = Rnd.get(15); - _ai1 = X_COORDS[i2] + Rnd.get(650); - _ai2 = Y_COORDS[i2] + Rnd.get(650); + final int i2 = getRandom(15); + _ai1 = X_COORDS[i2] + getRandom(650); + _ai2 = Y_COORDS[i2] + getRandom(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); @@ -835,7 +834,7 @@ public class Zaken extends Quest npc.broadcastPacket(new PlaySound(1, "BS02_D", npc)); GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD); // Time is 36hour +/- 17hour. - final long respawnTime = (Config.ZAKEN_RESP_FIRST + Rnd.get(Config.ZAKEN_RESP_SECOND)) * 3600000; + final long respawnTime = (Config.ZAKEN_RESP_FIRST + getRandom(Config.ZAKEN_RESP_SECOND)) * 3600000; startQuestTimer("zaken_unlock", respawnTime, null, null); cancelQuestTimer("1001", npc, null); cancelQuestTimer("1003", npc, null); @@ -846,7 +845,7 @@ public class Zaken extends Quest } else if (status == ALIVE) { - startQuestTimer("CreateOnePrivateEx", ((30 + Rnd.get(60)) * 1000), npc, null); + startQuestTimer("CreateOnePrivateEx", ((30 + getRandom(60)) * 1000), npc, null); } return super.onKill(npc, killer, isPet); } @@ -864,7 +863,7 @@ public class Zaken extends Quest } if ((player.getZ() > (npc.getZ() - 100)) && (player.getZ() < (npc.getZ() + 100))) { - if ((_quest0 < 5) && (Rnd.get(3) < 1)) + if ((_quest0 < 5) && (getRandom(3) < 1)) { if (_quest0 == 0) { @@ -888,9 +887,9 @@ public class Zaken extends Quest } _quest0++; } - if (Rnd.get(15) < 1) + if (getRandom(15) < 1) { - final int i0 = Rnd.get((15 * 15)); + final int i0 = getRandom((15 * 15)); if (i0 < 1) { npc.setTarget(player); @@ -926,7 +925,7 @@ public class Zaken extends Quest } } } - if (Rnd.nextBoolean() && (player == ((Attackable) npc).getMostHated())) + if (getRandomBoolean() && (player == ((Attackable) npc).getMostHated())) { npc.setTarget(player); npc.doCast(SkillTable.getInstance().getSkill(4220, 1)); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/CatsEyeBandit.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/CatsEyeBandit.java index 9100173f0b..01e17c7499 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/CatsEyeBandit.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/CatsEyeBandit.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -45,7 +44,7 @@ public class CatsEyeBandit extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "You childish fool, do you think you can catch me?")); } @@ -60,7 +59,7 @@ public class CatsEyeBandit extends Quest @Override public String onKill(Npc npc, Player killer, boolean isPet) { - if (Rnd.get(100) < 80) + if (getRandom(100) < 80) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "I must do something about this shameful incident...")); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Chests.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Chests.java index f1501c5741..45bd490cfe 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Chests.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Chests.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; @@ -70,7 +69,7 @@ public class Chests extends Quest { chest.setInteracted(); final boolean isDeluxeSkill = skill.getId() == SKILL_DELUXE_KEY; - if ((Rnd.get(100) < IS_BOX) || isDeluxeSkill) + if ((getRandom(100) < IS_BOX) || isDeluxeSkill) { // if it's a box, either it will be successfully opened by a proper key, or instantly disappear if (isDeluxeSkill) @@ -85,7 +84,7 @@ public class Chests extends Quest final int chance = BASE_CHANCE - (levelDiff * LEVEL_DECREASE); // success, pretend-death with rewards: npc.reduceCurrentHp(99999999, player) - if (Rnd.get(100) < chance) + if (getRandom(100) < chance) { chest.setMustRewardExpSp(false); chest.setSpecialDrop(); @@ -114,7 +113,7 @@ public class Chests extends Quest if (!chest.isInteracted()) { chest.setInteracted(); - if (Rnd.get(100) < IS_BOX) + if (getRandom(100) < IS_BOX) { chest.onDecay(); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java index 31347d7c1c..08d99c0d35 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class DeluLizardmanSpecialAgent extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Hey! We're having a duel here!")); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java index 16ccda4885..9c6ca862e8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class DeluLizardmanSpecialCommander extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Come on, Ill take you on!")); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java index f88dcf487a..d51ddc3fab 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java @@ -19,7 +19,6 @@ package ai.others; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -64,7 +63,7 @@ public class EvaBox extends Quest { if (KISS_OF_EVA.contains(effect.getSkill().getId())) { - final Item reward = ItemTable.getInstance().createItem("EvaBox", Rnd.get(REWARDS.length), 1, killer); + final Item reward = ItemTable.getInstance().createItem("EvaBox", getRandom(REWARDS.length), 1, killer); reward.dropMe(npc, npc.getX(), npc.getY(), npc.getZ()); break; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java index 5ea4e12fbe..30d962728e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -150,7 +149,7 @@ public class FeedableBeasts extends Quest { int[][] temp; temp = _spiceToMob.get(spice); - return temp[0][Rnd.get(temp[0].length)]; + return temp[0][getRandom(temp[0].length)]; } public Integer getChance() @@ -360,7 +359,7 @@ public class FeedableBeasts extends Quest if (growthLevel == 2) { // If tamed, the mob that will spawn depends on the class type (fighter/mage) of the player! - if (Rnd.get(2) == 0) + if (getRandom(2) == 0) { if (player.isMageClass()) { @@ -376,7 +375,7 @@ public class FeedableBeasts extends Quest /* * If not tamed, there is a small chance that have "mad cow" disease. that is a stronger-than-normal animal that attacks its feeder */ - if (Rnd.get(5) == 0) + if (getRandom(5) == 0) { nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 0, 1); } @@ -420,14 +419,14 @@ public class FeedableBeasts extends Quest // If player has Q020 going, give quest item final QuestState st = player.getQuestState(Q020_BringUpWithLove.class.getSimpleName()); - if ((st != null) && (Rnd.get(100) < 5) && !st.hasQuestItems(7185)) + if ((st != null) && (getRandom(100) < 5) && !st.hasQuestItems(7185)) { st.giveItems(7185, 1); st.setCond(2); } // Also, perform a rare random chat - final int rand = Rnd.get(20); + final int rand = getRandom(20); if (rand < 5) { npc.broadcastPacket(new CreatureSay(nextNpc.getObjectId(), ChatType.GENERAL, nextNpc.getName(), SPAWN_CHATS[rand].replace("$s1", player.getName()))); @@ -533,9 +532,9 @@ public class FeedableBeasts extends Quest } // Rare random talk... - if (Rnd.get(20) == 0) + if (getRandom(20) == 0) { - npc.broadcastPacket(new CreatureSay(objectId, ChatType.GENERAL, npc.getName(), TEXT[growthLevel][Rnd.get(TEXT[growthLevel].length)])); + npc.broadcastPacket(new CreatureSay(objectId, ChatType.GENERAL, npc.getName(), TEXT[growthLevel][getRandom(TEXT[growthLevel].length)])); } if ((growthLevel > 0) && (FEED_INFO.getOrDefault(objectId, 0) != caster.getObjectId())) @@ -546,7 +545,7 @@ public class FeedableBeasts extends Quest } // Polymorph the mob, with a certain chance, given its current growth level - if (Rnd.get(100) < GROWTH_CAPABLE_MONSTERS.get(npcId).getChance()) + if (getRandom(100) < GROWTH_CAPABLE_MONSTERS.get(npcId).getChance()) { spawnNext(npc, growthLevel, caster, food); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/KarulBugbear.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/KarulBugbear.java index 8e773e6053..b3b3744e37 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/KarulBugbear.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/KarulBugbear.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class KarulBugbear extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 4) + if (getRandom(100) < 4) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Your rear is practically unguarded!")); } @@ -52,7 +51,7 @@ public class KarulBugbear extends Quest else { npc.setScriptValue(1); - if (Rnd.get(100) < 4) + if (getRandom(100) < 4) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Watch your back!")); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java index 0ca0b27696..8a57698143 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -167,7 +166,7 @@ public class Monastery extends Quest if (Util.contains(MOBS_2, npc.getNpcId()) && (skill.getSkillType() == SkillType.AGGDAMAGE)) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), TEXT[Rnd.get(2) + 1].replace("name", player.getName()))); + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), TEXT[getRandom(2) + 1].replace("name", player.getName()))); ((Attackable) npc).addDamageHate(player, 0, 999); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java index 6c82555b13..4e2f07a679 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; @@ -358,7 +357,7 @@ public class NewbieHelper extends Quest qs1.playTutorialVoice(isMage && !isOrcMage ? "tutorial_voice_027" : "tutorial_voice_026"); qs1.giveItems(isMage && !isOrcMage ? SPIRITSHOT_NOVICE : SOULSHOT_NOVICE, isMage && !isOrcMage ? 100 : 200); qs1.giveItems(TOKEN, 12); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { qs1.giveItems(SCROLL, 2); } @@ -403,7 +402,7 @@ public class NewbieHelper extends Quest qs2.showQuestionMark(3); qs2.set("Ex", "2"); } - else if ((ex <= 2) && (qs1.getState() == State.STARTED) && (qs2.getInt("Gemstone") == 0) && (Rnd.get(100) < 50)) + else if ((ex <= 2) && (qs1.getState() == State.STARTED) && (qs2.getInt("Gemstone") == 0) && (getRandom(100) < 50)) { ((Monster) npc).dropItem(player, BLUE_GEM, 1); qs1.playSound("ItemSound.quest_tutorial"); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/OlMahumGeneral.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/OlMahumGeneral.java index ff6468677e..f714ea864b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/OlMahumGeneral.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/OlMahumGeneral.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class OlMahumGeneral extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "We shall see about that!")); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/RetreatOnAttack.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/RetreatOnAttack.java index 84c3bac6d2..5348f18aca 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/RetreatOnAttack.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/RetreatOnAttack.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -65,11 +64,11 @@ public class RetreatOnAttack extends Quest public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { final int npcId = npc.getNpcId(); - if ((npcId == EPLY) || ((npc.getStatus().getCurrentHp() <= ((npc.getMaxHp() * 50) / 100)) && (Rnd.get(100) < 10))) + if ((npcId == EPLY) || ((npc.getStatus().getCurrentHp() <= ((npc.getMaxHp() * 50) / 100)) && (getRandom(100) < 10))) { if (npcId == OL_MAHUM_GUARD) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), OL_MAHUM_GUARD_TEXT[Rnd.get(OL_MAHUM_GUARD_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), OL_MAHUM_GUARD_TEXT[getRandom(OL_MAHUM_GUARD_TEXT.length)])); } int posX = npc.getX(); int posY = npc.getY(); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java index cd2b0d5e07..e8023aa8ce 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -41,7 +40,7 @@ public class ScarletStakatoNoble extends Quest @Override public String onKill(Npc npc, Player killer, boolean isPet) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { addSpawn(SCARLET_STAKATO_NOBLE_B, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0); addSpawn(SCARLET_STAKATO_NOBLE_B, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Splendor.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Splendor.java index 7fae99ec19..9b96768047 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Splendor.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Splendor.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -64,7 +63,7 @@ public class Splendor extends Quest public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { final List npcData = NPCS.get(npc.getNpcId()); - if (Rnd.get(100) < (npcData.get(1) * Config.RATE_DROP_QUEST)) + if (getRandom(100) < (npcData.get(1) * Config.RATE_DROP_QUEST)) { if (npcData.get(2) == 1) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java index b270212c6f..75ae3c89ba 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java @@ -24,7 +24,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArraySet; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -164,12 +163,12 @@ public class SummonMinions extends Quest if (npc.getStatus().getCurrentHp() < (npc.getMaxHp() / 2)) { hasSpawned = 0; - if (Rnd.get(100) < 33) // mobs that summon minions only on certain chance + if (getRandom(100) < 33) // mobs that summon minions only on certain chance { final Integer[] minions = MINIONS.get(npcId); for (Integer minion : minions) { - final Attackable newNpc = (Attackable) addSpawn(minion, (npc.getX() + Rnd.get(-150, 150)), (npc.getY() + Rnd.get(-150, 150)), npc.getZ(), 0, false, 0); + final Attackable newNpc = (Attackable) addSpawn(minion, (npc.getX() + getRandom(-150, 150)), (npc.getY() + getRandom(-150, 150)), npc.getZ(), 0, false, 0); newNpc.setRunning(); newNpc.addDamageHate(attacker, 0, 999); newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker); @@ -218,7 +217,7 @@ public class SummonMinions extends Quest final Integer[] minions = MINIONS.get(npcId); for (Integer minion : minions) { - final Attackable newNpc = (Attackable) addSpawn(minion, npc.getX() + Rnd.get(-150, 150), npc.getY() + Rnd.get(-150, 150), npc.getZ(), 0, false, 0); + final Attackable newNpc = (Attackable) addSpawn(minion, npc.getX() + getRandom(-150, 150), npc.getY() + getRandom(-150, 150), npc.getZ(), 0, false, 0); newNpc.setRunning(); newNpc.addDamageHate(currentAttacker, 0, 999); newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, currentAttacker); @@ -233,7 +232,7 @@ public class SummonMinions extends Quest { for (Integer minion : minions) { - final Attackable newNpc = (Attackable) addSpawn(minion, npc.getX() + Rnd.get(-150, 150), npc.getY() + Rnd.get(-150, 150), npc.getZ(), 0, false, 0); + final Attackable newNpc = (Attackable) addSpawn(minion, npc.getX() + getRandom(-150, 150), npc.getY() + getRandom(-150, 150), npc.getZ(), 0, false, 0); newNpc.setRunning(); newNpc.addDamageHate(attacker, 0, 999); newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker); @@ -243,7 +242,7 @@ public class SummonMinions extends Quest { for (Integer minion : minions) { - addSpawn(minion, (npc.getX() + Rnd.get(-100, 100)), (npc.getY() + Rnd.get(-100, 100)), npc.getZ(), 0, false, 0); + addSpawn(minion, (npc.getX() + getRandom(-100, 100)), (npc.getY() + getRandom(-100, 100)), npc.getZ(), 0, false, 0); } } if (npcId == 20767) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcOverlord.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcOverlord.java index d990703a14..90bb5d83d0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcOverlord.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcOverlord.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class TimakOrcOverlord extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Dear ultimate power!!!")); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java index 5105d615b9..1cbec05c61 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class TimakOrcTroopLeader extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "Destroy the enemy, my brothers!")); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java index a052c1308b..cf657899dc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -144,11 +143,11 @@ public class Transform extends Quest { for (Transformer monster : _mobs) { - if ((npc.getNpcId() == monster.getId()) && (Rnd.get(100) <= (monster.getChance() * Config.RATE_DROP_QUEST))) + if ((npc.getNpcId() == monster.getId()) && (getRandom(100) <= (monster.getChance() * Config.RATE_DROP_QUEST))) { if (monster.getMessage() != 0) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), Message[Rnd.get(monster.getMessage())])); + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), Message[getRandom(monster.getMessage())])); } npc.onDecay(); final Attackable newNpc = (Attackable) addSpawn(monster.getIdPoly(), npc); @@ -178,7 +177,7 @@ public class Transform extends Quest { if (monster.getMessage() != 0) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), Message[Rnd.get(monster.getMessage())])); + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), Message[getRandom(monster.getMessage())])); } final Attackable newNpc = (Attackable) addSpawn(monster.getIdPoly(), npc); final Creature originalAttacker = isPet ? killer.getPet() : killer; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcFootman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcFootman.java index d5a46f5df0..6febf3ee48 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcFootman.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcFootman.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class TurekOrcFootman extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "There is no reason for you to kill me! I have nothing you need!")); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcSupplier.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcSupplier.java index ee0c92d333..43fce2a8c2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcSupplier.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcSupplier.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class TurekOrcSupplier extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "You wont take me down easily.")); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcWarlord.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcWarlord.java index c985d281ec..5de380637a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcWarlord.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcWarlord.java @@ -16,7 +16,6 @@ */ package ai.others; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -44,7 +43,7 @@ public class TurekOrcWarlord extends Quest { if (npc.isScriptValue(1)) { - if (Rnd.get(100) < 40) + if (getRandom(100) < 40) { npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "You wont take me down easily.")); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java index 933d87ebd7..068c415aef 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java @@ -17,7 +17,6 @@ package quests.Q022_TragedyInVonHellmannForest; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -645,7 +644,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest else { final QuestState qs = killer.getQuestState(getName()); - if ((qs != null) && qs.isCond(4) && qs.hasQuestItems(CROSS_OF_EINHASAD) && !qs.hasQuestItems(LOST_SKULL_OF_ELF) && (Rnd.get(100) < 10)) + if ((qs != null) && qs.isCond(4) && qs.hasQuestItems(CROSS_OF_EINHASAD) && !qs.hasQuestItems(LOST_SKULL_OF_ELF) && (getRandom(100) < 10)) { qs.giveItems(LOST_SKULL_OF_ELF, 1); qs.setCond(5); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java index 441feb1ec1..985138929e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java @@ -19,7 +19,6 @@ package quests.Q038_DragonFangs; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -133,7 +132,7 @@ public class Q038_DragonFangs extends Quest { if (st.getQuestItemsCount(TOOTH_OF_DRAGON) >= 50) { - final int position = Rnd.get(REWARD.length); + final int position = getRandom(REWARD.length); htmltext = "30034-06.htm"; st.takeItems(TOOTH_OF_DRAGON, 50); st.giveItems(REWARD[position][0], 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java index 9efce7f229..ef0fb0cf47 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java @@ -16,7 +16,6 @@ */ package quests.Q105_SkirmishWithTheOrcs; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -80,7 +79,7 @@ public class Q105_SkirmishWithTheOrcs extends Quest if (event.equals("30218-03.htm")) { st.startQuest(); - st.giveItems(Rnd.get(1836, 1839), 1); // Kendell's orders 1 to 4. + st.giveItems(getRandom(1836, 1839), 1); // Kendell's orders 1 to 4. } return htmltext; @@ -131,7 +130,7 @@ public class Q105_SkirmishWithTheOrcs extends Quest st.takeItems(KENDELL_ORDER_2, 1); st.takeItems(KENDELL_ORDER_3, 1); st.takeItems(KENDELL_ORDER_4, 1); - st.giveItems(Rnd.get(1840, 1843), 1); // Kendell's orders 5 to 8. + st.giveItems(getRandom(1840, 1843), 1); // Kendell's orders 5 to 8. } else if (cond == 3) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java index e2e537de74..a20fdb1cda 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java @@ -16,7 +16,6 @@ */ package quests.Q108_JumbleTumbleDiamondFuss; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -342,7 +341,7 @@ public class Q108_JumbleTumbleDiamondFuss extends Quest } else if (cond == 11) { - htmltext = (Rnd.nextBoolean()) ? "30522-02.htm" : "30522-04.htm"; + htmltext = getRandomBoolean() ? "30522-02.htm" : "30522-04.htm"; } else if (cond == 12) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java index 245a46abbc..089655038e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java @@ -19,7 +19,6 @@ package quests.Q171_ActsOfEvil; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -336,7 +335,7 @@ public class Q171_ActsOfEvil extends Quest if (st.isCond(2) && !st.dropItems(BLADE_MOLD, 1, 20, CHANCES.get(npcId))) { final int count = st.getQuestItemsCount(BLADE_MOLD); - if ((count == 5) || ((count >= 10) && (Rnd.get(100) < 25))) + if ((count == 5) || ((count >= 10) && (getRandom(100) < 25))) { addSpawn(27190, player.getX(), player.getY(), player.getZ(), player.getHeading(), false, 0); } @@ -353,7 +352,7 @@ public class Q171_ActsOfEvil extends Quest st.giveItems(RANGER_REPORT_1, 1); st.playSound(QuestState.SOUND_ITEMGET); } - else if (Rnd.get(100) < 20) + else if (getRandom(100) < 20) { if (!st.hasQuestItems(RANGER_REPORT_2)) { @@ -376,7 +375,7 @@ public class Q171_ActsOfEvil extends Quest } case 20438: { - if (st.isCond(6) && (Rnd.get(100) < 10) && !st.hasQuestItems(WEAPON_TRADE_CONTRACT, ATTACK_DIRECTIVES)) + if (st.isCond(6) && (getRandom(100) < 10) && !st.hasQuestItems(WEAPON_TRADE_CONTRACT, ATTACK_DIRECTIVES)) { st.playSound(QuestState.SOUND_ITEMGET); st.giveItems(WEAPON_TRADE_CONTRACT, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java index ade15bb7f1..b7073bc27a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java @@ -16,7 +16,6 @@ */ package quests.Q211_TrialOfTheChallenger; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -108,12 +107,12 @@ public class Q211_TrialOfTheChallenger extends Quest { if (st.hasQuestItems(BROKEN_KEY)) { - if (Rnd.get(10) < 2) + if (getRandom(10) < 2) { htmltext = "30647-03.htm"; st.playSound(QuestState.SOUND_JACKPOT); st.takeItems(BROKEN_KEY, 1); - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance > 90) { st.rewardItems(BRIGANDINE_GAUNTLETS_PATTERN, 1); @@ -140,7 +139,7 @@ public class Q211_TrialOfTheChallenger extends Quest { htmltext = "30647-02.htm"; st.takeItems(BROKEN_KEY, 1); - st.rewardItems(ADENA, Rnd.get(1, 1000)); + st.rewardItems(ADENA, getRandom(1, 1000)); } } break; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java index ec1eefde43..13cc0c91cf 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java @@ -16,7 +16,6 @@ */ package quests.Q212_TrialOfDuty; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -338,7 +337,7 @@ public class Q212_TrialOfDuty extends Quest case 20190: case 20191: { - if (st.isCond(2) && (Rnd.get(10) < 1)) + if (st.isCond(2) && (getRandom(10) < 1)) { st.playSound(QuestState.SOUND_BEFORE_BATTLE); addSpawn(27119, npc, false, 120000); @@ -368,7 +367,7 @@ public class Q212_TrialOfDuty extends Quest } case 20144: { - if ((st.isCond(7) || st.isCond(8)) && (Rnd.get(100) < 33)) + if ((st.isCond(7) || st.isCond(8)) && (getRandom(100) < 33)) { if (st.isCond(7)) { @@ -394,7 +393,7 @@ public class Q212_TrialOfDuty extends Quest } case 20270: { - if (st.isCond(14) && Rnd.nextBoolean()) + if (st.isCond(14) && getRandomBoolean()) { if (!st.hasQuestItems(ATHEBALDT_SKULL)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java index 2d3767fb44..914908ee36 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java @@ -16,7 +16,6 @@ */ package quests.Q215_TrialOfThePilgrim; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -340,7 +339,7 @@ public class Q215_TrialOfThePilgrim extends Quest } else if (cond == 13) { - htmltext = (Rnd.nextBoolean()) ? "30362-02.htm" : "30362-02a.htm"; + htmltext = (getRandomBoolean()) ? "30362-02.htm" : "30362-02a.htm"; } else if (cond == 14) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java index 76f85bbd16..6402ab96c2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java @@ -16,7 +16,6 @@ */ package quests.Q216_TrialOfTheGuildsman; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -464,7 +463,7 @@ public class Q216_TrialOfTheGuildsman extends Quest case ANT_CAPTAIN: { // Different cases if player is a wannabe BH or WS. - if (st.hasQuestItems(PINTER_INSTRUCTIONS) && st.dropItemsAlways(AMBER_BEAD, ((player.getClassId() == ClassId.SCAVENGER) && (npc.getSpoiledBy() == player.getObjectId())) ? 10 : 5, 70) && (player.getClassId() == ClassId.ARTISAN) && Rnd.nextBoolean()) + if (st.hasQuestItems(PINTER_INSTRUCTIONS) && st.dropItemsAlways(AMBER_BEAD, ((player.getClassId() == ClassId.SCAVENGER) && (npc.getSpoiledBy() == player.getObjectId())) ? 10 : 5, 70) && (player.getClassId() == ClassId.ARTISAN) && getRandomBoolean()) { st.giveItems(AMBER_LUMP, 1); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java index 28e2ec3520..121b005b96 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java @@ -16,7 +16,6 @@ */ package quests.Q217_TestimonyOfTrust; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -497,7 +496,7 @@ public class Q217_TestimonyOfTrust extends Quest case DRYAD: case DRYAD_ELDER: { - if (st.isCond(2) && !st.hasQuestItems(SEED_OF_VERDURE) && (Rnd.get(100) < 33)) + if (st.isCond(2) && !st.hasQuestItems(SEED_OF_VERDURE) && (getRandom(100) < 33)) { addSpawn(ACTEA_OF_VERDANT_WILDS, npc, true, 200000); st.playSound(QuestState.SOUND_BEFORE_BATTLE); @@ -507,7 +506,7 @@ public class Q217_TestimonyOfTrust extends Quest case LIREIN: case LIREIN_ELDER: { - if (st.isCond(2) && !st.hasQuestItems(BREATH_OF_WINDS) && (Rnd.get(100) < 33)) + if (st.isCond(2) && !st.hasQuestItems(BREATH_OF_WINDS) && (getRandom(100) < 33)) { addSpawn(LUELL_OF_ZEPHYR_WINDS, npc, true, 200000); st.playSound(QuestState.SOUND_BEFORE_BATTLE); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java index 5eb7ea4205..8d75556c0b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java @@ -16,7 +16,6 @@ */ package quests.Q218_TestimonyOfLife; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -564,7 +563,7 @@ public class Q218_TestimonyOfLife extends Quest case 20581: case 20582: { - if (st.isCond(15) && Rnd.nextBoolean()) + if (st.isCond(15) && getRandomBoolean()) { for (int itemId : TALINS_PIECES) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java index c978f4353c..7ab5b62be5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java @@ -16,7 +16,6 @@ */ package quests.Q223_TestOfTheChampion; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -357,12 +356,12 @@ public class Q223_TestOfTheChampion extends Quest { case HARPY: // Possibility to spawn an HARPY _MATRIARCH. { - if (st.isCond(6) && Rnd.nextBoolean() && !npc.isScriptValue(1)) + if (st.isCond(6) && getRandomBoolean() && !npc.isScriptValue(1)) { final Creature originalKiller = isPet ? attacker.getPet() : attacker; // Spawn one or two matriarchs. - for (int i = 1; i < ((Rnd.get(10) < 7) ? 2 : 3); i++) + for (int i = 1; i < ((getRandom(10) < 7) ? 2 : 3); i++) { final Attackable collector = (Attackable) addSpawn(HARPY_MATRIARCH, npc, true, 0); @@ -376,12 +375,12 @@ public class Q223_TestOfTheChampion extends Quest } case ROAD_SCAVENGER: // Possibility to spawn a Road Collector. { - if (st.isCond(10) && Rnd.nextBoolean() && !npc.isScriptValue(1)) + if (st.isCond(10) && getRandomBoolean() && !npc.isScriptValue(1)) { final Creature originalKiller = isPet ? attacker.getPet() : attacker; // Spawn one or two collectors. - for (int i = 1; i < ((Rnd.get(10) < 7) ? 2 : 3); i++) + for (int i = 1; i < ((getRandom(10) < 7) ? 2 : 3); i++) { final Attackable collector = (Attackable) addSpawn(ROAD_COLLECTOR, npc, true, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java index c54daf458c..19b7b7a494 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java @@ -16,7 +16,6 @@ */ package quests.Q224_TestOfSagittarius; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -396,7 +395,7 @@ public class Q224_TestOfSagittarius extends Quest { if (st.isCond(13)) { - if (((st.getQuestItemsCount(BLOOD_OF_LIZARDMAN) - 120) * 5) > Rnd.get(100)) + if (((st.getQuestItemsCount(BLOOD_OF_LIZARDMAN) - 120) * 5) > getRandom(100)) { st.playSound(QuestState.SOUND_BEFORE_BATTLE); st.takeItems(BLOOD_OF_LIZARDMAN, -1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java index fd58c62289..d90c991fe9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java @@ -16,7 +16,6 @@ */ package quests.Q226_TestOfTheHealer; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -272,7 +271,7 @@ public class Q226_TestOfTheHealer extends Quest } case ORPHAN_GIRL: { - htmltext = "30659-0" + Rnd.get(1, 5) + ".htm"; + htmltext = "30659-0" + getRandom(1, 5) + ".htm"; break; } case ALLANA: diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java index d988df7445..637f3b900c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java @@ -19,7 +19,6 @@ package quests.Q230_TestOfTheSummoner; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -188,14 +187,14 @@ public class Q230_TestOfTheSummoner extends Quest st.setCond(2); st.playSound(QuestState.SOUND_MIDDLE); st.takeItems(GALATEA_LETTER, 1); - final int random = Rnd.get(5); + final int random = getRandom(5); st.giveItems(LARA_LISTS[random][0], 1); st.set("Lara", String.valueOf(random + 1)); // avoid 0 break; } case "30063-04.htm": { - final int random = Rnd.get(5); + final int random = getRandom(5); st.playSound(QuestState.SOUND_ITEMGET); st.giveItems(LARA_LISTS[random][0], 1); st.set("Lara", String.valueOf(random + 1)); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java index 4024b0406d..e5716181cb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java @@ -16,7 +16,6 @@ */ package quests.Q233_TestOfTheWarSpirit; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; @@ -515,7 +514,7 @@ public class Q233_TestOfTheWarSpirit extends Quest { if (st.hasQuestItems(INSECT_DIAGRAM_BOOK)) { - final int rndAnt = Rnd.get(100); + final int rndAnt = getRandom(100); if (rndAnt > 70) { if (st.hasQuestItems(KIRUNA_THIGHBONE)) @@ -548,7 +547,7 @@ public class Q233_TestOfTheWarSpirit extends Quest case LETO_LIZARDMAN_SHAMAN: case LETO_LIZARDMAN_OVERLORD: { - if (st.hasQuestItems(PEKIRON_TOTEM) && Rnd.nextBoolean()) + if (st.hasQuestItems(PEKIRON_TOTEM) && getRandomBoolean()) { if (!st.hasQuestItems(TONAR_SKULL)) { @@ -575,7 +574,7 @@ public class Q233_TestOfTheWarSpirit extends Quest } case MEDUSA: { - if (st.hasQuestItems(MANAKIA_TOTEM) && Rnd.nextBoolean()) + if (st.hasQuestItems(MANAKIA_TOTEM) && getRandomBoolean()) { if (!st.hasQuestItems(HERMODT_RIBBONE)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java index 73bf9685fb..2168e8be8e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java @@ -16,7 +16,6 @@ */ package quests.Q246_PossessorOfAPreciousSoul; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -254,7 +253,7 @@ public class Q246_PossessorOfAPreciousSoul extends Quest return null; } - if (Rnd.get(10) < 2) + if (getRandom(10) < 2) { final int neklaceOrRing = (npcId == PILGRIM_OF_SPLENDOR) ? WATERBINDER : EVERGREEN; if (!st.hasQuestItems(neklaceOrRing)) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java index 74c6214bcb..a44f03e2f3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java @@ -16,7 +16,6 @@ */ package quests.Q258_BringWolfPelts; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -87,7 +86,7 @@ public class Q258_BringWolfPelts extends Quest else { st.takeItems(WOLF_PELT, -1); - final int randomNumber = Rnd.get(16); + final int randomNumber = getRandom(16); // Reward is based on a random number (1D16). if (randomNumber == 0) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java index 68bca41f7f..8fe4f38ecb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java @@ -16,7 +16,6 @@ */ package quests.Q264_KeenClaws; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -91,7 +90,7 @@ public class Q264_KeenClaws extends Quest htmltext = "30136-05.htm"; st.takeItems(WOLF_CLAW, -1); - final int n = Rnd.get(17); + final int n = getRandom(17); if (n == 0) { st.giveItems(WOODEN_HELMET, 1); @@ -144,12 +143,12 @@ public class Q264_KeenClaws extends Quest if (npc.getNpcId() == 20003) { - if (st.dropItems(WOLF_CLAW, Rnd.nextBoolean() ? 2 : 4, 50, 500000)) + if (st.dropItems(WOLF_CLAW, getRandomBoolean() ? 2 : 4, 50, 500000)) { st.setCond(2); } } - else if (st.dropItemsAlways(WOLF_CLAW, (Rnd.get(5) < 4) ? 1 : 2, 50)) + else if (st.dropItemsAlways(WOLF_CLAW, (getRandom(5) < 4) ? 1 : 2, 50)) { st.setCond(2); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java index b1f3560db5..8e316e2202 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java @@ -16,7 +16,6 @@ */ package quests.Q266_PleasOfPixies; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -100,7 +99,7 @@ public class Q266_PleasOfPixies extends Quest htmltext = "31852-05.htm"; st.takeItems(PREDATOR_FANG, -1); - final int n = Rnd.get(100); + final int n = getRandom(100); if (n < 10) { st.playSound(QuestState.SOUND_JACKPOT); @@ -142,7 +141,7 @@ public class Q266_PleasOfPixies extends Quest { case 20525: { - if (st.dropItemsAlways(PREDATOR_FANG, Rnd.get(2, 3), 100)) + if (st.dropItemsAlways(PREDATOR_FANG, getRandom(2, 3), 100)) { st.setCond(2); } @@ -158,7 +157,7 @@ public class Q266_PleasOfPixies extends Quest } case 20534: { - if (st.dropItems(PREDATOR_FANG, (Rnd.get(3) == 0) ? 1 : 2, 100, 600000)) + if (st.dropItems(PREDATOR_FANG, (getRandom(3) == 0) ? 1 : 2, 100, 600000)) { st.setCond(2); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java index 4b508121ae..5c65539d1b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java @@ -16,7 +16,6 @@ */ package quests.Q271_ProofOfValor; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -101,7 +100,7 @@ public class Q271_ProofOfValor extends Quest { htmltext = "30577-05.htm"; st.takeItems(KASHA_WOLF_FANG, -1); - st.giveItems((Rnd.get(100) < 10) ? NECKLACE_OF_VALOR : NECKLACE_OF_COURAGE, 1); + st.giveItems((getRandom(100) < 10) ? NECKLACE_OF_VALOR : NECKLACE_OF_COURAGE, 1); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } @@ -121,7 +120,7 @@ public class Q271_ProofOfValor extends Quest return null; } - if (st.dropItemsAlways(KASHA_WOLF_FANG, (Rnd.get(4) == 0) ? 2 : 1, 50)) + if (st.dropItemsAlways(KASHA_WOLF_FANG, (getRandom(4) == 0) ? 2 : 1, 50)) { st.setCond(2); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java index 9953ccb26f..0871e9959d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java @@ -16,7 +16,6 @@ */ package quests.Q273_InvadersOfTheHolyLand; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -149,7 +148,7 @@ public class Q273_InvadersOfTheHolyLand extends Quest probability = 87; } - if (Rnd.get(100) <= probability) + if (getRandom(100) <= probability) { st.dropItemsAlways(BLACK_SOULSTONE, 1, 0); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java index 425f8bc7ef..f58a7e0598 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java @@ -16,7 +16,6 @@ */ package quests.Q274_SkirmishWithTheWerewolves; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -130,7 +129,7 @@ public class Q274_SkirmishWithTheWerewolves extends Quest st.setCond(2); } - if (Rnd.get(100) < 6) + if (getRandom(100) < 6) { st.giveItems(MARAKU_WOLFMEN_TOTEM, 1); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java index 43f2f4a040..dad09f8f7f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java @@ -16,7 +16,6 @@ */ package quests.Q275_DarkWingedSpies; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -127,7 +126,7 @@ public class Q275_DarkWingedSpies extends Quest { st.setCond(2); } - else if ((Rnd.get(100) < 10) && (st.getQuestItemsCount(DARKWING_BAT_FANG) > 10) && (st.getQuestItemsCount(DARKWING_BAT_FANG) < 66)) + else if ((getRandom(100) < 10) && (st.getQuestItemsCount(DARKWING_BAT_FANG) > 10) && (st.getQuestItemsCount(DARKWING_BAT_FANG) < 66)) { // Spawn of Varangka Tracker on the npc position. addSpawn(VARANGKA_TRACKER, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java index 30c40df99d..2de291fd6f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java @@ -16,7 +16,6 @@ */ package quests.Q276_TotemOfTheHestui; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -127,7 +126,7 @@ public class Q276_TotemOfTheHestui extends Quest case 20479: { final int count = st.getQuestItemsCount(KASHA_PARASITE); - final int random = Rnd.get(100); + final int random = getRandom(100); if ((count >= 79) || ((count >= 69) && (random <= 20)) || ((count >= 59) && (random <= 15)) || ((count >= 49) && (random <= 10)) || ((count >= 39) && (random < 2))) { addSpawn(27044, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java index 64ee105fcf..51a5a0cecc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java @@ -16,7 +16,6 @@ */ package quests.Q291_RevengeOfTheRedbonnet; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -90,7 +89,7 @@ public class Q291_RevengeOfTheRedbonnet extends Quest htmltext = "30553-05.htm"; st.takeItems(BLACK_WOLF_PELT, -1); - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 3) { st.rewardItems(GRANDMA_PEARL, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java index f6b01beeb1..b8e551b336 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java @@ -16,7 +16,6 @@ */ package quests.Q292_BrigandsSweep; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -185,7 +184,7 @@ public class Q292_BrigandsSweep extends Quest return null; } - final int chance = Rnd.get(10); + final int chance = getRandom(10); if (chance > 5) { switch (npc.getNpcId()) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java index d37b8bbba6..01e57ed269 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java @@ -16,7 +16,6 @@ */ package quests.Q293_TheHiddenVeins; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -181,7 +180,7 @@ public class Q293_TheHiddenVeins extends Quest return null; } - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance > 50) { st.dropItemsAlways(CHRYSOLITE_ORE, 1, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java index dedfcedc82..688436a985 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java @@ -16,7 +16,6 @@ */ package quests.Q294_CovertBusiness; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -118,7 +117,7 @@ public class Q294_CovertBusiness extends Quest } int count = 1; - final int chance = Rnd.get(10); + final int chance = getRandom(10); final boolean isBarded = (npc.getNpcId() == 20370); if (chance < 3) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java index 871172b90c..5d51f221ae 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java @@ -16,7 +16,6 @@ */ package quests.Q295_DreamingOfTheSkies; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -115,7 +114,7 @@ public class Q295_DreamingOfTheSkies extends Quest return null; } - if (st.dropItemsAlways(FLOATING_STONE, (Rnd.get(100) > 25) ? 1 : 2, 50)) + if (st.dropItemsAlways(FLOATING_STONE, (getRandom(100) > 25) ? 1 : 2, 50)) { st.setCond(2); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java index f1d12631b5..6708da55b4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java @@ -16,7 +16,6 @@ */ package quests.Q296_TarantulasSpiderSilk; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -83,7 +82,7 @@ public class Q296_TarantulasSpiderSilk extends Quest { htmltext = "30548-03.htm"; st.takeItems(TARANTULA_SPINNERETTE, -1); - st.giveItems(TARANTULA_SPIDER_SILK, count * (15 + Rnd.get(10))); + st.giveItems(TARANTULA_SPIDER_SILK, count * (15 + getRandom(10))); } break; } @@ -149,7 +148,7 @@ public class Q296_TarantulasSpiderSilk extends Quest return null; } - final int rnd = Rnd.get(100); + final int rnd = getRandom(100); if (rnd > 95) { st.dropItemsAlways(TARANTULA_SPINNERETTE, 1, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java index 89e8614088..90ab30f644 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java @@ -19,7 +19,6 @@ package quests.Q300_HuntingLetoLizardman; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -75,7 +74,7 @@ public class Q300_HuntingLetoLizardman extends Quest htmltext = "30126-06.htm"; st.takeItems(BRACELET, -1); - final int luck = Rnd.get(3); + final int luck = getRandom(3); if (luck == 0) { st.rewardItems(57, 30000); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java index 9eec9bd2cd..aba0f9c434 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -167,7 +166,7 @@ public class Q325_GrimCollector extends Quest st.takeItems(RIB_BONE, 1); st.takeItems(THIGH_BONE, 1); - if (Rnd.get(10) < 9) + if (getRandom(10) < 9) { st.giveItems(COMPLETE_SKELETON, 1); } @@ -252,7 +251,7 @@ public class Q325_GrimCollector extends Quest if (st.hasQuestItems(ANATOMY_DIAGRAM)) { - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (ItemHolder drop : DROPLIST.get(npc.getNpcId())) { if (chance < drop.getCount()) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java index b9fd8f8d5f..f0651c2ef7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java @@ -19,7 +19,6 @@ package quests.Q327_RecoverTheFarmland; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -133,7 +132,7 @@ public class Q327_RecoverTheFarmland extends Quest if (st.getQuestItemsCount(CLAY_URN_FRAGMENT) >= 5) { st.takeItems(CLAY_URN_FRAGMENT, 5); - if (Rnd.get(6) < 5) + if (getRandom(6) < 5) { htmltext = "30313-03.htm"; st.rewardItems(ANCIENT_CLAY_URN, 1); @@ -150,7 +149,7 @@ public class Q327_RecoverTheFarmland extends Quest if (st.getQuestItemsCount(BRASS_TRINKET_PIECE) >= 5) { st.takeItems(BRASS_TRINKET_PIECE, 5); - if (Rnd.get(7) < 6) + if (getRandom(7) < 6) { htmltext = "30313-05.htm"; st.rewardItems(ANCIENT_BRASS_TIARA, 1); @@ -167,7 +166,7 @@ public class Q327_RecoverTheFarmland extends Quest if (st.getQuestItemsCount(BRONZE_MIRROR_PIECE) >= 5) { st.takeItems(BRONZE_MIRROR_PIECE, 5); - if (Rnd.get(7) < 6) + if (getRandom(7) < 6) { htmltext = "30313-07.htm"; st.rewardItems(ANCIENT_BRONZE_MIRROR, 1); @@ -184,7 +183,7 @@ public class Q327_RecoverTheFarmland extends Quest if (st.getQuestItemsCount(JADE_NECKLACE_BEAD) >= 5) { st.takeItems(JADE_NECKLACE_BEAD, 5); - if (Rnd.get(8) < 7) + if (getRandom(8) < 7) { htmltext = "30313-09.htm"; st.rewardItems(ANCIENT_JADE_NECKLACE, 1); @@ -288,7 +287,7 @@ public class Q327_RecoverTheFarmland extends Quest else { st.takeItems(ANCIENT_CLAY_URN, 1); - st.rewardItems(SOULSHOT_D, 70 + Rnd.get(41)); + st.rewardItems(SOULSHOT_D, 70 + getRandom(41)); } break; } @@ -301,7 +300,7 @@ public class Q327_RecoverTheFarmland extends Quest else { st.takeItems(ANCIENT_BRASS_TIARA, 1); - final int rnd = Rnd.get(100); + final int rnd = getRandom(100); if (rnd < 40) { st.rewardItems(HEALING_POTION, 1); @@ -326,7 +325,7 @@ public class Q327_RecoverTheFarmland extends Quest else { st.takeItems(ANCIENT_BRONZE_MIRROR, 1); - st.rewardItems((Rnd.get(100) < 59) ? SCROLL_OF_ESCAPE : SCROLL_OF_RESURRECTION, 1); + st.rewardItems((getRandom(100) < 59) ? SCROLL_OF_ESCAPE : SCROLL_OF_RESURRECTION, 1); } break; } @@ -339,7 +338,7 @@ public class Q327_RecoverTheFarmland extends Quest else { st.takeItems(ANCIENT_JADE_NECKLACE, 1); - st.rewardItems(SPIRITSHOT_D, 50 + Rnd.get(41)); + st.rewardItems(SPIRITSHOT_D, 50 + getRandom(41)); } break; } @@ -449,7 +448,7 @@ public class Q327_RecoverTheFarmland extends Quest if (npcData[0] == npc.getNpcId()) { st.dropItemsAlways(npcData[2], 1, -1); - st.dropItems(Rnd.get(1848, 1851), 1, 0, npcData[1]); + st.dropItems(getRandom(1848, 1851), 1, 0, npcData[1]); break; } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java index ae67bc7e7e..16929f1c9e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java @@ -19,7 +19,6 @@ package quests.Q328_SenseForBusiness; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -131,7 +130,7 @@ public class Q328_SenseForBusiness extends Quest final int chance = CHANCES.get(npcId); if (npcId < 20069) { - final int rnd = Rnd.get(100); + final int rnd = getRandom(100); if (rnd < (chance + 1)) { st.dropItemsAlways((rnd < chance) ? MONSTER_EYE_CARCASS : MONSTER_EYE_LENS, 1, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java index f806c250c8..8a88bfe210 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java @@ -16,7 +16,6 @@ */ package quests.Q329_CuriosityOfADwarf; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -108,7 +107,7 @@ public class Q329_CuriosityOfADwarf extends Quest return null; } - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance < 2) { st.dropItemsAlways(GOLEM_HEARTSTONE, 1, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java index 49fb137de3..479b86826c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java @@ -19,7 +19,6 @@ package quests.Q330_AdeptOfTaste; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -180,7 +179,7 @@ public class Q330_AdeptOfTaste extends Quest int dish; final int specialIngredientsNumber = st.getQuestItemsCount(WHITE_MANDRAGORA_SAP) + st.getQuestItemsCount(GOLDEN_HONEY) + st.getQuestItemsCount(BROWN_MOSS_BUNDLE); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30469-05t" + Integer.toString(specialIngredientsNumber + 2) + ".htm"; dish = 1443 + specialIngredientsNumber; @@ -502,7 +501,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(ROLANT_CREATURE_BOOK)) { - st.dropItems(MONSTER_EYE_BODY, (Rnd.get(97) < 77) ? 2 : 3, 30, 970000); + st.dropItems(MONSTER_EYE_BODY, (getRandom(97) < 77) ? 2 : 3, 30, 970000); } break; } @@ -510,7 +509,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(ROLANT_CREATURE_BOOK)) { - st.dropItemsAlways(MONSTER_EYE_BODY, (Rnd.get(10) < 7) ? 1 : 2, 30); + st.dropItemsAlways(MONSTER_EYE_BODY, (getRandom(10) < 7) ? 1 : 2, 30); } break; } @@ -518,7 +517,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(GLYVKA_BOTANY_BOOK)) { - st.dropItems(((Rnd.get(96) < 87) ? GREEN_MARSH_MOSS : BROWN_MARSH_MOSS), 1, 20, 960000); + st.dropItems(((getRandom(96) < 87) ? GREEN_MARSH_MOSS : BROWN_MARSH_MOSS), 1, 20, 960000); } break; } @@ -526,7 +525,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(GLYVKA_BOTANY_BOOK)) { - st.dropItemsAlways(((Rnd.get(10) < 9) ? GREEN_MARSH_MOSS : BROWN_MARSH_MOSS), 1, 20); + st.dropItemsAlways(((getRandom(10) < 9) ? GREEN_MARSH_MOSS : BROWN_MARSH_MOSS), 1, 20); } break; } @@ -543,7 +542,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(JACOB_INSECT_BOOK)) { - final int random = Rnd.get(100); + final int random = getRandom(100); final int[] chances = CHANCES.get(npcId); if (random < chances[0]) { @@ -563,7 +562,7 @@ public class Q330_AdeptOfTaste extends Quest { if (st.hasQuestItems(SONIA_BOTANY_BOOK)) { - final int random = Rnd.get(100); + final int random = getRandom(100); final int[] chances = CHANCES.get(npcId); if (random < chances[1]) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java index 2ddec81647..643b1089d0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java @@ -16,7 +16,6 @@ */ package quests.Q333_HuntOfTheBlackLion; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -187,7 +186,7 @@ public class Q333_HuntOfTheBlackLion extends Quest st.giveItems(LION_EYE, 1); - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 25) { st.giveItems(HEALING_POTION, 20); @@ -211,7 +210,7 @@ public class Q333_HuntOfTheBlackLion extends Quest st.giveItems(LION_EYE, 1); - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 25) { st.giveItems(HEALING_POTION, 25); @@ -233,7 +232,7 @@ public class Q333_HuntOfTheBlackLion extends Quest { htmltext = "30735-19b.htm"; - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 25) { st.giveItems(HEALING_POTION, 50); @@ -304,8 +303,8 @@ public class Q333_HuntOfTheBlackLion extends Quest st.takeItems(CARGO_BOX_4, 1); } - final int i0 = Rnd.get(100); - final int i1 = Rnd.get(100); + final int i0 = getRandom(100); + final int i1 = getRandom(100); if (i0 < 40) { if (i1 < 33) @@ -383,7 +382,7 @@ public class Q333_HuntOfTheBlackLion extends Quest htmltext = "30736-04m.htm"; st.giveItems(IMPERIAL_DIAMOND, 1); } - else if (Rnd.nextBoolean()) + else if (getRandomBoolean()) { htmltext = "30736-04n.htm"; @@ -439,7 +438,7 @@ public class Q333_HuntOfTheBlackLion extends Quest { if (state < 3) { - final int i0 = Rnd.get(100); + final int i0 = getRandom(100); if (i0 < 5) { htmltext = "30736-08a.htm"; @@ -540,7 +539,7 @@ public class Q333_HuntOfTheBlackLion extends Quest st.takeItems(STATUE_SHILIEN_ARM, 1); st.takeItems(STATUE_SHILIEN_LEG, 1); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30471-04.htm"; st.giveItems(COMPLETE_STATUE, 1); @@ -561,7 +560,7 @@ public class Q333_HuntOfTheBlackLion extends Quest st.takeItems(TABLET_FRAGMENT_3, 1); st.takeItems(TABLET_FRAGMENT_4, 1); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30471-07.htm"; st.giveItems(COMPLETE_TABLET, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java index 6e50ce604f..f8216603ca 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java @@ -16,7 +16,6 @@ */ package quests.Q334_TheWishingPotion; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -210,7 +209,7 @@ public class Q334_TheWishingPotion extends Quest if (st.getQuestItemsCount(WISH_POTION_ID) >= 1) { st.takeItems(WISH_POTION_ID, 1); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { st.addSpawn(SUCCUBUS_OF_SEDUCTION); st.addSpawn(SUCCUBUS_OF_SEDUCTION); @@ -232,7 +231,7 @@ public class Q334_TheWishingPotion extends Quest if (st.getQuestItemsCount(WISH_POTION_ID) >= 1) { st.takeItems(WISH_POTION_ID, 1); - final int WISH_CHANCE = Rnd.get(100) + 1; + final int WISH_CHANCE = getRandom(100) + 1; if (WISH_CHANCE <= 33) { st.addSpawn(GRIMA); @@ -243,9 +242,9 @@ public class Q334_TheWishingPotion extends Quest { st.giveItems(57, 10000); } - else if (Rnd.get(100) < 2) + else if (getRandom(100) < 2) { - st.giveItems(57, (Rnd.get(10) + 1) * 1000000); + st.giveItems(57, (getRandom(10) + 1) * 1000000); } else { @@ -265,7 +264,7 @@ public class Q334_TheWishingPotion extends Quest if (st.getQuestItemsCount(WISH_POTION_ID) >= 1) { st.takeItems(WISH_POTION_ID, 1); - final int WISH_CHANCE = Rnd.get(100) + 1; + final int WISH_CHANCE = getRandom(100) + 1; if (WISH_CHANCE <= 33) { st.giveItems(CERTIFICATE_OF_ROYALTY_ID, 1); @@ -290,7 +289,7 @@ public class Q334_TheWishingPotion extends Quest if (st.getQuestItemsCount(WISH_POTION_ID) >= 1) { st.takeItems(3467, 1); - final int WISH_CHANCE = Rnd.get(100) + 1; + final int WISH_CHANCE = getRandom(100) + 1; if (WISH_CHANCE <= 33) { st.giveItems(SPELLBOOK_ICEBOLT_ID, 1); @@ -404,7 +403,7 @@ public class Q334_TheWishingPotion extends Quest } case WISDOM_CHEST: { - final int dropChance = Rnd.get(100); + final int dropChance = getRandom(100); if (dropChance < 20) { st.giveItems(SPELLBOOK_ICEBOLT_ID, 1); @@ -421,13 +420,13 @@ public class Q334_TheWishingPotion extends Quest else { st.getPlayer().getTarget().decayMe(); - htmltext = "30743-0" + (Rnd.get(5) + 1) + ".htm"; + htmltext = "30743-0" + (getRandom(5) + 1) + ".htm"; } break; } case RUPINA: { - if (Rnd.get(100) < DROP_CHANCE_NECKLACE_OF_GRACE_ID) + if (getRandom(100) < DROP_CHANCE_NECKLACE_OF_GRACE_ID) { st.giveItems(NECKLACE_OF_GRACE_ID, 1); } @@ -460,12 +459,12 @@ public class Q334_TheWishingPotion extends Quest { if (element[5] == 0) { - if (Rnd.get(100) < element[6]) + if (getRandom(100) < element[6]) { st.giveItems(element[4], element[7]); } } - else if ((Rnd.get(100) < element[6]) && (st.getQuestItemsCount(element[4]) < element[5])) + else if ((getRandom(100) < element[6]) && (st.getQuestItemsCount(element[4]) < element[5])) { st.giveItems(element[4], element[7]); if (cond == 3) @@ -480,7 +479,7 @@ public class Q334_TheWishingPotion extends Quest } } } - final int dropChance = Rnd.get(100) + 1; + final int dropChance = getRandom(100) + 1; if ((npcId == SUCCUBUS_OF_SEDUCTION) && (dropChance <= DROP_CHANCE_FORBIDDEN_LOVE_SCROLL_ID)) { st.playSound(QuestState.SOUND_ITEMGET); @@ -489,21 +488,21 @@ public class Q334_TheWishingPotion extends Quest else if ((npcId == GRIMA) && (dropChance <= DROP_CHANCE_GOLD_BAR_ID)) { st.playSound(QuestState.SOUND_ITEMGET); - st.giveItems(GOLD_BAR_ID, Rnd.get(5) + 1); + st.giveItems(GOLD_BAR_ID, getRandom(5) + 1); } - else if ((npcId == SANCHES) && (Rnd.get(100) < 50)) + else if ((npcId == SANCHES) && (getRandom(100) < 50)) { st.addSpawn(BONAPARTERIUS); } - else if ((npcId == BONAPARTERIUS) && (Rnd.get(100) < 50)) + else if ((npcId == BONAPARTERIUS) && (getRandom(100) < 50)) { st.addSpawn(RAMSEBALIUS); } - else if ((npcId == RAMSEBALIUS) && (Rnd.get(100) < 50)) + else if ((npcId == RAMSEBALIUS) && (getRandom(100) < 50)) { st.addSpawn(GREAT_DEMON_KING); } - else if ((npcId == GREAT_DEMON_KING) && (Rnd.get(100) < 50)) + else if ((npcId == GREAT_DEMON_KING) && (getRandom(100) < 50)) { if (dropChance <= 25) { 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 fd9f415b36..e7e3775fcf 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 @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -294,37 +293,37 @@ public class Q335_TheSongOfTheHunter extends Quest final int[] list = new int[5]; if (Laurel_Leaf_Pin_count < 4L) { - if ((Laurel_Leaf_Pin_count == 0) || (Rnd.get(100) < 80)) + if ((Laurel_Leaf_Pin_count == 0) || (getRandom(100) < 80)) { for (int i = 0; i < 5; ++i) { - list[i] = Rnd.get(12); + list[i] = getRandom(12); } } else { - list[0] = 12 + Rnd.get(6); - list[1] = Rnd.get(12); - list[2] = Rnd.get(6); - list[3] = 6 + Rnd.get(6); - list[4] = Rnd.get(12); + list[0] = 12 + getRandom(6); + list[1] = getRandom(12); + list[2] = getRandom(6); + list[3] = 6 + getRandom(6); + list[4] = getRandom(12); } } - else if (Rnd.get(100) < 20) + else if (getRandom(100) < 20) { - list[0] = 12 + Rnd.get(6); - list[1] = Rnd.get(100) < 5 ? (18 + Rnd.get(3)) : Rnd.get(12); - list[2] = Rnd.get(6); - list[3] = 6 + Rnd.get(6); - list[4] = Rnd.get(12); + list[0] = 12 + getRandom(6); + list[1] = getRandom(100) < 5 ? (18 + getRandom(3)) : getRandom(12); + list[2] = getRandom(6); + list[3] = 6 + getRandom(6); + list[4] = getRandom(12); } else { - list[0] = Rnd.get(12); - list[1] = Rnd.get(100) < 5 ? (18 + Rnd.get(3)) : Rnd.get(12); - list[2] = Rnd.get(6); - list[3] = 6 + Rnd.get(6); - list[4] = Rnd.get(12); + list[0] = getRandom(12); + list[1] = getRandom(100) < 5 ? (18 + getRandom(3)) : getRandom(12); + list[2] = getRandom(6); + list[3] = 6 + getRandom(6); + list[4] = getRandom(12); } boolean sortFlag; do @@ -731,7 +730,7 @@ public class Q335_TheSongOfTheHunter extends Quest { for (int i = 2; i < itemCond.length; ++i) { - if ((npcId == itemCond[i][0]) && (Rnd.get(100) < itemCond[i][1]) && (st.getQuestItemsCount(itemCond[0][0]) < itemCond[1][0])) + if ((npcId == itemCond[i][0]) && (getRandom(100) < itemCond[i][1]) && (st.getQuestItemsCount(itemCond[0][0]) < itemCond[1][0])) { st.giveItems(itemCond[0][0], 1); } @@ -744,15 +743,15 @@ public class Q335_TheSongOfTheHunter extends Quest final long markasHeadCount = st.getQuestItemsCount(MARKAS_HEAD); if (npcId == BREKA_ORC_WARRIOR) { - if ((hakasHeadCount == 0) && (Rnd.get(100) < 10)) + if ((hakasHeadCount == 0) && (getRandom(100) < 10)) { st.addSpawn(BREKA_OVERLORD_HAKA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((jakasHeadCount == 0) && (Rnd.get(100) < 10)) + else if ((jakasHeadCount == 0) && (getRandom(100) < 10)) { st.addSpawn(BREKA_OVERLORD_JAKA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((markasHeadCount == 0) && (Rnd.get(100) < 10)) + else if ((markasHeadCount == 0) && (getRandom(100) < 10)) { st.addSpawn(BREKA_OVERLORD_MARKA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } @@ -778,7 +777,7 @@ public class Q335_TheSongOfTheHunter extends Quest st.giveItems(MARKAS_HEAD, 1); } } - else if ((npcId == WINDSUS) && (st.getQuestItemsCount(WINDSUS_ALEPH_SKIN) == 0) && (Rnd.get(100) < 10)) + else if ((npcId == WINDSUS) && (st.getQuestItemsCount(WINDSUS_ALEPH_SKIN) == 0) && (getRandom(100) < 10)) { st.addSpawn(WINDSUS_ALEPH, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } @@ -792,23 +791,23 @@ public class Q335_TheSongOfTheHunter extends Quest final long Kalaths_Head_count = st.getQuestItemsCount(KALATHS_HEAD); if (npcId == TARLK_BUGBEAR_WARRIOR) { - if ((Athus_Head_count == 0) && (Rnd.get(100) < 10)) + if ((Athus_Head_count == 0) && (getRandom(100) < 10)) { st.addSpawn(TARLK_RAIDER_ATHU, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((Lankas_Head_count == 0) && (Rnd.get(100) < 10)) + else if ((Lankas_Head_count == 0) && (getRandom(100) < 10)) { st.addSpawn(TARLK_RAIDER_LANKA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((Triskas_Head_count == 0) && (Rnd.get(100) < 10)) + else if ((Triskas_Head_count == 0) && (getRandom(100) < 10)) { st.addSpawn(TARLK_RAIDER_TRISKA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((Moturas_Head_count == 0) && (Rnd.get(100) < 10)) + else if ((Moturas_Head_count == 0) && (getRandom(100) < 10)) { st.addSpawn(TARLK_RAIDER_MOTURA, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } - else if ((Kalaths_Head_count == 0) && (Rnd.get(100) < 10)) + else if ((Kalaths_Head_count == 0) && (getRandom(100) < 10)) { st.addSpawn(TARLK_RAIDER_KALATH, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); } @@ -858,7 +857,7 @@ public class Q335_TheSongOfTheHunter extends Quest { if (npcId == lizardmen_id) { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { st.takeItems(Q_BLOOD_CRYSTAL[bloodCrystalLevel], -1); st.playSound((bloodCrystalLevel < 6) ? QuestState.SOUND_MIDDLE : QuestState.SOUND_JACKPOT); @@ -883,14 +882,14 @@ public class Q335_TheSongOfTheHunter extends Quest } if (request != null) { - if (request.droplist.containsKey(npcId) && (Rnd.get(100) < request.droplist.get(npcId)) && (st.getQuestItemsCount(request.request_item) < request.request_count)) + if (request.droplist.containsKey(npcId) && (getRandom(100) < request.droplist.get(npcId)) && (st.getQuestItemsCount(request.request_item) < request.request_count)) { st.giveItems(request.request_item, 1); } if (request.spawnlist.containsKey(npcId) && (st.getQuestItemsCount(request.request_item) < request.request_count)) { final int[] spawnChance = request.spawnlist.get(npcId); - if (Rnd.get(100) < spawnChance[1]) + if (getRandom(100) < spawnChance[1]) { st.addSpawn(spawnChance[0], npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); if (spawnChance[0] == 27149) @@ -901,7 +900,7 @@ public class Q335_TheSongOfTheHunter extends Quest } } } - if (((npcId == 27160) || (npcId == 27162) || (npcId == 27164)) && (Rnd.get(100) < 50)) + if (((npcId == 27160) || (npcId == 27162) || (npcId == 27164)) && (getRandom(100) < 50)) { npc.broadcastNpcSay("We'll take the property of the ancient empire!"); st.addSpawn(27150, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 300000); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java index 1db4854182..11c71ac9de 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java @@ -16,7 +16,6 @@ */ package quests.Q336_CoinsOfMagic; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -352,7 +351,7 @@ public class Q336_CoinsOfMagic extends Quest final int npcId = npc.getNpcId(); if ((npcId == HARIT_LIZARDMAN_MATRIARCH) || (npcId == HARIT_LIZARDMAN_SHAMAN)) { - if ((cond == 2) && (Rnd.get(1000) < 63)) + if ((cond == 2) && (getRandom(1000) < 63)) { st.giveItems(KALDIS_COIN, 1); st.setCond(3); @@ -366,7 +365,7 @@ public class Q336_CoinsOfMagic extends Quest { if (e[0] == npcId) { - if (Rnd.get(100) < chance) + if (getRandom(100) < chance) { st.giveItems(e[1], 1); } @@ -378,9 +377,9 @@ public class Q336_CoinsOfMagic extends Quest { if (u == npcId) { - if (Rnd.get(100) < (chance * npc.getTemplate().getBaseHpConsumeRate())) + if (getRandom(100) < (chance * npc.getTemplate().getBaseHpConsumeRate())) { - st.giveItems(BASIC_COINS[Rnd.get(BASIC_COINS.length)], 1); + st.giveItems(BASIC_COINS[getRandom(BASIC_COINS.length)], 1); } return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java index 599aef5665..47284afa1a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java @@ -16,7 +16,6 @@ */ package quests.Q337_AudienceWithTheLandDragon; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -507,7 +506,7 @@ public class Q337_AudienceWithTheLandDragon extends Quest // reward jewel fragment if (percentHp < 33) { - if ((Rnd.get(100) < 33) && (st.getInt("drop" + npcInfo[2]) == 1)) + if ((getRandom(100) < 33) && (st.getInt("drop" + npcInfo[2]) == 1)) { final int itemId = npcInfo[3]; if (!st.hasQuestItems(itemId)) @@ -520,7 +519,7 @@ public class Q337_AudienceWithTheLandDragon extends Quest // spawn monsters and register spawned else if (percentHp < 66) { - if ((Rnd.get(100) < 33) && (st.getInt("drop" + npcInfo[2]) == 1)) + if ((getRandom(100) < 33) && (st.getInt("drop" + npcInfo[2]) == 1)) { boolean spawn; if (npcId == ABYSSAL_JEWEL_3) @@ -540,7 +539,7 @@ public class Q337_AudienceWithTheLandDragon extends Quest { for (int i = 0; i < npcInfo[4]; i++) { - final Npc mob = addSpawn(npcInfo[5], npc.getX() + Rnd.get(-150, 150), npc.getY() + Rnd.get(-150, 150), npc.getZ(), npc.getHeading(), true, 60000); + final Npc mob = addSpawn(npcInfo[5], npc.getX() + getRandom(-150, 150), npc.getY() + getRandom(-150, 150), npc.getZ(), npc.getHeading(), true, 60000); mob.setRunning(); ((Attackable) mob).addDamageHate(attacker, 0, 500); mob.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker); @@ -631,7 +630,7 @@ public class Q337_AudienceWithTheLandDragon extends Quest { for (int i = 0; i < 8; i++) { - addSpawn(SACRIFICE_OF_THE_SACRIFICED, npc.getX() + Rnd.get(-100, 100), npc.getY() + Rnd.get(-100, 100), npc.getZ(), npc.getHeading(), true, 60000); + addSpawn(SACRIFICE_OF_THE_SACRIFICED, npc.getX() + getRandom(-100, 100), npc.getY() + getRandom(-100, 100), npc.getZ(), npc.getHeading(), true, 60000); } } break; @@ -639,11 +638,11 @@ public class Q337_AudienceWithTheLandDragon extends Quest case HARIT_LIZARDMAN_SHAMAN:// Kendra's request case HARIT_LIZARDMAN_MATRIARCH: { - if ((cond == 1) && (Rnd.get(5) == 0) && (st.getInt("drop2") == 1) && !st.hasQuestItems(TOTEM_OF_LAND_DRAGON)) + if ((cond == 1) && (getRandom(5) == 0) && (st.getInt("drop2") == 1) && !st.hasQuestItems(TOTEM_OF_LAND_DRAGON)) { for (int i = 0; i < 3; i++) { - addSpawn(HARIT_LIZARDMAN_ZEALOT, npc.getX() + Rnd.get(-50, 50), npc.getY() + Rnd.get(-50, 50), npc.getZ(), npc.getHeading(), true, 60000); + addSpawn(HARIT_LIZARDMAN_ZEALOT, npc.getX() + getRandom(-50, 50), npc.getY() + getRandom(-50, 50), npc.getZ(), npc.getHeading(), true, 60000); } } break; @@ -653,9 +652,9 @@ public class Q337_AudienceWithTheLandDragon extends Quest case CAVE_KEEPER_1: case CAVE_KEEPER_2: { - if ((cond == 4) && (Rnd.get(5) == 0) && !st.hasQuestItems(THIRD_FRAGMENT_OF_ABYSS_JEWEL)) + if ((cond == 4) && (getRandom(5) == 0) && !st.hasQuestItems(THIRD_FRAGMENT_OF_ABYSS_JEWEL)) { - addSpawn(ABYSSAL_JEWEL_3, npc.getX() + Rnd.get(-50, 50), npc.getY() + Rnd.get(-50, 50), npc.getZ(), npc.getHeading(), true, 60000); + addSpawn(ABYSSAL_JEWEL_3, npc.getX() + getRandom(-50, 50), npc.getY() + getRandom(-50, 50), npc.getZ(), npc.getHeading(), true, 60000); } break; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java index 22054d430a..3e1b531a63 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java @@ -16,7 +16,6 @@ */ package quests.Q343_UnderTheShadowOfTheIvoryTower; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -78,8 +77,8 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest return htmltext; } - final int random1 = Rnd.get(3); - final int random2 = Rnd.get(2); + final int random1 = getRandom(3); + final int random2 = getRandom(2); final int orbs = st.getQuestItemsCount(ORB); switch (event) { @@ -312,7 +311,7 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest if (st.getQuestItemsCount(ECTOPLASM) > 0) { st.takeItems(ECTOPLASM, 1); - final int random3 = Rnd.get(1000); + final int random3 = getRandom(1000); if (random3 <= 119) { st.giveItems(955, 1); @@ -323,11 +322,11 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest } else if (random3 <= 329) { - st.giveItems(2511, (Rnd.get(200) + 401)); + st.giveItems(2511, (getRandom(200) + 401)); } else if (random3 <= 559) { - st.giveItems(2510, (Rnd.get(200) + 401)); + st.giveItems(2510, (getRandom(200) + 401)); } else if (random3 <= 561) { @@ -435,7 +434,7 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest return null; } - if (Rnd.get(100) < CHANCE) + if (getRandom(100) < CHANCE) { st.giveItems(ORB, 1); st.playSound(QuestState.SOUND_ITEMGET); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java index c67a8c905d..88f638c2d4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java @@ -19,7 +19,6 @@ package quests.Q344_1000YearsTheEndOfLamentation; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -112,7 +111,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest st.giveItems(57, amount * 60); // Special item, % based on actual number of qItems. - if (Rnd.get(1000) < Math.min(10, Math.max(1, amount / 10))) + if (getRandom(1000) < Math.min(10, Math.max(1, amount / 10))) { htmltext = "30754-10.htm"; } @@ -121,7 +120,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest } case "30754-11.htm": { - final int random = Rnd.get(4); + final int random = getRandom(4); if (random < 1) { htmltext = "30754-12.htm"; @@ -218,7 +217,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest st.set("success", "1"); st.takeItems(CRUCIFIX, -1); - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance < 80) { st.giveItems(1875, 19); @@ -241,7 +240,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest st.set("success", "1"); st.takeItems(OLD_TOTEM, -1); - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance < 55) { st.giveItems(1882, 70); @@ -264,7 +263,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest st.set("success", "1"); st.takeItems(OLD_HILT, -1); - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance < 60) { st.giveItems(1874, 25); @@ -291,7 +290,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest st.set("success", "1"); st.takeItems(OLD_KEY, -1); - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (chance < 80) { st.giveItems(1879, 55); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java index 0ac8be8b54..bf1f019f6a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java @@ -16,7 +16,6 @@ */ package quests.Q345_MethodToRaiseTheDead; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -90,7 +89,7 @@ public class Q345_MethodToRaiseTheDead extends Quest { if (st.isCond(3)) { - final int chance = Rnd.get(3); + final int chance = getRandom(3); if (chance == 0) { st.setCond(6); @@ -194,7 +193,7 @@ public class Q345_MethodToRaiseTheDead extends Quest st.rewardItems(57, 3040 + amount); // Reward can be either an Imperial Diamond or bills. - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { st.giveItems(IMPERIAL_DIAMOND, 1); } @@ -254,9 +253,9 @@ public class Q345_MethodToRaiseTheDead extends Quest return null; } - if (Rnd.get(4) == 0) + if (getRandom(4) == 0) { - final int randomPart = Rnd.get(VICTIM_ARM_BONE, VICTIM_SPINE); + final int randomPart = getRandom(VICTIM_ARM_BONE, VICTIM_SPINE); if (!st.hasQuestItems(randomPart)) { st.playSound(QuestState.SOUND_ITEMGET); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java index e0f9c58ecd..a697cc5065 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java @@ -16,7 +16,6 @@ */ package quests.Q348_AnArrogantSearch; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -119,7 +118,7 @@ public class Q348_AnArrogantSearch extends Quest { st.setCond(24); st.playSound(QuestState.SOUND_MIDDLE); - st.rewardItems(57, Rnd.get(1, 2) * 12000); + st.rewardItems(57, getRandom(1, 2) * 12000); break; } case "30864-37.htm": @@ -823,7 +822,7 @@ public class Q348_AnArrogantSearch extends Quest case SEAL_ANGEL: case GUARDIAN_ANGEL: { - if (((cond == 26) || (cond == 29)) && (Rnd.get(4) < 1) && st.hasQuestItems(WHITE_FABRIC_ANGELS)) + if (((cond == 26) || (cond == 29)) && (getRandom(4) < 1) && st.hasQuestItems(WHITE_FABRIC_ANGELS)) { st.playSound(QuestState.SOUND_ITEMGET); st.takeItems(WHITE_FABRIC_ANGELS, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java index a0a980736a..5725db77a9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java @@ -16,7 +16,6 @@ */ package quests.Q351_BlackSwan; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -162,7 +161,7 @@ public class Q351_BlackSwan extends Quest return null; } - final int random = Rnd.get(4); + final int random = getRandom(4); if (random < 3) { st.dropItemsAlways(LIZARD_FANG, (random < 2) ? 1 : 2, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java index 08fe5e1a5c..9f940063c8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java @@ -16,7 +16,6 @@ */ package quests.Q352_HelpRoodRaiseANewPet; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -129,7 +128,7 @@ public class Q352_HelpRoodRaiseANewPet extends Quest } final int npcId = npc.getNpcId(); - final int random = Rnd.get(100); + final int random = getRandom(100); final int chance = ((npcId == 20786) || (npcId == 21644)) ? 44 : 58; if (random < chance) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java index 50c916fb9f..6ae4bbaf95 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java @@ -19,7 +19,6 @@ package quests.Q355_FamilyHonor; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -106,7 +105,7 @@ public class Q355_FamilyHonor extends Quest { st.takeItems(WORK_OF_BERONA, 1); - final int appraising = Rnd.get(100); + final int appraising = getRandom(100); if (appraising < 20) { htmltext = "30929-2.htm"; @@ -200,7 +199,7 @@ public class Q355_FamilyHonor extends Quest } final int[] chances = CHANCES.get(npc.getNpcId()); - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < chances[1]) { st.dropItemsAlways((random < chances[0]) ? GALIBREDO_BUST : WORK_OF_BERONA, 1, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java index 3e97eb7e97..a6a3eeea9b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java @@ -16,7 +16,6 @@ */ package quests.Q358_IllegitimateChildOfAGoddess; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -94,7 +93,7 @@ public class Q358_IllegitimateChildOfAGoddess extends Quest { htmltext = "30862-07.htm"; st.takeItems(SCALE, -1); - st.giveItems(REWARD[Rnd.get(REWARD.length)], 1); + st.giveItems(REWARD[getRandom(REWARD.length)], 1); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java index 39ad495c89..57b32813cd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java @@ -19,7 +19,6 @@ package quests.Q359_ForSleeplessDeadmen; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -80,7 +79,7 @@ public class Q359_ForSleeplessDeadmen extends Quest } else if (event.equals("30857-10.htm")) { - st.giveItems(REWARD[Rnd.get(REWARD.length)], 4); + st.giveItems(REWARD[getRandom(REWARD.length)], 4); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java index 7a29c22f31..1aaf4178d4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java @@ -16,7 +16,6 @@ */ package quests.Q364_JovialAccordion; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -78,7 +77,7 @@ public class Q364_JovialAccordion extends Quest if (st.hasQuestItems(KEY_2)) { st.takeItems(KEY_2, 1); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30960-02.htm"; st.giveItems(STOLEN_BEER, 1); @@ -92,7 +91,7 @@ public class Q364_JovialAccordion extends Quest if (st.hasQuestItems(KEY_1)) { st.takeItems(KEY_1, 1); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30961-02.htm"; st.giveItems(STOLEN_CLOTHES, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java index 6516dc37d3..3df348ca60 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java @@ -16,7 +16,6 @@ */ package quests.Q365_DevilsLegacy; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Npc; @@ -81,9 +80,9 @@ public class Q365_DevilsLegacy extends Quest st.takeItems(57, 600); int i0; - if (Rnd.get(100) < 80) + if (getRandom(100) < 80) { - i0 = Rnd.get(100); + i0 = getRandom(100); if (i0 < 1) { st.giveItems(955, 1); @@ -109,7 +108,7 @@ public class Q365_DevilsLegacy extends Quest } else { - i0 = Rnd.get(1000); + i0 = getRandom(1000); if (i0 < 10) { st.giveItems(951, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java index b15360a1d8..29acfb07f6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java @@ -16,7 +16,6 @@ */ package quests.Q367_ElectrifyingRecharge; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -157,7 +156,7 @@ public class Q367_ElectrifyingRecharge extends Quest { htmltext = "30673-06.htm"; st.takeItems(5879, 1); - st.rewardItems(REWARD[Rnd.get(REWARD.length)], 1); + st.rewardItems(REWARD[getRandom(REWARD.length)], 1); st.playSound(QuestState.SOUND_FINISH); } break; @@ -177,7 +176,7 @@ public class Q367_ElectrifyingRecharge extends Quest if ((skill.getId() == 4072) && st.hasQuestItems(LORAIN_LAMP)) { - final int randomItem = Rnd.get(5876, 5880); + final int randomItem = getRandom(5876, 5880); st.takeItems(LORAIN_LAMP, 1); st.giveItems(randomItem, 1); if (randomItem == 5879) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java index cdddfe20f6..11b6c57f82 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java @@ -19,7 +19,6 @@ package quests.Q371_ShriekOfGhosts; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -100,7 +99,7 @@ public class Q371_ShriekOfGhosts extends Quest { if (st.hasQuestItems(PORCELAIN)) { - final int chance = Rnd.get(100); + final int chance = getRandom(100); st.takeItems(PORCELAIN, 1); if (chance < 2) { @@ -200,7 +199,7 @@ public class Q371_ShriekOfGhosts extends Quest } final int[] chances = CHANCES.get(npc.getNpcId()); - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < chances[1]) { st.dropItemsAlways((random < chances[0]) ? URN : PORCELAIN, 1, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java index fa5645169f..486aec71ab 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java @@ -16,7 +16,6 @@ */ package quests.Q372_LegacyOfInsolence; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -221,7 +220,7 @@ public class Q372_LegacyOfInsolence extends Quest // Retrieve array with rewards. final int[][] rewards = REWARDS_MATRICE[rewardType]; - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] reward : rewards) { if (chance < reward[0]) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java index 18cb0a5c0b..3cf32e6016 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java @@ -19,7 +19,6 @@ package quests.Q373_SupplierOfReagents; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -240,7 +239,7 @@ public class Q373_SupplierOfReagents extends Quest continue; } - if (Rnd.get(100) < temperature[1]) + if (getRandom(100) < temperature[1]) { st.giveItems(formula[3], temperature[2]); return "31149-12-" + formula[3] + ".htm"; @@ -308,7 +307,7 @@ public class Q373_SupplierOfReagents extends Quest } else { - final int random = Rnd.get(1000); + final int random = getRandom(1000); if (random < drop[3]) { st.dropItemsAlways((random < drop[2]) ? drop[0] : drop[1], 1, 0); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java index 16f50efdb2..3ddc42f0f8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java @@ -16,7 +16,6 @@ */ package quests.Q375_WhisperOfDreams_Part2; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -101,7 +100,7 @@ public class Q375_WhisperOfDreams_Part2 extends Quest st.playSound(QuestState.SOUND_MIDDLE); st.takeItems(KARIK_HORN, 100); st.takeItems(CAVE_HOWLER_SKULL, 100); - st.giveItems(REWARDS[Rnd.get(REWARDS.length)], 1); + st.giveItems(REWARDS[getRandom(REWARDS.length)], 1); } else { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java index e98dce4e16..a1c9ac94ac 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java @@ -16,7 +16,6 @@ */ package quests.Q376_ExplorationOfTheGiantsCave_Part1; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -232,7 +231,7 @@ public class Q376_ExplorationOfTheGiantsCave_Part1 extends Quest st.takeItems(book, 1); } - st.giveItems(RECIPES[type][Rnd.get(RECIPES[type].length)], 1); + st.giveItems(RECIPES[type][getRandom(RECIPES[type].length)], 1); return "31147-04.htm"; } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java index 3eaa4061af..ffd7aeff38 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java @@ -16,7 +16,6 @@ */ package quests.Q377_ExplorationOfTheGiantsCave_Part2; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -150,7 +149,7 @@ public class Q377_ExplorationOfTheGiantsCave_Part2 extends Quest st.takeItems(book, 1); } - st.giveItems(RECIPES[type][Rnd.get(RECIPES[type].length)], 1); + st.giveItems(RECIPES[type][getRandom(RECIPES[type].length)], 1); return "31147-04.htm"; } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java index d35582e72c..76867b5a90 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java @@ -16,7 +16,6 @@ */ package quests.Q379_FantasyWine; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -64,7 +63,7 @@ public class Q379_FantasyWine extends Quest { st.takeItems(LEAF, 80); st.takeItems(STONE, 100); - final int rand = Rnd.get(10); + final int rand = getRandom(10); if (rand < 3) { htmltext = "30074-6.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java index e2aa98ac47..f85b079807 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java @@ -16,7 +16,6 @@ */ package quests.Q380_BringOutTheFlavorOfIngredients; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -133,7 +132,7 @@ public class Q380_BringOutTheFlavorOfIngredients extends Quest else if (cond == 6) { st.giveItems(RITRON_JELLY, 1); - if (Rnd.get(100) < 55) + if (getRandom(100) < 55) { htmltext = "30069-11.htm"; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java index 88ecf29122..c0425c09ad 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java @@ -16,7 +16,6 @@ */ package quests.Q382_KailsMagicCoin; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -118,7 +117,7 @@ public class Q382_KailsMagicCoin extends Quest } case FALLEN_ORC_CAPTAIN: { - st.dropItems(5961 + Rnd.get(3), 1, 0, 100000); + st.dropItems(5961 + getRandom(3), 1, 0, 100000); break; } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java index 031fdd0d8c..aa6f2fddd3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java @@ -16,7 +16,6 @@ */ package quests.Q383_SearchingForTreasure; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -101,7 +100,7 @@ public class Q383_SearchingForTreasure extends Quest // Adena reward. int i1 = 0; - int i0 = Rnd.get(100); + int i0 = getRandom(100); if (i0 < 5) { st.giveItems(2450, 1); @@ -123,7 +122,7 @@ public class Q383_SearchingForTreasure extends Quest i1 += 500; } - i0 = Rnd.get(1000); + i0 = getRandom(1000); if (i0 < 25) { st.giveItems(4481, 1); @@ -177,7 +176,7 @@ public class Q383_SearchingForTreasure extends Quest i1 += 300; } - i0 = Rnd.get(100); + i0 = getRandom(100); if (i0 < 4) { st.giveItems(1337, 1); @@ -211,7 +210,7 @@ public class Q383_SearchingForTreasure extends Quest i1 += 500; } - i0 = Rnd.get(100); + i0 = getRandom(100); if (i0 < 20) { st.giveItems(4408, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java index 5ba91a2b97..e60182bb5b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java @@ -19,7 +19,6 @@ package quests.Q384_WarehouseKeepersPastime; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -241,7 +240,7 @@ public class Q384_WarehouseKeepersPastime extends Quest { htmltext = getHtmlText(npcId + "-23.htm"); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] reward : ((st.get("bet") == "10") ? _rewards_10_win : _rewards_100_win)) { if (chance < reward[0]) @@ -259,7 +258,7 @@ public class Q384_WarehouseKeepersPastime extends Quest { htmltext = getHtmlText(npcId + "-25.htm"); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] reward : ((st.get("bet") == "10") ? _rewards_10_lose : _rewards_100_lose)) { if (chance < reward[0]) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java index 9a512c2616..00b95cdc26 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java @@ -19,7 +19,6 @@ package quests.Q386_StolenDignity; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -229,12 +228,12 @@ public class Q386_StolenDignity extends Quest if (winningLines == 3) { htmltext = getHtmlText("30843-22.htm"); - st.rewardItems(REWARDS[Rnd.get(REWARDS.length)], 4); + st.rewardItems(REWARDS[getRandom(REWARDS.length)], 4); } else if (winningLines == 0) { htmltext = getHtmlText("30843-24.htm"); - st.rewardItems(REWARDS[Rnd.get(REWARDS.length)], 10); + st.rewardItems(REWARDS[getRandom(REWARDS.length)], 10); } else { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java index 3bb9c6b842..baff70676d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java @@ -16,7 +16,6 @@ */ package quests.Q403_PathToARogue; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -241,7 +240,7 @@ public class Q403_PathToARogue extends Quest { if (st.isCond(5)) { - final int randomItem = Rnd.get(STOLEN_JEWELRY, STOLEN_NECKLACE); + final int randomItem = getRandom(STOLEN_JEWELRY, STOLEN_NECKLACE); if (!st.hasQuestItems(randomItem)) { st.giveItems(randomItem, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java index 323a42989f..23a3882db8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java @@ -16,7 +16,6 @@ */ package quests.Q414_PathToAnOrcRaider; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -231,7 +230,7 @@ public class Q414_PathToAnOrcRaider extends Quest { if (st.isCond(1)) { - if (st.getQuestItemsCount(GREEN_BLOOD) <= Rnd.get(20)) + if (st.getQuestItemsCount(GREEN_BLOOD) <= getRandom(20)) { st.playSound(QuestState.SOUND_ITEMGET); st.giveItems(GREEN_BLOOD, 1); @@ -254,7 +253,7 @@ public class Q414_PathToAnOrcRaider extends Quest } case UMBAR_ORC: { - if ((st.isCond(3) || st.isCond(4)) && (st.getQuestItemsCount(HEAD_OF_BETRAYER) < 2) && (Rnd.get(10) < 2)) + if ((st.isCond(3) || st.isCond(4)) && (st.getQuestItemsCount(HEAD_OF_BETRAYER) < 2) && (getRandom(10) < 2)) { if (st.isCond(3)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java index 26be2ab500..6572c0011d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java @@ -16,7 +16,6 @@ */ package quests.Q416_PathToAnOrcShaman; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -464,7 +463,7 @@ public class Q416_PathToAnOrcShaman extends Quest if (st.isCond(9)) { final int count = st.getQuestItemsCount(DURKA_PARASITE); - final int rnd = Rnd.get(10); + final int rnd = getRandom(10); if (((count == 5) && (rnd < 1)) || (((count == 6) || (count == 7)) && (rnd < 2)) || (count >= 8)) { st.playSound(QuestState.SOUND_BEFORE_BATTLE); @@ -499,7 +498,7 @@ public class Q416_PathToAnOrcShaman extends Quest st.setCond(15); st.playSound(QuestState.SOUND_MIDDLE); - if (Rnd.get(3) < 2) + if (getRandom(3) < 2) { npc.broadcastNpcSay("My dear friend of " + player.getName() + ", who has gone on ahead of me!"); } @@ -514,7 +513,7 @@ public class Q416_PathToAnOrcShaman extends Quest st.setCond(17); st.playSound(QuestState.SOUND_MIDDLE); - if (Rnd.get(3) < 2) + if (getRandom(3) < 2) { npc.broadcastNpcSay("Listen to Tejakar Gandi, young Oroka! The spirit of the slain leopard is calling you, " + player.getName() + "!"); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java index d6aabebb4d..0820b2df4a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java @@ -16,7 +16,6 @@ */ package quests.Q417_PathToBecomeAScavenger; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -105,7 +104,7 @@ public class Q417_PathToBecomeAScavenger extends Quest } case "30519_1": { - final int random = Rnd.get(3); + final int random = getRandom(3); htmltext = "30519-0" + (random + 2) + ".htm"; st.setCond(2); st.playSound(QuestState.SOUND_MIDDLE); @@ -115,7 +114,7 @@ public class Q417_PathToBecomeAScavenger extends Quest } case "30519_2": { - final int random = Rnd.get(3); + final int random = getRandom(3); htmltext = "30519-0" + (random + 2) + ".htm"; st.takeItems(BRONK_PAY, -1); st.takeItems(SHARI_PAY, -1); @@ -154,7 +153,7 @@ public class Q417_PathToBecomeAScavenger extends Quest } case "30519-11.htm": { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { htmltext = "30519-06.htm"; } @@ -474,7 +473,7 @@ public class Q417_PathToBecomeAScavenger extends Quest final int step = st.getInt("step"); if (step > 20) { - if (((step - 20) * 10) >= Rnd.get(100)) + if (((step - 20) * 10) >= getRandom(100)) { addSpawn(HONEY_BEAR, npc, false, 300000); st.unset("step"); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java index f6a44275b9..6832b4f12f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -259,7 +258,7 @@ public class Q419_GetAPet extends Quest if (answers < 10) { final String[] questions = st.getString("quiz").split(" "); - final int index = Rnd.get(questions.length - 1); + final int index = getRandom(questions.length - 1); final String question = questions[index]; if (questions.length > (10 - answers)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java index 6887a54c62..5d37f0d601 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java @@ -16,7 +16,6 @@ */ package quests.Q420_LittleWing; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -225,7 +224,7 @@ public class Q420_LittleWing extends Quest { st.takeItems(FAIRY_DUST, 1); giveRandomPet(st, true); - if (Rnd.get(20) == 1) + if (getRandom(20) == 1) { st.giveItems(HATCHLING_SOFT_LEATHER, 1); } @@ -694,7 +693,7 @@ public class Q420_LittleWing extends Quest case 20598: case 20599: { - if (st.hasQuestItems(DELUXE_FAIRY_STONE) && (Rnd.get(100) < 30)) + if (st.hasQuestItems(DELUXE_FAIRY_STONE) && (getRandom(100) < 30)) { st.set("deluxestone", "2"); st.playSound(QuestState.SOUND_MIDDLE); @@ -735,7 +734,7 @@ public class Q420_LittleWing extends Quest private void giveRandomPet(QuestState st, boolean hasFairyDust) { int pet = DRAGONFLUTE_OF_TWILIGHT; - final int chance = Rnd.get(100); + final int chance = getRandom(100); if (st.hasQuestItems(EGG_OF_DRAKE_EXARION)) { st.takeItems(EGG_OF_DRAKE_EXARION, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java index 27819e20bc..2ce5c8fb4b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java @@ -16,7 +16,6 @@ */ package quests.Q421_LittleWingsBigAdventure; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; @@ -260,7 +259,7 @@ public class Q421_LittleWingsBigAdventure extends Quest { for (Monster ghost : ((Monster) npc).getSpawnedMinions()) { - if (!ghost.isDead() && (Rnd.get(100) < 1)) + if (!ghost.isDead() && (getRandom(100) < 1)) { ghost.broadcastNpcSay("We must protect the fairy tree!"); } @@ -278,7 +277,7 @@ public class Q421_LittleWingsBigAdventure extends Quest if (isPet && (attacker.getPet().getControlItemId() == st.getInt("summonOid"))) { // Random luck is reached and you still have some leaves ; go further. - if ((Rnd.get(100) < 1) && st.hasQuestItems(FAIRY_LEAF)) + if ((getRandom(100) < 1) && st.hasQuestItems(FAIRY_LEAF)) { final int idMask = (int) Math.pow(2, (npc.getNpcId() - 27182) - 1); final int iCond = st.getInt("iCond"); @@ -312,7 +311,7 @@ public class Q421_LittleWingsBigAdventure extends Quest final Creature originalKiller = isPet ? killer.getPet() : killer; // Tree curses the killer. - if ((Rnd.get(100) < 30) && (originalKiller != null)) + if ((getRandom(100) < 30) && (originalKiller != null)) { final Skill skill = SkillTable.getInstance().getSkill(4243, 1); if ((skill != null) && (originalKiller.getFirstEffect(skill) == null)) @@ -324,7 +323,7 @@ public class Q421_LittleWingsBigAdventure extends Quest // Spawn 20 ghosts, attacking the killer. for (int i = 0; i < 20; i++) { - final Attackable newNpc = (Attackable) addSpawn(27189, npc.getX(), npc.getY(), npc.getZ(), Rnd.get(65536), true, 300000); + final Attackable newNpc = (Attackable) addSpawn(27189, npc.getX(), npc.getY(), npc.getZ(), getRandom(65536), true, 300000); newNpc.setRunning(); newNpc.addDamageHate(originalKiller, 0, 999); newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalKiller); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java index 9459350544..18c7e473ce 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java @@ -16,7 +16,6 @@ */ package quests.Q422_RepentYourSins; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; @@ -144,7 +143,7 @@ public class Q422_RepentYourSins extends Quest st.takeItems(PENITENT_MANACLES, 1); st.giveItems(LEFT_PENITENT_MANACLES, 1); - final int removePkAmount = Rnd.get(10) + 1; + final int removePkAmount = getRandom(10) + 1; // Player's PKs are lower than random amount ; finish the quest. if (player.getPkKills() <= removePkAmount) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java index 7b156237a4..01649d7430 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java @@ -19,7 +19,6 @@ package quests.Q426_QuestForFishingShot; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -412,7 +411,7 @@ public class Q426_QuestForFishingShot extends Quest drop = MOB_SPECIAL.get(npcId)[1]; } - if (Rnd.get(1000) <= chance) + if (getRandom(1000) <= chance) { drop++; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java index 529dc519a8..b8aa4ad5c7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Npc; @@ -158,7 +157,7 @@ public class Q501_ProofOfClanAlliance extends Quest } case "30757-03.htm": { - if (Rnd.get(10) > 5) + if (getRandom(10) > 5) { final QuestState st2 = getClanLeaderQuestState(player, npc); st.setState(State.STARTED); @@ -186,7 +185,7 @@ public class Q501_ProofOfClanAlliance extends Quest st.takeItems(ADENA, 10000); for (int[] coords : CHESTS_SPAWN) { - st.addSpawn(CHEST_IDS.get(Rnd.get(CHEST_IDS.size())), coords[0], coords[1], coords[2], 0, false, 0); + st.addSpawn(CHEST_IDS.get(getRandom(CHEST_IDS.size())), coords[0], coords[1], coords[2], 0, false, 0); } _isSpawned = true; @@ -457,7 +456,7 @@ public class Q501_ProofOfClanAlliance extends Quest { final int itemId = DROP.get(npcId); final List herbs = getHerbs(cl.getString("herbs")); - if ((Rnd.get(10) == 1) && !st.hasQuestItems(itemId) && !hasOtherItems(st, itemId) && !herbs.contains(itemId)) + if ((getRandom(10) == 1) && !st.hasQuestItems(itemId) && !hasOtherItems(st, itemId) && !herbs.contains(itemId)) { if (herbs.isEmpty()) { @@ -475,7 +474,7 @@ public class Q501_ProofOfClanAlliance extends Quest { final int chests = cl.getInt("chests"); final int bingo = cl.getInt("bingo"); - if ((((chests == 15) && (bingo == 3)) || ((chests == 14) && (bingo == 2)) || ((chests == 13) && (bingo == 1)) || ((chests == 12) && (bingo == 0))) || ((bingo < 4) && (Rnd.get(4) == 0))) + if ((((chests == 15) && (bingo == 3)) || ((chests == 14) && (bingo == 2)) || ((chests == 13) && (bingo == 1)) || ((chests == 12) && (bingo == 0))) || ((bingo < 4) && (getRandom(4) == 0))) { npc.broadcastNpcSay("##########Bingo!##########"); cl.set("bingo", String.valueOf(bingo + 1)); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java index 5d570b59e6..81afe85039 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java @@ -16,7 +16,6 @@ */ package quests.Q503_PursuitOfClanAmbition; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -685,14 +684,14 @@ public class Q503_PursuitOfClanAmbition extends Quest final Npc coffer = addSpawn(COFFER, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 180000); coffer.broadcastNpcSay("Curse of the gods on the one that defiles the property of the empire!"); } - else if ((element[0] == GRAVE_GUARD) && (st.getQuestItemsCount(IMP_KEYS) < 6) && (Rnd.get(50) < chance)) + else if ((element[0] == GRAVE_GUARD) && (st.getQuestItemsCount(IMP_KEYS) < 6) && (getRandom(50) < chance)) { addSpawn(GRAVE_KEYMASTER, player.getX(), player.getY(), player.getZ(), player.getHeading(), true, 0); } } if ((item2 != 0) && (item3 != 0)) { - if (Rnd.get(4) == 0) + if (getRandom(4) == 0) { st.dropItems(item2, 1, maxCount, chance); } @@ -713,7 +712,7 @@ public class Q503_PursuitOfClanAmbition extends Quest { if ((npc.getMaxHp() / 2) > npc.getCurrentHp()) { - if (Rnd.get(100) < 4) + if (getRandom(100) < 4) { addSpawn(IMPERIAL_SLAVE, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java index cf05abdf73..5fed69585f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java @@ -16,7 +16,6 @@ */ package quests.Q508_AClansReputation; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -151,7 +150,7 @@ public class Q508_AClansReputation extends Quest { final int item = REWARD_LIST[raid - 1][1]; final int count = st.getQuestItemsCount(item); - final int reward = Rnd.get(REWARD_LIST[raid - 1][2], REWARD_LIST[raid - 1][3]); + final int reward = getRandom(REWARD_LIST[raid - 1][2], REWARD_LIST[raid - 1][3]); if (count == 0) { htmltext = "30868-" + raid + "a.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java index 82d55a34a1..1f997a429c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java @@ -16,7 +16,6 @@ */ package quests.Q509_TheClansPrestige; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -148,7 +147,7 @@ public class Q509_TheClansPrestige extends Quest { final int item = REWARD_LIST[raid - 1][1]; final int count = st.getQuestItemsCount(item); - final int reward = Rnd.get(REWARD_LIST[raid - 1][2], REWARD_LIST[raid - 1][3]); + final int reward = getRandom(REWARD_LIST[raid - 1][2], REWARD_LIST[raid - 1][3]); if (count == 0) { htmltext = "31331-" + raid + "a.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java index 3756813fe3..2888693ba8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java @@ -16,7 +16,6 @@ */ package quests.Q601_WatchingEyes; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -72,7 +71,7 @@ public class Q601_WatchingEyes extends Quest { st.takeItems(PROOF_OF_AVENGER, -1); - final int random = Rnd.get(100); + final int random = getRandom(100); for (int[] element : REWARDS) { if (random < element[2]) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java index 1840a21e74..4986023024 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java @@ -16,7 +16,6 @@ */ package quests.Q602_ShadowOfLight; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -70,7 +69,7 @@ public class Q602_ShadowOfLight extends Quest { st.takeItems(EYE_OF_DARKNESS, -1); - final int random = Rnd.get(100); + final int random = getRandom(100); for (int[] element : REWARDS) { if (random < element[4]) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java index 5fd5a613e8..b668b740f1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java @@ -18,7 +18,6 @@ package quests.Q604_DaimonTheWhiteEyed_Part2; import java.util.logging.Level; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.RaidBossStatus; import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -130,7 +129,7 @@ public class Q604_DaimonTheWhiteEyed_Part2 extends Quest if (st.hasQuestItems(ESSENCE_OF_DAIMON)) { st.takeItems(ESSENCE_OF_DAIMON, 1); - st.rewardItems(REWARD_DYE[Rnd.get(REWARD_DYE.length)], 5); + st.rewardItems(REWARD_DYE[getRandom(REWARD_DYE.length)], 5); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } @@ -286,7 +285,7 @@ public class Q604_DaimonTheWhiteEyed_Part2 extends Quest if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE)) { // set temporarily spawn location (to provide correct behavior of RaidBoss.checkAndReturnToSpawn()) - // raid.getSpawn().setLoc(185900, -44000, -3160, Rnd.get(65536)); + // raid.getSpawn().setLoc(185900, -44000, -3160, getRandom(65536)); addSpawn(DAIMON_THE_WHITE_EYED, 185900, -44000, -3160, 100, false, 0); raid.broadcastNpcSay("Who called me?"); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java index c5ed251687..d3a502fa69 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java @@ -19,7 +19,6 @@ package quests.Q605_AllianceWithKetraOrcs; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -348,7 +347,7 @@ public class Q605_AllianceWithKetraOrcs extends Quest // Support for Q606. QuestState st = partyMember.getQuestState(Q606_WarWithVarkaSilenos.class.getSimpleName()); - if ((st != null) && Rnd.nextBoolean() && CHANCES_MANE.containsKey(npcId)) + if ((st != null) && getRandomBoolean() && CHANCES_MANE.containsKey(npcId)) { st.dropItems(VARKA_MANE, 1, 0, CHANCES_MANE.get(npcId)); return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java index 44ed5de638..27298a0f84 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java @@ -266,7 +266,7 @@ public class Q610_MagicalPowerOfWater_Part2 extends Quest if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE)) { // set temporarily spawn location (to provide correct behavior of RaidBoss.checkAndReturnToSpawn()) - // raid.getSpawn().setLoc(104771, -36993, -1149, Rnd.get(65536)); + // raid.getSpawn().setLoc(104771, -36993, -1149, getRandom(65536)); addSpawn(SOUL_OF_WATER_ASHUTAR, 104771, -36993, -1149, 100, false, 0); raid.broadcastNpcSay("You didn’t come into this world. You came out of it, like a wave from the ocean. You are not a stranger here."); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java index bad11c3e57..45de7655ad 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java @@ -19,7 +19,6 @@ package quests.Q611_AllianceWithVarkaSilenos; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -348,7 +347,7 @@ public class Q611_AllianceWithVarkaSilenos extends Quest // Support for Q612. QuestState st = partyMember.getQuestState(Q612_WarWithKetraOrcs.class.getSimpleName()); - if ((st != null) && Rnd.nextBoolean() && CHANCES_MOLAR.containsKey(npcId)) + if ((st != null) && getRandomBoolean() && CHANCES_MOLAR.containsKey(npcId)) { st.dropItems(MOLAR_OF_KETRA_ORC, 1, 0, CHANCES_MOLAR.get(npcId)); return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java index 9e5a60f43c..ba75aaadb5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java @@ -276,7 +276,7 @@ public class Q616_MagicalPowerOfFire_Part2 extends Quest if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE)) { // set temporarily spawn location (to provide correct behavior of RaidBoss.checkAndReturnToSpawn()) - // raid.getSpawn().setLoc(142624, -82285, -6491, Rnd.get(65536)); + // raid.getSpawn().setLoc(142624, -82285, -6491, getRandom(65536)); addSpawn(SOUL_OF_FIRE_NASTRON, 142624, -82285, -6491, 100, false, 0); raid.broadcastNpcSay("The fire you kindle for your enemy often burns yourself more than them."); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java index 94d51753b5..9f2edbdf0a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java @@ -19,7 +19,6 @@ package quests.Q617_GatherTheFlames; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -110,7 +109,7 @@ public class Q617_GatherTheFlames extends Quest { htmltext = "31539-07.htm"; st.takeItems(TORCH, 1000); - st.giveItems(REWARD[Rnd.get(REWARD.length)], 1); + st.giveItems(REWARD[getRandom(REWARD.length)], 1); } } else if (event.equals("31539-08.htm")) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java index a848794298..e81b26000d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java @@ -16,7 +16,6 @@ */ package quests.Q619_RelicsOfTheOldEmpire; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -88,7 +87,7 @@ public class Q619_RelicsOfTheOldEmpire extends Quest { htmltext = "31538-09.htm"; st.takeItems(RELICS, 1000); - st.giveItems(RCP_REWARDS[Rnd.get(RCP_REWARDS.length)], 1); + st.giveItems(RCP_REWARDS[getRandom(RCP_REWARDS.length)], 1); } else { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java index a43a1ac963..cba2e883eb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java @@ -16,7 +16,6 @@ */ package quests.Q620_FourGoblets; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.FourSepulchersManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -85,9 +84,9 @@ public class Q620_FourGoblets extends Quest if (event.equals("31452-05.htm")) { - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { - htmltext = (Rnd.nextBoolean()) ? "31452-03.htm" : "31452-04.htm"; + htmltext = (getRandomBoolean()) ? "31452-03.htm" : "31452-04.htm"; } } else if (event.equals("31452-06.htm")) @@ -134,7 +133,7 @@ public class Q620_FourGoblets extends Quest st.takeItems(SEALED_BOX, 1); if (!calculateBoxReward(st)) { - htmltext = (Rnd.nextBoolean()) ? "31454-09.htm" : "31454-10.htm"; + htmltext = (getRandomBoolean()) ? "31454-09.htm" : "31454-10.htm"; } else { @@ -183,7 +182,7 @@ public class Q620_FourGoblets extends Quest st.takeItems(SEALED_BOX, 1); if (!calculateBoxReward(st)) { - htmltext = (Rnd.nextBoolean()) ? "31919-04.htm" : "31919-05.htm"; + htmltext = (getRandomBoolean()) ? "31919-04.htm" : "31919-05.htm"; } else { @@ -303,7 +302,7 @@ public class Q620_FourGoblets extends Quest private static boolean calculateBoxReward(QuestState st) { boolean reward = false; - final int rnd = Rnd.get(5); + final int rnd = getRandom(5); if (rnd == 0) { st.giveItems(57, 10000); @@ -311,10 +310,10 @@ public class Q620_FourGoblets extends Quest } else if (rnd == 1) { - if (Rnd.get(1000) < 848) + if (getRandom(1000) < 848) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 43) { st.giveItems(1884, 42); @@ -357,10 +356,10 @@ public class Q620_FourGoblets extends Quest } } - if (Rnd.get(1000) < 323) + if (getRandom(1000) < 323) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 335) { st.giveItems(1888, 1); @@ -393,10 +392,10 @@ public class Q620_FourGoblets extends Quest } else if (rnd == 2) { - if (Rnd.get(1000) < 847) + if (getRandom(1000) < 847) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 148) { st.giveItems(1878, 8); @@ -439,10 +438,10 @@ public class Q620_FourGoblets extends Quest } } - if (Rnd.get(1000) < 251) + if (getRandom(1000) < 251) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 350) { st.giveItems(1887, 1); @@ -475,10 +474,10 @@ public class Q620_FourGoblets extends Quest } else if (rnd == 3) { - if (Rnd.get(1000) < 31) + if (getRandom(1000) < 31) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 223) { st.giveItems(730, 1); @@ -493,10 +492,10 @@ public class Q620_FourGoblets extends Quest } } - if (Rnd.get(1000) < 5) + if (getRandom(1000) < 5) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 202) { st.giveItems(729, 1); @@ -513,10 +512,10 @@ public class Q620_FourGoblets extends Quest } else if (rnd == 4) { - if (Rnd.get(1000) < 329) + if (getRandom(1000) < 329) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 88) { st.giveItems(6698, 1); @@ -587,10 +586,10 @@ public class Q620_FourGoblets extends Quest } } - if (Rnd.get(1000) < 54) + if (getRandom(1000) < 54) { reward = true; - final int i = Rnd.get(1000); + final int i = getRandom(1000); if (i < 100) { st.giveItems(6688, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java index 55e0031efc..a9a132f31c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java @@ -16,7 +16,6 @@ */ package quests.Q621_EggDelivery; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -129,9 +128,9 @@ public class Q621_EggDelivery extends Quest } case "31584-02.htm": { - if (Rnd.get(5) < 1) + if (getRandom(5) < 1) { - st.rewardItems(RECIPES[Rnd.get(3)], 1); + st.rewardItems(RECIPES[getRandom(3)], 1); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java index 4692fe80cc..f7dda335cb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java @@ -16,7 +16,6 @@ */ package quests.Q622_SpecialtyLiquorDelivery; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -121,9 +120,9 @@ public class Q622_SpecialtyLiquorDelivery extends Quest } case "31267-02.htm": { - if (Rnd.get(5) < 1) + if (getRandom(5) < 1) { - st.giveItems(RECIPES[Rnd.get(RECIPES.length)], 1); + st.giveItems(RECIPES[getRandom(RECIPES.length)], 1); } else { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java index 7cbfd36775..cefd276664 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java @@ -16,7 +16,6 @@ */ package quests.Q623_TheFinestFood; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -72,7 +71,7 @@ public class Q623_TheFinestFood extends Quest st.takeItems(BUFFALO_MEAT, -1); st.takeItems(ANTELOPE_HORN, -1); - final int luck = Rnd.get(100); + final int luck = getRandom(100); if (luck < 11) { st.rewardItems(57, 25000); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java index cf09e35a99..ac7a73e2db 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java @@ -18,7 +18,6 @@ package quests.Q625_TheFinestIngredients_Part2; import java.util.logging.Level; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.RaidBossStatus; import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -131,7 +130,7 @@ public class Q625_TheFinestIngredients_Part2 extends Quest if (st.hasQuestItems(SPECIAL_YETI_MEAT)) { st.takeItems(SPECIAL_YETI_MEAT, 1); - st.rewardItems(REWARD_DYE[Rnd.get(REWARD_DYE.length)], 5); + st.rewardItems(REWARD_DYE[getRandom(REWARD_DYE.length)], 5); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } @@ -281,7 +280,7 @@ public class Q625_TheFinestIngredients_Part2 extends Quest if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE)) { // set temporarily spawn location (to provide correct behavior of RaidBoss.checkAndReturnToSpawn()) - // raid.getSpawn().setLoc(157117, -121939, -2397, Rnd.get(65536)); + // raid.getSpawn().setLoc(157117, -121939, -2397, getRandom(65536)); addSpawn(ICICLE_EMPEROR_BUMBALUMP, 157117, -121939, -2397, 100, false, 0); raid.broadcastNpcSay("I smell something delicious..."); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q638_SeekersOfTheHolyGrail/Q638_SeekersOfTheHolyGrail.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q638_SeekersOfTheHolyGrail/Q638_SeekersOfTheHolyGrail.java index 8d5690fccf..47b2fb571e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q638_SeekersOfTheHolyGrail/Q638_SeekersOfTheHolyGrail.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q638_SeekersOfTheHolyGrail/Q638_SeekersOfTheHolyGrail.java @@ -16,7 +16,6 @@ */ package quests.Q638_SeekersOfTheHolyGrail; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -90,7 +89,7 @@ public class Q638_SeekersOfTheHolyGrail extends Quest st.playSound(QuestState.SOUND_MIDDLE); st.takeItems(PAGAN_TOTEM, 2000); - final int chance = Rnd.get(3); + final int chance = getRandom(3); if (chance == 0) { st.rewardItems(959, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q642_APowerfulPrimevalCreature/Q642_APowerfulPrimevalCreature.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q642_APowerfulPrimevalCreature/Q642_APowerfulPrimevalCreature.java index 2c41c955e3..5b491cb2c4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q642_APowerfulPrimevalCreature/Q642_APowerfulPrimevalCreature.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q642_APowerfulPrimevalCreature/Q642_APowerfulPrimevalCreature.java @@ -16,7 +16,6 @@ */ package quests.Q642_APowerfulPrimevalCreature; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -147,7 +146,7 @@ public class Q642_APowerfulPrimevalCreature extends Quest if (npc.getNpcId() == ANCIENT_EGG) { - if (Rnd.get(100) < 1) + if (getRandom(100) < 1) { st.giveItems(DINOSAUR_EGG, 1); if (st.getQuestItemsCount(DINOSAUR_TISSUE) >= 150) @@ -160,7 +159,7 @@ public class Q642_APowerfulPrimevalCreature extends Quest } } } - else if (Rnd.get(100) < 33) + else if (getRandom(100) < 33) { st.rewardItems(DINOSAUR_TISSUE, 1); if ((st.getQuestItemsCount(DINOSAUR_TISSUE) >= 150) && st.hasQuestItems(DINOSAUR_EGG)) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q643_RiseAndFallOfTheElrokiTribe/Q643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q643_RiseAndFallOfTheElrokiTribe/Q643_RiseAndFallOfTheElrokiTribe.java index ebec3730eb..a15851f9b9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q643_RiseAndFallOfTheElrokiTribe/Q643_RiseAndFallOfTheElrokiTribe.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q643_RiseAndFallOfTheElrokiTribe/Q643_RiseAndFallOfTheElrokiTribe.java @@ -16,7 +16,6 @@ */ package quests.Q643_RiseAndFallOfTheElrokiTribe; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -76,7 +75,7 @@ public class Q643_RiseAndFallOfTheElrokiTribe extends Quest if (count >= 300) { st.takeItems(BONES, 300); - st.rewardItems(Rnd.get(8712, 8722), 5); + st.rewardItems(getRandom(8712, 8722), 5); } else { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q647_InfluxOfMachines/Q647_InfluxOfMachines.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q647_InfluxOfMachines/Q647_InfluxOfMachines.java index aa716fe584..476f79ab5e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q647_InfluxOfMachines/Q647_InfluxOfMachines.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q647_InfluxOfMachines/Q647_InfluxOfMachines.java @@ -16,7 +16,6 @@ */ package quests.Q647_InfluxOfMachines; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -59,7 +58,7 @@ public class Q647_InfluxOfMachines extends Quest else if (event.equals("32069-06.htm")) { st.takeItems(DESTROYED_GOLEM_SHARD, -1); - st.giveItems(Rnd.get(4963, 4972), 1); + st.giveItems(getRandom(4963, 4972), 1); st.playSound(QuestState.SOUND_FINISH); st.exitQuest(true); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q648_AnIceMerchantsDream/Q648_AnIceMerchantsDream.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q648_AnIceMerchantsDream/Q648_AnIceMerchantsDream.java index 9ebe8bdfd8..c8fd8ff1f5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q648_AnIceMerchantsDream/Q648_AnIceMerchantsDream.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q648_AnIceMerchantsDream/Q648_AnIceMerchantsDream.java @@ -19,7 +19,6 @@ package quests.Q648_AnIceMerchantsDream; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -132,7 +131,7 @@ public class Q648_AnIceMerchantsDream extends Quest { if (st.getInt("exCond") == 0) { - st.set("exCond", String.valueOf((Rnd.get(4) + 1) * 10)); + st.set("exCond", String.valueOf((getRandom(4) + 1) * 10)); } } else if (event.startsWith("32023-06-")) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q651_RunawayYouth/Q651_RunawayYouth.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q651_RunawayYouth/Q651_RunawayYouth.java index a17ddeae7c..1ca1ebcf28 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q651_RunawayYouth/Q651_RunawayYouth.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q651_RunawayYouth/Q651_RunawayYouth.java @@ -16,7 +16,6 @@ */ package quests.Q651_RunawayYouth; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -77,12 +76,12 @@ public class Q651_RunawayYouth extends Quest } else if (event.equals("apparition_npc")) { - int chance = Rnd.get(3); + int chance = getRandom(3); // Loop to avoid to spawn to the same place. while (chance == _currentPosition) { - chance = Rnd.get(3); + chance = getRandom(3); } // Register new position. diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q652_AnAgedExAdventurer/Q652_AnAgedExAdventurer.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q652_AnAgedExAdventurer/Q652_AnAgedExAdventurer.java index 0f1a356a8b..c96c2560bd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q652_AnAgedExAdventurer/Q652_AnAgedExAdventurer.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q652_AnAgedExAdventurer/Q652_AnAgedExAdventurer.java @@ -16,7 +16,6 @@ */ package quests.Q652_AnAgedExAdventurer; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -81,12 +80,12 @@ public class Q652_AnAgedExAdventurer extends Quest } else if (event.equals("apparition_npc")) { - int chance = Rnd.get(5); + int chance = getRandom(5); // Loop to avoid to spawn to the same place. while (chance == _currentPosition) { - chance = Rnd.get(5); + chance = getRandom(5); } // Register new position. @@ -123,7 +122,7 @@ public class Q652_AnAgedExAdventurer extends Quest { case SARA: { - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { htmltext = "30180-01.htm"; st.rewardItems(57, 5026); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q653_WildMaiden/Q653_WildMaiden.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q653_WildMaiden/Q653_WildMaiden.java index 965b296930..e83ab5d5ad 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q653_WildMaiden/Q653_WildMaiden.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q653_WildMaiden/Q653_WildMaiden.java @@ -16,7 +16,6 @@ */ package quests.Q653_WildMaiden; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -78,12 +77,12 @@ public class Q653_WildMaiden extends Quest } else if (event.equals("apparition_npc")) { - int chance = Rnd.get(4); + int chance = getRandom(4); // Loop to avoid to spawn to the same place. while (chance == _currentPosition) { - chance = Rnd.get(4); + chance = getRandom(4); } // Register new position. diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q660_AidingTheFloranVillage/Q660_AidingTheFloranVillage.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q660_AidingTheFloranVillage/Q660_AidingTheFloranVillage.java index 7c3b417e71..b9b0a9ae90 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q660_AidingTheFloranVillage/Q660_AidingTheFloranVillage.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q660_AidingTheFloranVillage/Q660_AidingTheFloranVillage.java @@ -16,7 +16,6 @@ */ package quests.Q660_AidingTheFloranVillage; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -114,7 +113,7 @@ public class Q660_AidingTheFloranVillage extends Quest } else { - if (Rnd.get(10) < 8) + if (getRandom(10) < 8) { st.rewardItems(ADENA, 1000); } @@ -134,7 +133,7 @@ public class Q660_AidingTheFloranVillage extends Quest } else { - final int luck = Rnd.get(15); + final int luck = getRandom(15); if (luck < 8) { st.rewardItems(ADENA, 2000); @@ -159,7 +158,7 @@ public class Q660_AidingTheFloranVillage extends Quest } else { - if (Rnd.get(10) < 8) + if (getRandom(10) < 8) { st.rewardItems(ADENA, 5000); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java index eba6947443..278ece728c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java @@ -19,7 +19,6 @@ package quests.Q662_AGameOfCards; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -158,11 +157,11 @@ public class Q662_AGameOfCards extends Quest final int stateEx = st.getInt("stateEx"); if ((state == 0) && (stateEx == 0) && (st.getQuestItemsCount(RED_GEM) >= 50)) { - int i1 = Rnd.get(70) + 1; - int i2 = Rnd.get(70) + 1; - int i3 = Rnd.get(70) + 1; - int i4 = Rnd.get(70) + 1; - int i5 = Rnd.get(70) + 1; + int i1 = getRandom(70) + 1; + int i2 = getRandom(70) + 1; + int i3 = getRandom(70) + 1; + int i4 = getRandom(70) + 1; + int i5 = getRandom(70) + 1; if (i1 >= 57) { i1 = i1 - 56; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q663_SeductiveWhispers/Q663_SeductiveWhispers.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q663_SeductiveWhispers/Q663_SeductiveWhispers.java index 4bd6b24a53..1152c66320 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q663_SeductiveWhispers/Q663_SeductiveWhispers.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q663_SeductiveWhispers/Q663_SeductiveWhispers.java @@ -19,7 +19,6 @@ package quests.Q663_SeductiveWhispers; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -175,8 +174,8 @@ public class Q663_SeductiveWhispers extends Quest final int i0 = st.getInt("stateEx"); final int i1 = i0 % 10; final int i2 = (i0 - i1) / 10; - final int param1 = Rnd.get(2) + 1; - final int param2 = Rnd.get(5) + 1; + final int param1 = getRandom(2) + 1; + final int param2 = getRandom(5) + 1; final int i5 = state / 10; final int param3 = (param1 * 10) + param2; if (param1 == i2) @@ -242,8 +241,8 @@ public class Q663_SeductiveWhispers extends Quest final int i0 = st.getInt("stateEx"); final int i1 = i0 % 10; final int i2 = (i0 - i1) / 10; - final int param1 = Rnd.get(2) + 1; - final int param2 = Rnd.get(5) + 1; + final int param1 = getRandom(2) + 1; + final int param2 = getRandom(5) + 1; final int param3 = (param1 * 10) + param2; if (param1 == i2) { @@ -313,12 +312,12 @@ public class Q663_SeductiveWhispers extends Quest else if (round == 4) { st.rewardItems(ADENA, 388000); - st.rewardItems(RECIPES[Rnd.get(RECIPES.length)], 1); + st.rewardItems(RECIPES[getRandom(RECIPES.length)], 1); } else if (round == 5) { st.rewardItems(ADENA, 675000); - st.rewardItems(BLADES[Rnd.get(BLADES.length)], 1); + st.rewardItems(BLADES[getRandom(BLADES.length)], 1); } else if (round == 6) { @@ -357,8 +356,8 @@ public class Q663_SeductiveWhispers extends Quest final int i0 = st.getInt("stateEx"); final int i1 = i0 % 10; final int i2 = (i0 - i1) / 10; - final int param1 = Rnd.get(2) + 1; - final int param2 = Rnd.get(5) + 1; + final int param1 = getRandom(2) + 1; + final int param2 = getRandom(5) + 1; final int param3 = (param1 * 10) + param2; if (param1 == i2) { @@ -403,8 +402,8 @@ public class Q663_SeductiveWhispers extends Quest final int i0 = st.getInt("stateEx"); final int i1 = i0 % 10; final int i2 = (i0 - i1) / 10; - final int param1 = Rnd.get(2) + 1; - final int param2 = Rnd.get(5) + 1; + final int param1 = getRandom(2) + 1; + final int param2 = getRandom(5) + 1; final int param3 = (param1 * 10) + param2; if (param1 == i2) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java index e192bb27f1..c154412b6e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.Party; @@ -523,7 +522,7 @@ public class SagasSuperClass extends Quest if (st.getInt("Quest0") == 0) { startQuestTimer("Mob_2 Timer 3", 13000, npc, player); - if (Rnd.nextBoolean()) + if (getRandomBoolean()) { npc.broadcastNpcSay(_text[9].replace("PLAYERNAME", player.getName())); } @@ -1004,7 +1003,7 @@ public class SagasSuperClass extends Quest } if (!partyQuestMembers.isEmpty()) { - final QuestState st2 = partyQuestMembers.get(Rnd.get(partyQuestMembers.size())); + final QuestState st2 = partyQuestMembers.get(getRandom(partyQuestMembers.size())); giveHallishaMark(st2); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java index 4650538edc..32203966e2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java @@ -17,7 +17,6 @@ package teleports.GrandBossTeleporters; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -117,8 +116,8 @@ public class GrandBossTeleporters extends Quest { zone.allowPlayerEntry(player, 30); } - final int x = 179700 + Rnd.get(700); - final int y = 113800 + Rnd.get(2100); + final int x = 179700 + getRandom(700); + final int y = 113800 + getRandom(2100); player.teleToLocation(x, y, -7709); if (status == 0) { @@ -134,8 +133,8 @@ public class GrandBossTeleporters extends Quest } else if (npcId == 31859) // antharas teleport cube { - final int x = 79800 + Rnd.get(600); - final int y = 151200 + Rnd.get(1100); + final int x = 79800 + getRandom(600); + final int y = 151200 + getRandom(1100); player.teleToLocation(x, y, -3534); } else if (npcId == 31385) // heart of volcano @@ -159,8 +158,8 @@ public class GrandBossTeleporters extends Quest { zone.allowPlayerEntry(player, 30); } - final int x = 204328 + Rnd.get(600); - final int y = -111874 + Rnd.get(600); + final int x = 204328 + getRandom(600); + final int y = -111874 + getRandom(600); player.teleToLocation(x, y, 70); playerCount++; if (status == 0) @@ -226,8 +225,8 @@ public class GrandBossTeleporters extends Quest } else if (npcId == 31759) // valakas teleport cube { - final int x = 150037 + Rnd.get(500); - final int y = -57720 + Rnd.get(500); + final int x = 150037 + getRandom(500); + final int y = -57720 + getRandom(500); player.teleToLocation(x, y, -2976); } return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java index 6354fc016c..30216ee57f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java @@ -16,7 +16,6 @@ */ package teleports.OracleTeleport; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -278,7 +277,7 @@ public class OracleTeleport extends Quest } else { - final Location loc = RETURN_LOCS[Rnd.get(RETURN_LOCS.length)]; + final Location loc = RETURN_LOCS[getRandom(RETURN_LOCS.length)]; player.teleToLocation(loc.getX(), loc.getY(), loc.getZ()); htmltext = "rift_back_unknown.htm"; player.setIn7sDungeon(false); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java index f8e2bab489..90d2fba6c8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java @@ -16,7 +16,6 @@ */ package teleports.ToIVortexExit; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -44,23 +43,23 @@ public class ToIVortexExit extends Quest int x; int y; int z; - final int chance = Rnd.get(3); + final int chance = getRandom(3); if (chance == 0) { - x = 108784 + Rnd.get(100); - y = 16000 + Rnd.get(100); + x = 108784 + getRandom(100); + y = 16000 + getRandom(100); z = -4928; } else if (chance == 1) { - x = 113824 + Rnd.get(100); - y = 10448 + Rnd.get(100); + x = 113824 + getRandom(100); + y = 10448 + getRandom(100); z = -5164; } else { - x = 115488 + Rnd.get(100); - y = 22096 + Rnd.get(100); + x = 115488 + getRandom(100); + y = 22096 + getRandom(100); z = -5168; } player.teleToLocation(x, y, z); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java index 840cea636c..a571c389fc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java @@ -24,7 +24,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.SoIManager; @@ -417,7 +416,7 @@ public class HallOfErosionAttack extends AbstractNpcAI } player.destroyItemByItemId("SOI", 13797, 1, player, true); - final Location loc = world.deadTumors.get(Rnd.get(world.deadTumors.size())).getLocation(); + final Location loc = world.deadTumors.get(getRandom(world.deadTumors.size())).getLocation(); if (loc != null) { broadCastPacket(world, new ExShowScreenMessage(NpcStringId.S1_S_PARTY_HAS_MOVED_TO_A_DIFFERENT_LOCATION_THROUGH_THE_CRACK_IN_THE_TUMOR, 2, 8000)); @@ -454,9 +453,9 @@ public class HallOfErosionAttack extends AbstractNpcAI final HEAWorld world = (HEAWorld) tmpworld; if (npc.getId() == 18668) { - for (int i = 0; i < Rnd.get(1, 4); i++) + for (int i = 0; i < getRandom(1, 4); i++) { - addSpawn(mobs[Rnd.get(mobs.length)], npc.getLocation(), world.getInstanceId()); + addSpawn(mobs[getRandom(mobs.length)], npc.getLocation(), world.getInstanceId()); } npc.doDie(npc); } @@ -539,7 +538,7 @@ public class HallOfErosionAttack extends AbstractNpcAI if (npc.getId() == TUMOR_ALIVE) { world.addTumorCount(-1); - npc.dropItem(player, 13797, Rnd.get(2, 5)); + npc.dropItem(player, 13797, getRandom(2, 5)); npc.deleteMe(); world.deadTumor = addSpawn(TUMOR_DEAD, loc, world.getInstanceId()); world.deadTumors.add(world.deadTumor); @@ -553,7 +552,7 @@ public class HallOfErosionAttack extends AbstractNpcAI if ((world.tumorCount == 0) && (world.cohemenes == null)) { broadCastPacket(world, new ExShowScreenMessage(NpcStringId.ALL_THE_TUMORS_INSIDE_S1_HAVE_BEEN_DESTROYED_DRIVEN_INTO_A_CORNER_COHEMENES_APPEARS_CLOSE_BY, 2, 8000)); - final int[] spawn = COHEMENES_SPAWN[Rnd.get(0, COHEMENES_SPAWN.length - 1)]; + final int[] spawn = COHEMENES_SPAWN[getRandom(0, COHEMENES_SPAWN.length - 1)]; final Npc n = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId()); n.broadcastPacket(new NpcSay(n.getObjectId(), ChatType.SHOUT, n.getId(), NpcStringId.C_MON_C_MON_SHOW_YOUR_FACE_YOU_LITTLE_RATS_LET_ME_SEE_WHAT_THE_DOOMED_WEAKLINGS_ARE_SCHEMING)); world.cohemenes = n; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java index 3649806454..2c530995bb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java @@ -24,7 +24,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.CommandChannel; @@ -439,7 +438,7 @@ public class HallOfErosionDefence extends AbstractNpcAI } player.destroyItemByItemId("SOI", 13797, 1, player, true); - final Location loc = world.deadTumors.get(Rnd.get(world.deadTumors.size())).getLocation(); + final Location loc = world.deadTumors.get(getRandom(world.deadTumors.size())).getLocation(); if (loc != null) { broadCastPacket(world, new ExShowScreenMessage(NpcStringId.S1_S_PARTY_HAS_MOVED_TO_A_DIFFERENT_LOCATION_THROUGH_THE_CRACK_IN_THE_TUMOR, 2, 8000)); @@ -476,9 +475,9 @@ public class HallOfErosionDefence extends AbstractNpcAI final HEDWorld world = (HEDWorld) tmpworld; if (npc.getId() == 18668) { - for (int i = 0; i < Rnd.get(1, 4); i++) + for (int i = 0; i < getRandom(1, 4); i++) { - addSpawn(mobs[Rnd.get(mobs.length)], npc.getLocation(), world.getInstanceId()); + addSpawn(mobs[getRandom(mobs.length)], npc.getLocation(), world.getInstanceId()); } npc.deleteMe(); } @@ -522,7 +521,7 @@ public class HallOfErosionDefence extends AbstractNpcAI final HEDWorld world = (HEDWorld) tmpworld; if (npc.getId() == TUMOR_ALIVE) { - npc.dropItem(player, 13797, Rnd.get(2, 5)); + npc.dropItem(player, 13797, getRandom(2, 5)); npc.deleteMe(); notifyTumorDeath(npc, world); world.deadTumor = addSpawn(TUMOR_DEAD, npc.getLocation(), world.getInstanceId()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java index b99f173f33..5f3238dac3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java @@ -25,7 +25,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -451,7 +450,7 @@ public class HeartInfinityAttack extends AbstractNpcAI } player.destroyItemByItemId("SOI", 13797, 1, player, true); - final Location loc = world.deadTumors.get(Rnd.get(world.deadTumors.size())).getLocation(); + final Location loc = world.deadTumors.get(getRandom(world.deadTumors.size())).getLocation(); if (loc != null) { broadCastPacket(world, new ExShowScreenMessage(NpcStringId.S1_S_PARTY_HAS_MOVED_TO_A_DIFFERENT_LOCATION_THROUGH_THE_CRACK_IN_THE_TUMOR, 2, 8000)); @@ -495,9 +494,9 @@ public class HeartInfinityAttack extends AbstractNpcAI if (npc.getId() == 18668) { - for (int i = 0; i < Rnd.get(1, 4); i++) + for (int i = 0; i < getRandom(1, 4); i++) { - addSpawn(mobs[Rnd.get(mobs.length)], npc.getLocation(), world.getInstanceId()); + addSpawn(mobs[getRandom(mobs.length)], npc.getLocation(), world.getInstanceId()); } npc.doDie(npc); } @@ -592,7 +591,7 @@ public class HeartInfinityAttack extends AbstractNpcAI if (npc.getId() == ALIVETUMOR) { world.addTumorCount(-1); - npc.dropItem(player, 13797, Rnd.get(2, 5)); + npc.dropItem(player, 13797, getRandom(2, 5)); npc.deleteMe(); world.deadTumor = addSpawn(DEADTUMOR, loc, world.getInstanceId()); world.deadTumors.add(world.deadTumor); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java index 0373aff82f..cfb1465679 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java @@ -24,7 +24,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -496,7 +495,7 @@ public class HeartInfinityDefence extends AbstractNpcAI } player.destroyItemByItemId("SOI", 13797, 1, player, true); - final Location loc = world.deadTumors.get(Rnd.get(world.deadTumors.size())).getLocation(); + final Location loc = world.deadTumors.get(getRandom(world.deadTumors.size())).getLocation(); if (loc != null) { broadCastPacket(world, new ExShowScreenMessage(NpcStringId.S1_S_PARTY_HAS_MOVED_TO_A_DIFFERENT_LOCATION_THROUGH_THE_CRACK_IN_THE_TUMOR, 2, 8000)); @@ -540,9 +539,9 @@ public class HeartInfinityDefence extends AbstractNpcAI if (npc.getId() == 18668) { - for (int i = 0; i < Rnd.get(1, 4); i++) + for (int i = 0; i < getRandom(1, 4); i++) { - addSpawn(mobs[Rnd.get(mobs.length)], npc.getLocation(), world.getInstanceId()); + addSpawn(mobs[getRandom(mobs.length)], npc.getLocation(), world.getInstanceId()); } npc.doDie(npc); } @@ -578,7 +577,7 @@ public class HeartInfinityDefence extends AbstractNpcAI final Location loc = npc.getLocation(); if (npc.getId() == ALIVETUMOR) { - npc.dropItem(player, 13797, Rnd.get(2, 5)); + npc.dropItem(player, 13797, getRandom(2, 5)); npc.deleteMe(); world.deadTumor = addSpawn(DEADTUMOR, loc, world.getInstanceId()); world.deadTumors.add(world.deadTumor); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java index 4aa00c2dca..36cd836c99 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java @@ -25,7 +25,6 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; @@ -1255,7 +1254,7 @@ public class SeedOfDestruction extends AbstractNpcAI final Player target = world.getAllowed().stream().findAny().get(); if ((world.deviceSpawnedMobCount < MAX_DEVICE_SPAWNED_MOB_COUNT) && (target != null) && ((npc != null) && (target.getInstanceId() == npc.getInstanceId())) && !target.isDead()) { - final Attackable mob = (Attackable) addSpawn(SPAWN_MOB_IDS[Rnd.get(SPAWN_MOB_IDS.length)], npc.getSpawn().getX(), npc.getSpawn().getY(), npc.getSpawn().getZ(), npc.getSpawn().getHeading(), false, 0, false, world.getInstanceId()); + final Attackable mob = (Attackable) addSpawn(SPAWN_MOB_IDS[getRandom(SPAWN_MOB_IDS.length)], npc.getSpawn().getX(), npc.getSpawn().getY(), npc.getSpawn().getZ(), npc.getSpawn().getHeading(), false, 0, false, world.getInstanceId()); world.deviceSpawnedMobCount++; mob.setSeeThroughSilentMove(true); mob.setRunning(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java index c379b29f84..3758761cfb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java @@ -17,7 +17,6 @@ package ai.bosses.DrChaos; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -198,7 +197,7 @@ public class DrChaos extends AbstractNpcAI String htmltext = ""; if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL) { - _pissedOffTimer -= 1 + Rnd.get(5); // remove 1-5 secs. + _pissedOffTimer -= 1 + getRandom(5); // remove 1-5 secs. if ((_pissedOffTimer > 20) && (_pissedOffTimer <= 30)) { htmltext = "Doctor Chaos:
What?! Who are you? How did you come here?
You really look suspicious... Aren't those filthy members of Black Anvil guild send you? No? Mhhhhh... I don't trust you!"; @@ -237,7 +236,7 @@ public class DrChaos extends AbstractNpcAI npc.broadcastSay(ChatType.NPC_GENERAL, "Urggh! You will pay dearly for this insult."); // "lock" Dr. Chaos for regular RB time (36H fixed +- 24H random) - final long respawnTime = (36 + Rnd.get(-24, 24)) * 3600000; + final long respawnTime = (36 + getRandom(-24, 24)) * 3600000; GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, DEAD); startQuestTimer("reset_drchaos", respawnTime, null, null, false); @@ -251,7 +250,7 @@ public class DrChaos extends AbstractNpcAI @Override public String onAttack(Npc npc, Player victim, int damage, boolean isPet) { - final int chance = Rnd.get(300); + final int chance = getRandom(300); // Choose a message from 3 choices (1/100) if (chance < 3) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java index be64e26f8e..167adcc43a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java @@ -18,7 +18,6 @@ package quests.Q00025_HidingBehindTheTruth; import java.util.HashMap; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.QuestSound; @@ -260,7 +259,7 @@ public class Q00025_HidingBehindTheTruth extends Quest { htmltext = "31533-03.html"; } - else if (Rnd.get(60) > qs.getMemoStateEx(1)) + else if (getRandom(60) > qs.getMemoStateEx(1)) { qs.setMemoStateEx(1, qs.getMemoStateEx(1) + 20); qs.setMemoStateEx(npc.getId(), 1); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 651604acd9..c8caecc37b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -535,7 +534,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_RECRUIT: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (getRandom(100) < 25)) { giveItems(player, STAGE1, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -549,7 +548,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_WARRIOR: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (getRandom(100) < 25)) { giveItems(player, STAGE1, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -563,7 +562,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_ELITE_GUARD: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (getRandom(100) < 25)) { giveItems(player, STAGE1, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -578,7 +577,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_OFFICER: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (getRandom(100) < 25)) { giveItems(player, STAGE1, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -593,7 +592,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_GENERAL: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (getRandom(100) < 25)) { giveItems(player, STAGE2, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -607,7 +606,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKAS_PROPHET: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (getRandom(100) < 25)) { giveItems(player, STAGE2, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -621,7 +620,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_HEAD_GUARD: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (getRandom(100) < 25)) { giveItems(player, STAGE2, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -635,7 +634,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case PROPHET_GUARD: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (getRandom(100) < 25)) { giveItems(player, STAGE2, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -899,7 +898,7 @@ public class Q00144_PailakaInjuredDragon extends Quest private void dropHerb(Npc mob, Player player, int[][] drop) { - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] element : drop) { if (chance < element[2]) @@ -916,9 +915,9 @@ public class Q00144_PailakaInjuredDragon extends Quest Collections.shuffle(DROPLIST); for (ItemChanceHolder drop : DROPLIST) { - if (Rnd.get(100) < drop.getChance()) + if (getRandom(100) < drop.getChance()) { - ((Monster) mob).dropItem(player, drop.getId(), Rnd.get(1, 6)); + ((Monster) mob).dropItem(player, drop.getId(), getRandom(1, 6)); return; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java index d49ca0c18e..59e09f8a1c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -109,7 +108,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest } case "FINISH": { - final int value = Rnd.get(100); + final int value = getRandom(100); int adena = 0; if (value < 20) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java index 9370f73836..3f2f97d13b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java @@ -19,7 +19,6 @@ package quests.Q00426_QuestForFishingShot; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -392,7 +391,7 @@ public class Q00426_QuestForFishingShot extends Quest { if (MOBS_SPECIAL.containsKey(npc.getId())) { - if (Rnd.get(1000) <= MOBS_SPECIAL.get(npc.getId()).chance) + if (getRandom(1000) <= MOBS_SPECIAL.get(npc.getId()).chance) { rewardItems(qs.getPlayer(), SWEET_FLUID, MOBS_SPECIAL.get(npc.getId()).reward + 1); } @@ -404,7 +403,7 @@ public class Q00426_QuestForFishingShot extends Quest } else { - if (Rnd.get(1000) <= MOBS.get(npc.getId()).chance) + if (getRandom(1000) <= MOBS.get(npc.getId()).chance) { rewardItems(qs.getPlayer(), SWEET_FLUID, MOBS.get(npc.getId()).reward); playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index 713a772174..f006c781a8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -666,7 +665,7 @@ public class Q00662_AGameOfCards extends Quest } } - final Player player = players.get(Rnd.get(players.size())); + final Player player = players.get(getRandom(players.size())); if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && (MONSTERS.get(npc.getId()) < getRandom(1000))) { final QuestState qs = getQuestState(player, false); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java index 289f136c7e..5104113d9b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java @@ -16,7 +16,6 @@ */ package quests.Q00697_DefendTheHallOfErosion; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.SoIManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -85,7 +84,7 @@ public class Q00697_DefendTheHallOfErosion extends Quest } else if (qs.isCond(1) && (qs.getInt("defenceDone") != 0)) { - giveItems(player, VESPER_STONE, Rnd.get(12, 20)); + giveItems(player, VESPER_STONE, getRandom(12, 20)); qs.unset("defenceDone"); qs.exitQuest(true); htmltext = "32603-05.html"; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java index ef74273bdc..ab1069cb99 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java @@ -16,7 +16,6 @@ */ package quests.Q00698_BlockTheLordsEscape; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.SoIManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -81,7 +80,7 @@ public class Q00698_BlockTheLordsEscape extends Quest { if (qs.isCond(1) && (qs.getInt("defenceDone") == 1)) { - rewardItems(player, VESPER_STONE, Rnd.get(5, 8)); + rewardItems(player, VESPER_STONE, getRandom(5, 8)); qs.exitQuest(true); htmltext = "32603-05.html"; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java index 82b21390cc..90484c31c8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java @@ -16,7 +16,6 @@ */ package quests.Q00708_PathToBecomingALordGludio; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -169,7 +168,7 @@ public final class Q00708_PathToBecomingALordGludio extends Quest final QuestState qs = killer.getQuestState(getName()); if ((qs != null) && qs.isCond(6)) { - if ((npc.getId() != HEADLESS_KNIGHT) && (Rnd.get(9) == 0)) + if ((npc.getId() != HEADLESS_KNIGHT) && (getRandom(9) == 0)) { addSpawn(HEADLESS_KNIGHT, npc, true, 300000); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java index 8903690b3b..4643d87428 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java @@ -17,7 +17,6 @@ package quests.Q00709_PathToBecomingALordDion; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -164,7 +163,7 @@ public final class Q00709_PathToBecomingALordDion extends Quest final QuestState qs = killer.getQuestState(getName()); if ((qs != null) && qs.isCond(6) && CommonUtil.contains(OL_MAHUMS, npc.getId())) { - if ((npc.getId() != BLOODY_AXE_AIDE) && (Rnd.get(9) == 0)) + if ((npc.getId() != BLOODY_AXE_AIDE) && (getRandom(9) == 0)) { addSpawn(BLOODY_AXE_AIDE, npc, true, 300000); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java index 840cea636c..a571c389fc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java @@ -24,7 +24,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.SoIManager; @@ -417,7 +416,7 @@ public class HallOfErosionAttack extends AbstractNpcAI } player.destroyItemByItemId("SOI", 13797, 1, player, true); - final Location loc = world.deadTumors.get(Rnd.get(world.deadTumors.size())).getLocation(); + final Location loc = world.deadTumors.get(getRandom(world.deadTumors.size())).getLocation(); if (loc != null) { broadCastPacket(world, new ExShowScreenMessage(NpcStringId.S1_S_PARTY_HAS_MOVED_TO_A_DIFFERENT_LOCATION_THROUGH_THE_CRACK_IN_THE_TUMOR, 2, 8000)); @@ -454,9 +453,9 @@ public class HallOfErosionAttack extends AbstractNpcAI final HEAWorld world = (HEAWorld) tmpworld; if (npc.getId() == 18668) { - for (int i = 0; i < Rnd.get(1, 4); i++) + for (int i = 0; i < getRandom(1, 4); i++) { - addSpawn(mobs[Rnd.get(mobs.length)], npc.getLocation(), world.getInstanceId()); + addSpawn(mobs[getRandom(mobs.length)], npc.getLocation(), world.getInstanceId()); } npc.doDie(npc); } @@ -539,7 +538,7 @@ public class HallOfErosionAttack extends AbstractNpcAI if (npc.getId() == TUMOR_ALIVE) { world.addTumorCount(-1); - npc.dropItem(player, 13797, Rnd.get(2, 5)); + npc.dropItem(player, 13797, getRandom(2, 5)); npc.deleteMe(); world.deadTumor = addSpawn(TUMOR_DEAD, loc, world.getInstanceId()); world.deadTumors.add(world.deadTumor); @@ -553,7 +552,7 @@ public class HallOfErosionAttack extends AbstractNpcAI if ((world.tumorCount == 0) && (world.cohemenes == null)) { broadCastPacket(world, new ExShowScreenMessage(NpcStringId.ALL_THE_TUMORS_INSIDE_S1_HAVE_BEEN_DESTROYED_DRIVEN_INTO_A_CORNER_COHEMENES_APPEARS_CLOSE_BY, 2, 8000)); - final int[] spawn = COHEMENES_SPAWN[Rnd.get(0, COHEMENES_SPAWN.length - 1)]; + final int[] spawn = COHEMENES_SPAWN[getRandom(0, COHEMENES_SPAWN.length - 1)]; final Npc n = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId()); n.broadcastPacket(new NpcSay(n.getObjectId(), ChatType.SHOUT, n.getId(), NpcStringId.C_MON_C_MON_SHOW_YOUR_FACE_YOU_LITTLE_RATS_LET_ME_SEE_WHAT_THE_DOOMED_WEAKLINGS_ARE_SCHEMING)); world.cohemenes = n; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java index 3649806454..2c530995bb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java @@ -24,7 +24,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.CommandChannel; @@ -439,7 +438,7 @@ public class HallOfErosionDefence extends AbstractNpcAI } player.destroyItemByItemId("SOI", 13797, 1, player, true); - final Location loc = world.deadTumors.get(Rnd.get(world.deadTumors.size())).getLocation(); + final Location loc = world.deadTumors.get(getRandom(world.deadTumors.size())).getLocation(); if (loc != null) { broadCastPacket(world, new ExShowScreenMessage(NpcStringId.S1_S_PARTY_HAS_MOVED_TO_A_DIFFERENT_LOCATION_THROUGH_THE_CRACK_IN_THE_TUMOR, 2, 8000)); @@ -476,9 +475,9 @@ public class HallOfErosionDefence extends AbstractNpcAI final HEDWorld world = (HEDWorld) tmpworld; if (npc.getId() == 18668) { - for (int i = 0; i < Rnd.get(1, 4); i++) + for (int i = 0; i < getRandom(1, 4); i++) { - addSpawn(mobs[Rnd.get(mobs.length)], npc.getLocation(), world.getInstanceId()); + addSpawn(mobs[getRandom(mobs.length)], npc.getLocation(), world.getInstanceId()); } npc.deleteMe(); } @@ -522,7 +521,7 @@ public class HallOfErosionDefence extends AbstractNpcAI final HEDWorld world = (HEDWorld) tmpworld; if (npc.getId() == TUMOR_ALIVE) { - npc.dropItem(player, 13797, Rnd.get(2, 5)); + npc.dropItem(player, 13797, getRandom(2, 5)); npc.deleteMe(); notifyTumorDeath(npc, world); world.deadTumor = addSpawn(TUMOR_DEAD, npc.getLocation(), world.getInstanceId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java index b99f173f33..5f3238dac3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java @@ -25,7 +25,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -451,7 +450,7 @@ public class HeartInfinityAttack extends AbstractNpcAI } player.destroyItemByItemId("SOI", 13797, 1, player, true); - final Location loc = world.deadTumors.get(Rnd.get(world.deadTumors.size())).getLocation(); + final Location loc = world.deadTumors.get(getRandom(world.deadTumors.size())).getLocation(); if (loc != null) { broadCastPacket(world, new ExShowScreenMessage(NpcStringId.S1_S_PARTY_HAS_MOVED_TO_A_DIFFERENT_LOCATION_THROUGH_THE_CRACK_IN_THE_TUMOR, 2, 8000)); @@ -495,9 +494,9 @@ public class HeartInfinityAttack extends AbstractNpcAI if (npc.getId() == 18668) { - for (int i = 0; i < Rnd.get(1, 4); i++) + for (int i = 0; i < getRandom(1, 4); i++) { - addSpawn(mobs[Rnd.get(mobs.length)], npc.getLocation(), world.getInstanceId()); + addSpawn(mobs[getRandom(mobs.length)], npc.getLocation(), world.getInstanceId()); } npc.doDie(npc); } @@ -592,7 +591,7 @@ public class HeartInfinityAttack extends AbstractNpcAI if (npc.getId() == ALIVETUMOR) { world.addTumorCount(-1); - npc.dropItem(player, 13797, Rnd.get(2, 5)); + npc.dropItem(player, 13797, getRandom(2, 5)); npc.deleteMe(); world.deadTumor = addSpawn(DEADTUMOR, loc, world.getInstanceId()); world.deadTumors.add(world.deadTumor); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java index 0373aff82f..cfb1465679 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java @@ -24,7 +24,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -496,7 +495,7 @@ public class HeartInfinityDefence extends AbstractNpcAI } player.destroyItemByItemId("SOI", 13797, 1, player, true); - final Location loc = world.deadTumors.get(Rnd.get(world.deadTumors.size())).getLocation(); + final Location loc = world.deadTumors.get(getRandom(world.deadTumors.size())).getLocation(); if (loc != null) { broadCastPacket(world, new ExShowScreenMessage(NpcStringId.S1_S_PARTY_HAS_MOVED_TO_A_DIFFERENT_LOCATION_THROUGH_THE_CRACK_IN_THE_TUMOR, 2, 8000)); @@ -540,9 +539,9 @@ public class HeartInfinityDefence extends AbstractNpcAI if (npc.getId() == 18668) { - for (int i = 0; i < Rnd.get(1, 4); i++) + for (int i = 0; i < getRandom(1, 4); i++) { - addSpawn(mobs[Rnd.get(mobs.length)], npc.getLocation(), world.getInstanceId()); + addSpawn(mobs[getRandom(mobs.length)], npc.getLocation(), world.getInstanceId()); } npc.doDie(npc); } @@ -578,7 +577,7 @@ public class HeartInfinityDefence extends AbstractNpcAI final Location loc = npc.getLocation(); if (npc.getId() == ALIVETUMOR) { - npc.dropItem(player, 13797, Rnd.get(2, 5)); + npc.dropItem(player, 13797, getRandom(2, 5)); npc.deleteMe(); world.deadTumor = addSpawn(DEADTUMOR, loc, world.getInstanceId()); world.deadTumors.add(world.deadTumor); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java index 4aa00c2dca..36cd836c99 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java @@ -25,7 +25,6 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; @@ -1255,7 +1254,7 @@ public class SeedOfDestruction extends AbstractNpcAI final Player target = world.getAllowed().stream().findAny().get(); if ((world.deviceSpawnedMobCount < MAX_DEVICE_SPAWNED_MOB_COUNT) && (target != null) && ((npc != null) && (target.getInstanceId() == npc.getInstanceId())) && !target.isDead()) { - final Attackable mob = (Attackable) addSpawn(SPAWN_MOB_IDS[Rnd.get(SPAWN_MOB_IDS.length)], npc.getSpawn().getX(), npc.getSpawn().getY(), npc.getSpawn().getZ(), npc.getSpawn().getHeading(), false, 0, false, world.getInstanceId()); + final Attackable mob = (Attackable) addSpawn(SPAWN_MOB_IDS[getRandom(SPAWN_MOB_IDS.length)], npc.getSpawn().getX(), npc.getSpawn().getY(), npc.getSpawn().getZ(), npc.getSpawn().getHeading(), false, 0, false, world.getInstanceId()); world.deviceSpawnedMobCount++; mob.setSeeThroughSilentMove(true); mob.setRunning(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java index c379b29f84..3758761cfb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java @@ -17,7 +17,6 @@ package ai.bosses.DrChaos; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -198,7 +197,7 @@ public class DrChaos extends AbstractNpcAI String htmltext = ""; if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL) { - _pissedOffTimer -= 1 + Rnd.get(5); // remove 1-5 secs. + _pissedOffTimer -= 1 + getRandom(5); // remove 1-5 secs. if ((_pissedOffTimer > 20) && (_pissedOffTimer <= 30)) { htmltext = "Doctor Chaos:
What?! Who are you? How did you come here?
You really look suspicious... Aren't those filthy members of Black Anvil guild send you? No? Mhhhhh... I don't trust you!"; @@ -237,7 +236,7 @@ public class DrChaos extends AbstractNpcAI npc.broadcastSay(ChatType.NPC_GENERAL, "Urggh! You will pay dearly for this insult."); // "lock" Dr. Chaos for regular RB time (36H fixed +- 24H random) - final long respawnTime = (36 + Rnd.get(-24, 24)) * 3600000; + final long respawnTime = (36 + getRandom(-24, 24)) * 3600000; GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, DEAD); startQuestTimer("reset_drchaos", respawnTime, null, null, false); @@ -251,7 +250,7 @@ public class DrChaos extends AbstractNpcAI @Override public String onAttack(Npc npc, Player victim, int damage, boolean isPet) { - final int chance = Rnd.get(300); + final int chance = getRandom(300); // Choose a message from 3 choices (1/100) if (chance < 3) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java index 7ee6416ff1..0475497869 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java @@ -19,7 +19,6 @@ package ai.bosses.SeerUgoros; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -313,7 +312,7 @@ public class SeerUgoros extends AbstractNpcAI { // Dummy, just wait. } - else if (Rnd.get(10) < 6) + else if (getRandom(10) < 6) { _weed = null; for (Attackable attackable : World.getInstance().getVisibleObjectsInRange(_ugoros, Attackable.class, 2000)) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java index f41e444538..74b274aafc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java @@ -53,11 +53,11 @@ public class AltarsOfSacrifice extends AbstractNpcAI throw new IllegalStateException(); } - final Spawn spawn = new Spawn(_bossNpcIds[Rnd.get(_bossNpcIds.length)]); + final Spawn spawn = new Spawn(_bossNpcIds[getRandom(_bossNpcIds.length)]); spawn.setAmount(1); - spawn.setHeading(Rnd.get(65536)); + spawn.setHeading(getRandom(65536)); - final int radius = Rnd.get(BOSS_MIN_SPAWN_RADIUS, BOSS_MAX_SPAWN_RADIUS); + final int radius = getRandom(BOSS_MIN_SPAWN_RADIUS, BOSS_MAX_SPAWN_RADIUS); final double angleRadians = Rnd.nextDouble() * 2 * Math.PI; final int spawnX = (int) (radius * Math.cos(angleRadians)) + _middlePoint.getX(); final int spawnY = (int) (radius * Math.sin(angleRadians)) + _middlePoint.getY(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/NevitsHerald.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/NevitsHerald.java index b5ed5b9389..6fe1f47bd5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/NevitsHerald.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/NevitsHerald.java @@ -19,7 +19,6 @@ package ai.others.NevitsHerald; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -96,7 +95,7 @@ public class NevitsHerald extends AbstractNpcAI } else if (event.equalsIgnoreCase("text_spam")) { - npc.broadcastSay(ChatType.SHOUT, SPAM[Rnd.get(0, SPAM.length - 1)]); + npc.broadcastSay(ChatType.SHOUT, SPAM[getRandom(0, SPAM.length - 1)]); startQuestTimer("text_spam", 60000, npc, null); } else if (event.equalsIgnoreCase("despawn")) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java index 2654f219db..86475db31a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.World; @@ -111,15 +110,15 @@ public class ScarletVanHalisha extends AbstractNpcAI { case HALISHA2: { - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { return SkillData.getInstance().getSkill(5015, 2); } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { return SkillData.getInstance().getSkill(5015, 5); } - else if (Rnd.get(100) < 2) + else if (getRandom(100) < 2) { return SkillData.getInstance().getSkill(5016, 1); } @@ -130,27 +129,27 @@ public class ScarletVanHalisha extends AbstractNpcAI } case HALISHA3: { - if (Rnd.get(100) < 10) + if (getRandom(100) < 10) { return SkillData.getInstance().getSkill(5015, 3); } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { return SkillData.getInstance().getSkill(5015, 6); } - else if (Rnd.get(100) < 10) + else if (getRandom(100) < 10) { return SkillData.getInstance().getSkill(5015, 2); } - else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < Chronos.currentTimeMillis()) && (Rnd.get(100) < 10)) + else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(5019, 1); } - else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < Chronos.currentTimeMillis()) && (Rnd.get(100) < 10)) + else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(5018, 1); } - else if (Rnd.get(100) < 2) + else if (getRandom(100) < 2) { return SkillData.getInstance().getSkill(5016, 1); } @@ -169,7 +168,7 @@ public class ScarletVanHalisha extends AbstractNpcAI { return; } - if ((Rnd.get(100) < 30) || (_target == null) || _target.isDead()) + if ((getRandom(100) < 30) || (_target == null) || _target.isDead()) { _skill = getRndSkills(npc); _target = getRandomTarget(npc, _skill); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java index be64e26f8e..167adcc43a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java @@ -18,7 +18,6 @@ package quests.Q00025_HidingBehindTheTruth; import java.util.HashMap; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.QuestSound; @@ -260,7 +259,7 @@ public class Q00025_HidingBehindTheTruth extends Quest { htmltext = "31533-03.html"; } - else if (Rnd.get(60) > qs.getMemoStateEx(1)) + else if (getRandom(60) > qs.getMemoStateEx(1)) { qs.setMemoStateEx(1, qs.getMemoStateEx(1) + 20); qs.setMemoStateEx(npc.getId(), 1); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 651604acd9..c8caecc37b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -535,7 +534,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_RECRUIT: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (getRandom(100) < 25)) { giveItems(player, STAGE1, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -549,7 +548,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_WARRIOR: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (getRandom(100) < 25)) { giveItems(player, STAGE1, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -563,7 +562,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_ELITE_GUARD: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (getRandom(100) < 25)) { giveItems(player, STAGE1, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -578,7 +577,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_OFFICER: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, SPEAR) && !hasQuestItems(player, STAGE1) && (getRandom(100) < 25)) { giveItems(player, STAGE1, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -593,7 +592,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_GENERAL: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (getRandom(100) < 25)) { giveItems(player, STAGE2, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -607,7 +606,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKAS_PROPHET: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (getRandom(100) < 25)) { giveItems(player, STAGE2, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -621,7 +620,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_HEAD_GUARD: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (getRandom(100) < 25)) { giveItems(player, STAGE2, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -635,7 +634,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case PROPHET_GUARD: { dropHerb(npc, player, HP_HERBS_DROPLIST); - if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (Rnd.get(100) < 25)) + if (qs.isCond(3) && hasQuestItems(player, ENCHSPEAR) && !hasQuestItems(player, STAGE2) && (getRandom(100) < 25)) { giveItems(player, STAGE2, 1); player.sendPacket(QuestSound.ITEMSOUND_QUEST_ITEMGET.getPacket()); @@ -899,7 +898,7 @@ public class Q00144_PailakaInjuredDragon extends Quest private void dropHerb(Npc mob, Player player, int[][] drop) { - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] element : drop) { if (chance < element[2]) @@ -916,9 +915,9 @@ public class Q00144_PailakaInjuredDragon extends Quest Collections.shuffle(DROPLIST); for (ItemChanceHolder drop : DROPLIST) { - if (Rnd.get(100) < drop.getChance()) + if (getRandom(100) < drop.getChance()) { - ((Monster) mob).dropItem(player, drop.getId(), Rnd.get(1, 6)); + ((Monster) mob).dropItem(player, drop.getId(), getRandom(1, 6)); return; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java index d49ca0c18e..59e09f8a1c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -109,7 +108,7 @@ public class Q00356_DigUpTheSeaOfSpores extends Quest } case "FINISH": { - final int value = Rnd.get(100); + final int value = getRandom(100); int adena = 0; if (value < 20) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java index 9370f73836..3f2f97d13b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java @@ -19,7 +19,6 @@ package quests.Q00426_QuestForFishingShot; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -392,7 +391,7 @@ public class Q00426_QuestForFishingShot extends Quest { if (MOBS_SPECIAL.containsKey(npc.getId())) { - if (Rnd.get(1000) <= MOBS_SPECIAL.get(npc.getId()).chance) + if (getRandom(1000) <= MOBS_SPECIAL.get(npc.getId()).chance) { rewardItems(qs.getPlayer(), SWEET_FLUID, MOBS_SPECIAL.get(npc.getId()).reward + 1); } @@ -404,7 +403,7 @@ public class Q00426_QuestForFishingShot extends Quest } else { - if (Rnd.get(1000) <= MOBS.get(npc.getId()).chance) + if (getRandom(1000) <= MOBS.get(npc.getId()).chance) { rewardItems(qs.getPlayer(), SWEET_FLUID, MOBS.get(npc.getId()).reward); playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index 713a772174..f006c781a8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.Quest; @@ -666,7 +665,7 @@ public class Q00662_AGameOfCards extends Quest } } - final Player player = players.get(Rnd.get(players.size())); + final Player player = players.get(getRandom(players.size())); if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && (MONSTERS.get(npc.getId()) < getRandom(1000))) { final QuestState qs = getQuestState(player, false); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java index 289f136c7e..5104113d9b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java @@ -16,7 +16,6 @@ */ package quests.Q00697_DefendTheHallOfErosion; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.SoIManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -85,7 +84,7 @@ public class Q00697_DefendTheHallOfErosion extends Quest } else if (qs.isCond(1) && (qs.getInt("defenceDone") != 0)) { - giveItems(player, VESPER_STONE, Rnd.get(12, 20)); + giveItems(player, VESPER_STONE, getRandom(12, 20)); qs.unset("defenceDone"); qs.exitQuest(true); htmltext = "32603-05.html"; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java index ef74273bdc..ab1069cb99 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java @@ -16,7 +16,6 @@ */ package quests.Q00698_BlockTheLordsEscape; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.SoIManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -81,7 +80,7 @@ public class Q00698_BlockTheLordsEscape extends Quest { if (qs.isCond(1) && (qs.getInt("defenceDone") == 1)) { - rewardItems(player, VESPER_STONE, Rnd.get(5, 8)); + rewardItems(player, VESPER_STONE, getRandom(5, 8)); qs.exitQuest(true); htmltext = "32603-05.html"; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java index 82b21390cc..90484c31c8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java @@ -16,7 +16,6 @@ */ package quests.Q00708_PathToBecomingALordGludio; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -169,7 +168,7 @@ public final class Q00708_PathToBecomingALordGludio extends Quest final QuestState qs = killer.getQuestState(getName()); if ((qs != null) && qs.isCond(6)) { - if ((npc.getId() != HEADLESS_KNIGHT) && (Rnd.get(9) == 0)) + if ((npc.getId() != HEADLESS_KNIGHT) && (getRandom(9) == 0)) { addSpawn(HEADLESS_KNIGHT, npc, true, 300000); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java index 8903690b3b..4643d87428 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java @@ -17,7 +17,6 @@ package quests.Q00709_PathToBecomingALordDion; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -164,7 +163,7 @@ public final class Q00709_PathToBecomingALordDion extends Quest final QuestState qs = killer.getQuestState(getName()); if ((qs != null) && qs.isCond(6) && CommonUtil.contains(OL_MAHUMS, npc.getId())) { - if ((npc.getId() != BLOODY_AXE_AIDE) && (Rnd.get(9) == 0)) + if ((npc.getId() != BLOODY_AXE_AIDE) && (getRandom(9) == 0)) { addSpawn(BLOODY_AXE_AIDE, npc, true, 300000); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java index 70b430cbf5..ca5556d92c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java @@ -17,7 +17,6 @@ package ai.areas.TowerOfInsolence.Arushinai; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.Party; @@ -80,7 +79,7 @@ public class Arushinai extends AbstractNpcAI return null; // TODO: Find html? } - final int riftLevel = Rnd.get(1, 3); + final int riftLevel = getRandom(1, 3); GlobalVariablesManager.getInstance().set("heavenly_rift_level", riftLevel); GlobalVariablesManager.getInstance().set("heavenly_rift_complete", 4); switch (riftLevel) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java index 2f4efd060d..c727926c28 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java @@ -21,7 +21,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SpawnData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.ChanceLocation; @@ -150,7 +149,7 @@ public class EnergyOfInsolence extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= UNIDENTIFIED_STONE_DROP_RATE)) + if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= UNIDENTIFIED_STONE_DROP_RATE)) { npc.dropItem(killer, UNIDENTIFIED_STONE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -171,7 +170,7 @@ public class EnergyOfInsolence extends AbstractNpcAI _scheduleTaskAmon = ThreadPool.schedule(new ScheduleAITask(null, POWER_ANGEL_AMON), TIME_UNTIL_MOVE); } } - if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) + if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) { npc.dropItem(killer, ENERGY_OF_INSOLENCE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -216,7 +215,7 @@ public class EnergyOfInsolence extends AbstractNpcAI final Spawn spawn = new Spawn(_npcId); final List spawns = SpawnData.getInstance().getNpcSpawns(npcSpawnTemplate -> npcSpawnTemplate.getId() == _npcId); final List locations = spawns.get(0).getLocation(); - final Location location = locations.get(Rnd.get(locations.size())); + final Location location = locations.get(getRandom(locations.size())); spawn.setLocation(location); spawn.doSpawn(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java index 9f06908fc5..0338460cd8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.HeavenlyRift; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.World; @@ -66,7 +65,7 @@ public class Bomb extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (Rnd.get(100) < 33) + if (getRandom(100) < 33) { AbstractScript.addSpawn(DIVINE_ANGEL, npc, false, 1800000); } @@ -76,18 +75,18 @@ public class Bomb extends AbstractNpcAI { if ((creature != null) && !creature.isDead()) { - creature.reduceCurrentHp(Rnd.get(300, 400), npc, null); + creature.reduceCurrentHp(getRandom(300, 400), npc, null); } }); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { - if (Rnd.get(100) < 90) + if (getRandom(100) < 90) { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[Rnd.get(ITEM_DROP_1.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[getRandom(ITEM_DROP_1.length)], 1); } else { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[Rnd.get(ITEM_DROP_2.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[getRandom(ITEM_DROP_2.length)], 1); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index d0e546f202..2d0f92748e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.handler.BypassHandler; @@ -316,7 +315,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index f0de33ffc5..a787417f9b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -19,7 +19,6 @@ package events.MerrySquashmas; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -582,7 +581,7 @@ public class MerrySquashmas extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -601,7 +600,7 @@ public class MerrySquashmas extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -622,25 +621,25 @@ public class MerrySquashmas extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 9ec8b4849d..2bb5e100f0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -19,7 +19,6 @@ package events.SquashEvent; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -581,7 +580,7 @@ public class SquashEvent extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -600,7 +599,7 @@ public class SquashEvent extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -621,25 +620,25 @@ public class SquashEvent extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 95260904ec..b506a9c699 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -19,7 +19,6 @@ package events.WatermelonNinja; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; @@ -571,7 +570,7 @@ public class WatermelonNinja extends LongTimeEvent private void dropItem(Npc mob, Player player) { final int npcId = mob.getId(); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] drop : DROPLIST) { if ((npcId == drop[0]) && (chance < drop[2])) @@ -588,7 +587,7 @@ public class WatermelonNinja extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 5) { spawnNext(low, npc); @@ -609,25 +608,25 @@ public class WatermelonNinja extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java index 70b430cbf5..ca5556d92c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java @@ -17,7 +17,6 @@ package ai.areas.TowerOfInsolence.Arushinai; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.Party; @@ -80,7 +79,7 @@ public class Arushinai extends AbstractNpcAI return null; // TODO: Find html? } - final int riftLevel = Rnd.get(1, 3); + final int riftLevel = getRandom(1, 3); GlobalVariablesManager.getInstance().set("heavenly_rift_level", riftLevel); GlobalVariablesManager.getInstance().set("heavenly_rift_complete", 4); switch (riftLevel) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java index 2f4efd060d..c727926c28 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java @@ -21,7 +21,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SpawnData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.ChanceLocation; @@ -150,7 +149,7 @@ public class EnergyOfInsolence extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= UNIDENTIFIED_STONE_DROP_RATE)) + if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= UNIDENTIFIED_STONE_DROP_RATE)) { npc.dropItem(killer, UNIDENTIFIED_STONE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -171,7 +170,7 @@ public class EnergyOfInsolence extends AbstractNpcAI _scheduleTaskAmon = ThreadPool.schedule(new ScheduleAITask(null, POWER_ANGEL_AMON), TIME_UNTIL_MOVE); } } - if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) + if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) { npc.dropItem(killer, ENERGY_OF_INSOLENCE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -216,7 +215,7 @@ public class EnergyOfInsolence extends AbstractNpcAI final Spawn spawn = new Spawn(_npcId); final List spawns = SpawnData.getInstance().getNpcSpawns(npcSpawnTemplate -> npcSpawnTemplate.getId() == _npcId); final List locations = spawns.get(0).getLocation(); - final Location location = locations.get(Rnd.get(locations.size())); + final Location location = locations.get(getRandom(locations.size())); spawn.setLocation(location); spawn.doSpawn(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java index 9f06908fc5..0338460cd8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.HeavenlyRift; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.World; @@ -66,7 +65,7 @@ public class Bomb extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (Rnd.get(100) < 33) + if (getRandom(100) < 33) { AbstractScript.addSpawn(DIVINE_ANGEL, npc, false, 1800000); } @@ -76,18 +75,18 @@ public class Bomb extends AbstractNpcAI { if ((creature != null) && !creature.isDead()) { - creature.reduceCurrentHp(Rnd.get(300, 400), npc, null); + creature.reduceCurrentHp(getRandom(300, 400), npc, null); } }); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { - if (Rnd.get(100) < 90) + if (getRandom(100) < 90) { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[Rnd.get(ITEM_DROP_1.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[getRandom(ITEM_DROP_1.length)], 1); } else { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[Rnd.get(ITEM_DROP_2.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[getRandom(ITEM_DROP_2.length)], 1); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index d0e546f202..2d0f92748e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.handler.BypassHandler; @@ -316,7 +315,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index af15655c75..9da1db9fc4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -19,7 +19,6 @@ package events.MerrySquashmas; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -583,7 +582,7 @@ public class MerrySquashmas extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -602,7 +601,7 @@ public class MerrySquashmas extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -623,25 +622,25 @@ public class MerrySquashmas extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 6f8c20a54e..08922ed7d4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -19,7 +19,6 @@ package events.SquashEvent; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -582,7 +581,7 @@ public class SquashEvent extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -601,7 +600,7 @@ public class SquashEvent extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -622,25 +621,25 @@ public class SquashEvent extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index b48a865cda..bb70191318 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -19,7 +19,6 @@ package events.WatermelonNinja; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; @@ -572,7 +571,7 @@ public class WatermelonNinja extends LongTimeEvent private void dropItem(Npc mob, Player player) { final int npcId = mob.getId(); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] drop : DROPLIST) { if ((npcId == drop[0]) && (chance < drop[2])) @@ -589,7 +588,7 @@ public class WatermelonNinja extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 5) { spawnNext(low, npc); @@ -610,25 +609,25 @@ public class WatermelonNinja extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java index 10bb0513e6..3817e1be30 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java @@ -16,7 +16,6 @@ */ package ai.areas.DragonValley.Fellow; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Fellow extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java index 70b430cbf5..ca5556d92c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java @@ -17,7 +17,6 @@ package ai.areas.TowerOfInsolence.Arushinai; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.Party; @@ -80,7 +79,7 @@ public class Arushinai extends AbstractNpcAI return null; // TODO: Find html? } - final int riftLevel = Rnd.get(1, 3); + final int riftLevel = getRandom(1, 3); GlobalVariablesManager.getInstance().set("heavenly_rift_level", riftLevel); GlobalVariablesManager.getInstance().set("heavenly_rift_complete", 4); switch (riftLevel) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java index f1b49f56ba..d918a2bfc3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.Ateld; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Ateld extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java index 2f4efd060d..c727926c28 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java @@ -21,7 +21,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SpawnData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.ChanceLocation; @@ -150,7 +149,7 @@ public class EnergyOfInsolence extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= UNIDENTIFIED_STONE_DROP_RATE)) + if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= UNIDENTIFIED_STONE_DROP_RATE)) { npc.dropItem(killer, UNIDENTIFIED_STONE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -171,7 +170,7 @@ public class EnergyOfInsolence extends AbstractNpcAI _scheduleTaskAmon = ThreadPool.schedule(new ScheduleAITask(null, POWER_ANGEL_AMON), TIME_UNTIL_MOVE); } } - if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) + if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) { npc.dropItem(killer, ENERGY_OF_INSOLENCE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -216,7 +215,7 @@ public class EnergyOfInsolence extends AbstractNpcAI final Spawn spawn = new Spawn(_npcId); final List spawns = SpawnData.getInstance().getNpcSpawns(npcSpawnTemplate -> npcSpawnTemplate.getId() == _npcId); final List locations = spawns.get(0).getLocation(); - final Location location = locations.get(Rnd.get(locations.size())); + final Location location = locations.get(getRandom(locations.size())); spawn.setLocation(location); spawn.doSpawn(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java index 9f06908fc5..0338460cd8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.HeavenlyRift; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.World; @@ -66,7 +65,7 @@ public class Bomb extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (Rnd.get(100) < 33) + if (getRandom(100) < 33) { AbstractScript.addSpawn(DIVINE_ANGEL, npc, false, 1800000); } @@ -76,18 +75,18 @@ public class Bomb extends AbstractNpcAI { if ((creature != null) && !creature.isDead()) { - creature.reduceCurrentHp(Rnd.get(300, 400), npc, null); + creature.reduceCurrentHp(getRandom(300, 400), npc, null); } }); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { - if (Rnd.get(100) < 90) + if (getRandom(100) < 90) { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[Rnd.get(ITEM_DROP_1.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[getRandom(ITEM_DROP_1.length)], 1); } else { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[Rnd.get(ITEM_DROP_2.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[getRandom(ITEM_DROP_2.length)], 1); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index d0e546f202..2d0f92748e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.handler.BypassHandler; @@ -316,7 +315,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index af15655c75..9da1db9fc4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -19,7 +19,6 @@ package events.MerrySquashmas; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -583,7 +582,7 @@ public class MerrySquashmas extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -602,7 +601,7 @@ public class MerrySquashmas extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -623,25 +622,25 @@ public class MerrySquashmas extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 6f8c20a54e..08922ed7d4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -19,7 +19,6 @@ package events.SquashEvent; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -582,7 +581,7 @@ public class SquashEvent extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -601,7 +600,7 @@ public class SquashEvent extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -622,25 +621,25 @@ public class SquashEvent extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index b48a865cda..bb70191318 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -19,7 +19,6 @@ package events.WatermelonNinja; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; @@ -572,7 +571,7 @@ public class WatermelonNinja extends LongTimeEvent private void dropItem(Npc mob, Player player) { final int npcId = mob.getId(); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] drop : DROPLIST) { if ((npcId == drop[0]) && (chance < drop[2])) @@ -589,7 +588,7 @@ public class WatermelonNinja extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 5) { spawnNext(low, npc); @@ -610,25 +609,25 @@ public class WatermelonNinja extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java index 10bb0513e6..3817e1be30 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java @@ -16,7 +16,6 @@ */ package ai.areas.DragonValley.Fellow; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Fellow extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java index 70b430cbf5..ca5556d92c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java @@ -17,7 +17,6 @@ package ai.areas.TowerOfInsolence.Arushinai; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.Party; @@ -80,7 +79,7 @@ public class Arushinai extends AbstractNpcAI return null; // TODO: Find html? } - final int riftLevel = Rnd.get(1, 3); + final int riftLevel = getRandom(1, 3); GlobalVariablesManager.getInstance().set("heavenly_rift_level", riftLevel); GlobalVariablesManager.getInstance().set("heavenly_rift_complete", 4); switch (riftLevel) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java index f1b49f56ba..d918a2bfc3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.Ateld; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Ateld extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java index 2f4efd060d..c727926c28 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java @@ -21,7 +21,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SpawnData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.ChanceLocation; @@ -150,7 +149,7 @@ public class EnergyOfInsolence extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= UNIDENTIFIED_STONE_DROP_RATE)) + if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= UNIDENTIFIED_STONE_DROP_RATE)) { npc.dropItem(killer, UNIDENTIFIED_STONE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -171,7 +170,7 @@ public class EnergyOfInsolence extends AbstractNpcAI _scheduleTaskAmon = ThreadPool.schedule(new ScheduleAITask(null, POWER_ANGEL_AMON), TIME_UNTIL_MOVE); } } - if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) + if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) { npc.dropItem(killer, ENERGY_OF_INSOLENCE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -216,7 +215,7 @@ public class EnergyOfInsolence extends AbstractNpcAI final Spawn spawn = new Spawn(_npcId); final List spawns = SpawnData.getInstance().getNpcSpawns(npcSpawnTemplate -> npcSpawnTemplate.getId() == _npcId); final List locations = spawns.get(0).getLocation(); - final Location location = locations.get(Rnd.get(locations.size())); + final Location location = locations.get(getRandom(locations.size())); spawn.setLocation(location); spawn.doSpawn(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java index 9f06908fc5..0338460cd8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.HeavenlyRift; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.World; @@ -66,7 +65,7 @@ public class Bomb extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (Rnd.get(100) < 33) + if (getRandom(100) < 33) { AbstractScript.addSpawn(DIVINE_ANGEL, npc, false, 1800000); } @@ -76,18 +75,18 @@ public class Bomb extends AbstractNpcAI { if ((creature != null) && !creature.isDead()) { - creature.reduceCurrentHp(Rnd.get(300, 400), npc, null); + creature.reduceCurrentHp(getRandom(300, 400), npc, null); } }); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { - if (Rnd.get(100) < 90) + if (getRandom(100) < 90) { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[Rnd.get(ITEM_DROP_1.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[getRandom(ITEM_DROP_1.length)], 1); } else { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[Rnd.get(ITEM_DROP_2.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[getRandom(ITEM_DROP_2.length)], 1); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index d0e546f202..2d0f92748e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.handler.BypassHandler; @@ -316,7 +315,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index af15655c75..9da1db9fc4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -19,7 +19,6 @@ package events.MerrySquashmas; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -583,7 +582,7 @@ public class MerrySquashmas extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -602,7 +601,7 @@ public class MerrySquashmas extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -623,25 +622,25 @@ public class MerrySquashmas extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 6f8c20a54e..08922ed7d4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -19,7 +19,6 @@ package events.SquashEvent; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -582,7 +581,7 @@ public class SquashEvent extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -601,7 +600,7 @@ public class SquashEvent extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -622,25 +621,25 @@ public class SquashEvent extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index b48a865cda..bb70191318 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -19,7 +19,6 @@ package events.WatermelonNinja; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; @@ -572,7 +571,7 @@ public class WatermelonNinja extends LongTimeEvent private void dropItem(Npc mob, Player player) { final int npcId = mob.getId(); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] drop : DROPLIST) { if ((npcId == drop[0]) && (chance < drop[2])) @@ -589,7 +588,7 @@ public class WatermelonNinja extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 5) { spawnNext(low, npc); @@ -610,25 +609,25 @@ public class WatermelonNinja extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java index 10bb0513e6..3817e1be30 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java @@ -16,7 +16,6 @@ */ package ai.areas.DragonValley.Fellow; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Fellow extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java index 70b430cbf5..ca5556d92c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java @@ -17,7 +17,6 @@ package ai.areas.TowerOfInsolence.Arushinai; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.Party; @@ -80,7 +79,7 @@ public class Arushinai extends AbstractNpcAI return null; // TODO: Find html? } - final int riftLevel = Rnd.get(1, 3); + final int riftLevel = getRandom(1, 3); GlobalVariablesManager.getInstance().set("heavenly_rift_level", riftLevel); GlobalVariablesManager.getInstance().set("heavenly_rift_complete", 4); switch (riftLevel) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java index f1b49f56ba..d918a2bfc3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.Ateld; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Ateld extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java index 2f4efd060d..c727926c28 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java @@ -21,7 +21,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SpawnData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.ChanceLocation; @@ -150,7 +149,7 @@ public class EnergyOfInsolence extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= UNIDENTIFIED_STONE_DROP_RATE)) + if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= UNIDENTIFIED_STONE_DROP_RATE)) { npc.dropItem(killer, UNIDENTIFIED_STONE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -171,7 +170,7 @@ public class EnergyOfInsolence extends AbstractNpcAI _scheduleTaskAmon = ThreadPool.schedule(new ScheduleAITask(null, POWER_ANGEL_AMON), TIME_UNTIL_MOVE); } } - if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) + if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) { npc.dropItem(killer, ENERGY_OF_INSOLENCE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -216,7 +215,7 @@ public class EnergyOfInsolence extends AbstractNpcAI final Spawn spawn = new Spawn(_npcId); final List spawns = SpawnData.getInstance().getNpcSpawns(npcSpawnTemplate -> npcSpawnTemplate.getId() == _npcId); final List locations = spawns.get(0).getLocation(); - final Location location = locations.get(Rnd.get(locations.size())); + final Location location = locations.get(getRandom(locations.size())); spawn.setLocation(location); spawn.doSpawn(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java index 9f06908fc5..0338460cd8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.HeavenlyRift; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.World; @@ -66,7 +65,7 @@ public class Bomb extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (Rnd.get(100) < 33) + if (getRandom(100) < 33) { AbstractScript.addSpawn(DIVINE_ANGEL, npc, false, 1800000); } @@ -76,18 +75,18 @@ public class Bomb extends AbstractNpcAI { if ((creature != null) && !creature.isDead()) { - creature.reduceCurrentHp(Rnd.get(300, 400), npc, null); + creature.reduceCurrentHp(getRandom(300, 400), npc, null); } }); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { - if (Rnd.get(100) < 90) + if (getRandom(100) < 90) { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[Rnd.get(ITEM_DROP_1.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[getRandom(ITEM_DROP_1.length)], 1); } else { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[Rnd.get(ITEM_DROP_2.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[getRandom(ITEM_DROP_2.length)], 1); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index d0e546f202..2d0f92748e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.handler.BypassHandler; @@ -316,7 +315,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index af15655c75..9da1db9fc4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -19,7 +19,6 @@ package events.MerrySquashmas; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -583,7 +582,7 @@ public class MerrySquashmas extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -602,7 +601,7 @@ public class MerrySquashmas extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -623,25 +622,25 @@ public class MerrySquashmas extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 6f8c20a54e..08922ed7d4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -19,7 +19,6 @@ package events.SquashEvent; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -582,7 +581,7 @@ public class SquashEvent extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -601,7 +600,7 @@ public class SquashEvent extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -622,25 +621,25 @@ public class SquashEvent extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index b48a865cda..bb70191318 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -19,7 +19,6 @@ package events.WatermelonNinja; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; @@ -572,7 +571,7 @@ public class WatermelonNinja extends LongTimeEvent private void dropItem(Npc mob, Player player) { final int npcId = mob.getId(); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] drop : DROPLIST) { if ((npcId == drop[0]) && (chance < drop[2])) @@ -589,7 +588,7 @@ public class WatermelonNinja extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 5) { spawnNext(low, npc); @@ -610,25 +609,25 @@ public class WatermelonNinja extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java index 10bb0513e6..3817e1be30 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java @@ -16,7 +16,6 @@ */ package ai.areas.DragonValley.Fellow; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Fellow extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java index 70b430cbf5..ca5556d92c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java @@ -17,7 +17,6 @@ package ai.areas.TowerOfInsolence.Arushinai; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.Party; @@ -80,7 +79,7 @@ public class Arushinai extends AbstractNpcAI return null; // TODO: Find html? } - final int riftLevel = Rnd.get(1, 3); + final int riftLevel = getRandom(1, 3); GlobalVariablesManager.getInstance().set("heavenly_rift_level", riftLevel); GlobalVariablesManager.getInstance().set("heavenly_rift_complete", 4); switch (riftLevel) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java index f1b49f56ba..d918a2bfc3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.Ateld; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Ateld extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java index 1c439e4796..761c841e67 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java @@ -21,7 +21,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SpawnData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.ChanceLocation; @@ -152,7 +151,7 @@ public class EnergyOfInsolence extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= UNIDENTIFIED_STONE_DROP_RATE)) + if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= UNIDENTIFIED_STONE_DROP_RATE)) { npc.dropItem(killer, UNIDENTIFIED_STONE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -173,7 +172,7 @@ public class EnergyOfInsolence extends AbstractNpcAI _scheduleTaskAmon = ThreadPool.schedule(new ScheduleAITask(null, POWER_ANGEL_AMON), TIME_UNTIL_MOVE); } } - if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) + if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) { npc.dropItem(killer, ENERGY_OF_INSOLENCE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -218,7 +217,7 @@ public class EnergyOfInsolence extends AbstractNpcAI final Spawn spawn = new Spawn(_npcId); final List spawns = SpawnData.getInstance().getNpcSpawns(npcSpawnTemplate -> npcSpawnTemplate.getId() == _npcId); final List locations = spawns.get(0).getLocation(); - final Location location = locations.get(Rnd.get(locations.size())); + final Location location = locations.get(getRandom(locations.size())); spawn.setLocation(location); spawn.doSpawn(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java index 9f06908fc5..0338460cd8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.HeavenlyRift; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.World; @@ -66,7 +65,7 @@ public class Bomb extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (Rnd.get(100) < 33) + if (getRandom(100) < 33) { AbstractScript.addSpawn(DIVINE_ANGEL, npc, false, 1800000); } @@ -76,18 +75,18 @@ public class Bomb extends AbstractNpcAI { if ((creature != null) && !creature.isDead()) { - creature.reduceCurrentHp(Rnd.get(300, 400), npc, null); + creature.reduceCurrentHp(getRandom(300, 400), npc, null); } }); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { - if (Rnd.get(100) < 90) + if (getRandom(100) < 90) { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[Rnd.get(ITEM_DROP_1.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[getRandom(ITEM_DROP_1.length)], 1); } else { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[Rnd.get(ITEM_DROP_2.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[getRandom(ITEM_DROP_2.length)], 1); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index d0e546f202..2d0f92748e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.handler.BypassHandler; @@ -316,7 +315,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index af15655c75..9da1db9fc4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -19,7 +19,6 @@ package events.MerrySquashmas; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -583,7 +582,7 @@ public class MerrySquashmas extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -602,7 +601,7 @@ public class MerrySquashmas extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -623,25 +622,25 @@ public class MerrySquashmas extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 6f8c20a54e..08922ed7d4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -19,7 +19,6 @@ package events.SquashEvent; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -582,7 +581,7 @@ public class SquashEvent extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -601,7 +600,7 @@ public class SquashEvent extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -622,25 +621,25 @@ public class SquashEvent extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index b48a865cda..bb70191318 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -19,7 +19,6 @@ package events.WatermelonNinja; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; @@ -572,7 +571,7 @@ public class WatermelonNinja extends LongTimeEvent private void dropItem(Npc mob, Player player) { final int npcId = mob.getId(); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] drop : DROPLIST) { if ((npcId == drop[0]) && (chance < drop[2])) @@ -589,7 +588,7 @@ public class WatermelonNinja extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 5) { spawnNext(low, npc); @@ -610,25 +609,25 @@ public class WatermelonNinja extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index d0e546f202..2d0f92748e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.handler.BypassHandler; @@ -316,7 +315,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index af15655c75..9da1db9fc4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -19,7 +19,6 @@ package events.MerrySquashmas; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -583,7 +582,7 @@ public class MerrySquashmas extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -602,7 +601,7 @@ public class MerrySquashmas extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -623,25 +622,25 @@ public class MerrySquashmas extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 6f8c20a54e..08922ed7d4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -19,7 +19,6 @@ package events.SquashEvent; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -582,7 +581,7 @@ public class SquashEvent extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -601,7 +600,7 @@ public class SquashEvent extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -622,25 +621,25 @@ public class SquashEvent extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index b48a865cda..bb70191318 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -19,7 +19,6 @@ package events.WatermelonNinja; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; @@ -572,7 +571,7 @@ public class WatermelonNinja extends LongTimeEvent private void dropItem(Npc mob, Player player) { final int npcId = mob.getId(); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] drop : DROPLIST) { if ((npcId == drop[0]) && (chance < drop[2])) @@ -589,7 +588,7 @@ public class WatermelonNinja extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 5) { spawnNext(low, npc); @@ -610,25 +609,25 @@ public class WatermelonNinja extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java index 10bb0513e6..3817e1be30 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java @@ -16,7 +16,6 @@ */ package ai.areas.DragonValley.Fellow; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Fellow extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java index 2d4a5ab28d..cc76f9f2ae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java @@ -17,7 +17,6 @@ package ai.areas.TowerOfInsolence.Arushinai; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.Party; @@ -80,7 +79,7 @@ public class Arushinai extends AbstractNpcAI return null; // TODO: Find html? } - final int riftLevel = Rnd.get(1, 3); + final int riftLevel = getRandom(1, 3); GlobalVariablesManager.getInstance().set("heavenly_rift_level", riftLevel); GlobalVariablesManager.getInstance().set("heavenly_rift_complete", 4); switch (riftLevel) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java index f1b49f56ba..d918a2bfc3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.Ateld; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Ateld extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java index 1c439e4796..761c841e67 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java @@ -21,7 +21,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SpawnData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.ChanceLocation; @@ -152,7 +151,7 @@ public class EnergyOfInsolence extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= UNIDENTIFIED_STONE_DROP_RATE)) + if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= UNIDENTIFIED_STONE_DROP_RATE)) { npc.dropItem(killer, UNIDENTIFIED_STONE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -173,7 +172,7 @@ public class EnergyOfInsolence extends AbstractNpcAI _scheduleTaskAmon = ThreadPool.schedule(new ScheduleAITask(null, POWER_ANGEL_AMON), TIME_UNTIL_MOVE); } } - if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) + if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) { npc.dropItem(killer, ENERGY_OF_INSOLENCE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -218,7 +217,7 @@ public class EnergyOfInsolence extends AbstractNpcAI final Spawn spawn = new Spawn(_npcId); final List spawns = SpawnData.getInstance().getNpcSpawns(npcSpawnTemplate -> npcSpawnTemplate.getId() == _npcId); final List locations = spawns.get(0).getLocation(); - final Location location = locations.get(Rnd.get(locations.size())); + final Location location = locations.get(getRandom(locations.size())); spawn.setLocation(location); spawn.doSpawn(); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java index 9f06908fc5..0338460cd8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.HeavenlyRift; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.World; @@ -66,7 +65,7 @@ public class Bomb extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (Rnd.get(100) < 33) + if (getRandom(100) < 33) { AbstractScript.addSpawn(DIVINE_ANGEL, npc, false, 1800000); } @@ -76,18 +75,18 @@ public class Bomb extends AbstractNpcAI { if ((creature != null) && !creature.isDead()) { - creature.reduceCurrentHp(Rnd.get(300, 400), npc, null); + creature.reduceCurrentHp(getRandom(300, 400), npc, null); } }); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { - if (Rnd.get(100) < 90) + if (getRandom(100) < 90) { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[Rnd.get(ITEM_DROP_1.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[getRandom(ITEM_DROP_1.length)], 1); } else { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[Rnd.get(ITEM_DROP_2.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[getRandom(ITEM_DROP_2.length)], 1); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Atingo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Atingo.java index a92084fcf5..f146804837 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Atingo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Atingo.java @@ -20,7 +20,6 @@ import java.time.Duration; import java.util.function.Consumer; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -94,7 +93,7 @@ public class Atingo extends AbstractNpcAI final Npc creature = (Npc) hpChangeEvent.getCreature(); if ((creature.getScriptValue() == 0) && !creature.isDead() && creature.isInCombat()) { - final Npc pet = addSpawn(Rnd.get(100) <= ATINGO_PET_SPAWN_RATE ? getRandomEntry(PETS) : SIN_EATER, GeoEngine.getInstance().getValidLocation(creature.getX(), creature.getY(), creature.getZ(), creature.getX() + 50, creature.getY() + 50, creature.getZ(), null)); + final Npc pet = addSpawn(getRandom(100) <= ATINGO_PET_SPAWN_RATE ? getRandomEntry(PETS) : SIN_EATER, GeoEngine.getInstance().getValidLocation(creature.getX(), creature.getY(), creature.getZ(), creature.getX() + 50, creature.getY() + 50, creature.getZ(), null)); creature.setScriptValue(pet.getObjectId()); pet.setInvul(true); pet.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.H_ULTIMATE_DEFENCE_B_AVE); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 49c8aa27f7..51dcd7426b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.handler.BypassHandler; @@ -316,7 +315,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index af15655c75..9da1db9fc4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -19,7 +19,6 @@ package events.MerrySquashmas; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -583,7 +582,7 @@ public class MerrySquashmas extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -602,7 +601,7 @@ public class MerrySquashmas extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -623,25 +622,25 @@ public class MerrySquashmas extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 6f8c20a54e..08922ed7d4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -19,7 +19,6 @@ package events.SquashEvent; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -582,7 +581,7 @@ public class SquashEvent extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -601,7 +600,7 @@ public class SquashEvent extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -622,25 +621,25 @@ public class SquashEvent extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index b48a865cda..bb70191318 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -19,7 +19,6 @@ package events.WatermelonNinja; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; @@ -572,7 +571,7 @@ public class WatermelonNinja extends LongTimeEvent private void dropItem(Npc mob, Player player) { final int npcId = mob.getId(); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] drop : DROPLIST) { if ((npcId == drop[0]) && (chance < drop[2])) @@ -589,7 +588,7 @@ public class WatermelonNinja extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 5) { spawnNext(low, npc); @@ -610,25 +609,25 @@ public class WatermelonNinja extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java index c032f9e183..50c3d6d3e2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java @@ -22,7 +22,6 @@ import java.util.Map.Entry; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; @@ -291,13 +290,13 @@ public class TranscendentZone extends AbstractInstance { if (!instance.getParameters().getBoolean("PlayerIsOut", false) && (instance.getAliveNpcCount() == 1)) { - if (Rnd.get(5) == 0) + if (getRandom(5) == 0) { player.getInstanceWorld().spawnGroup("treasures"); } else { - if (Rnd.get(3) == 0) + if (getRandom(3) == 0) { player.getInstanceWorld().spawnGroup("treasures"); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java index 10bb0513e6..3817e1be30 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java @@ -16,7 +16,6 @@ */ package ai.areas.DragonValley.Fellow; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Fellow extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java index 2d4a5ab28d..cc76f9f2ae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java @@ -17,7 +17,6 @@ package ai.areas.TowerOfInsolence.Arushinai; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.Party; @@ -80,7 +79,7 @@ public class Arushinai extends AbstractNpcAI return null; // TODO: Find html? } - final int riftLevel = Rnd.get(1, 3); + final int riftLevel = getRandom(1, 3); GlobalVariablesManager.getInstance().set("heavenly_rift_level", riftLevel); GlobalVariablesManager.getInstance().set("heavenly_rift_complete", 4); switch (riftLevel) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java index f1b49f56ba..d918a2bfc3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.Ateld; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Ateld extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java index 1c439e4796..761c841e67 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java @@ -21,7 +21,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SpawnData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.ChanceLocation; @@ -152,7 +151,7 @@ public class EnergyOfInsolence extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= UNIDENTIFIED_STONE_DROP_RATE)) + if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= UNIDENTIFIED_STONE_DROP_RATE)) { npc.dropItem(killer, UNIDENTIFIED_STONE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -173,7 +172,7 @@ public class EnergyOfInsolence extends AbstractNpcAI _scheduleTaskAmon = ThreadPool.schedule(new ScheduleAITask(null, POWER_ANGEL_AMON), TIME_UNTIL_MOVE); } } - if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) + if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) { npc.dropItem(killer, ENERGY_OF_INSOLENCE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -218,7 +217,7 @@ public class EnergyOfInsolence extends AbstractNpcAI final Spawn spawn = new Spawn(_npcId); final List spawns = SpawnData.getInstance().getNpcSpawns(npcSpawnTemplate -> npcSpawnTemplate.getId() == _npcId); final List locations = spawns.get(0).getLocation(); - final Location location = locations.get(Rnd.get(locations.size())); + final Location location = locations.get(getRandom(locations.size())); spawn.setLocation(location); spawn.doSpawn(); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java index 9f06908fc5..0338460cd8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.HeavenlyRift; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.World; @@ -66,7 +65,7 @@ public class Bomb extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (Rnd.get(100) < 33) + if (getRandom(100) < 33) { AbstractScript.addSpawn(DIVINE_ANGEL, npc, false, 1800000); } @@ -76,18 +75,18 @@ public class Bomb extends AbstractNpcAI { if ((creature != null) && !creature.isDead()) { - creature.reduceCurrentHp(Rnd.get(300, 400), npc, null); + creature.reduceCurrentHp(getRandom(300, 400), npc, null); } }); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { - if (Rnd.get(100) < 90) + if (getRandom(100) < 90) { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[Rnd.get(ITEM_DROP_1.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[getRandom(ITEM_DROP_1.length)], 1); } else { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[Rnd.get(ITEM_DROP_2.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[getRandom(ITEM_DROP_2.length)], 1); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Atingo.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Atingo.java index a92084fcf5..f146804837 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Atingo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Atingo.java @@ -20,7 +20,6 @@ import java.time.Duration; import java.util.function.Consumer; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -94,7 +93,7 @@ public class Atingo extends AbstractNpcAI final Npc creature = (Npc) hpChangeEvent.getCreature(); if ((creature.getScriptValue() == 0) && !creature.isDead() && creature.isInCombat()) { - final Npc pet = addSpawn(Rnd.get(100) <= ATINGO_PET_SPAWN_RATE ? getRandomEntry(PETS) : SIN_EATER, GeoEngine.getInstance().getValidLocation(creature.getX(), creature.getY(), creature.getZ(), creature.getX() + 50, creature.getY() + 50, creature.getZ(), null)); + final Npc pet = addSpawn(getRandom(100) <= ATINGO_PET_SPAWN_RATE ? getRandomEntry(PETS) : SIN_EATER, GeoEngine.getInstance().getValidLocation(creature.getX(), creature.getY(), creature.getZ(), creature.getX() + 50, creature.getY() + 50, creature.getZ(), null)); creature.setScriptValue(pet.getObjectId()); pet.setInvul(true); pet.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.H_ULTIMATE_DEFENCE_B_AVE); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 49c8aa27f7..51dcd7426b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.handler.BypassHandler; @@ -316,7 +315,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index af15655c75..9da1db9fc4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -19,7 +19,6 @@ package events.MerrySquashmas; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -583,7 +582,7 @@ public class MerrySquashmas extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -602,7 +601,7 @@ public class MerrySquashmas extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -623,25 +622,25 @@ public class MerrySquashmas extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 6f8c20a54e..08922ed7d4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -19,7 +19,6 @@ package events.SquashEvent; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -582,7 +581,7 @@ public class SquashEvent extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -601,7 +600,7 @@ public class SquashEvent extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -622,25 +621,25 @@ public class SquashEvent extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index b48a865cda..bb70191318 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -19,7 +19,6 @@ package events.WatermelonNinja; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; @@ -572,7 +571,7 @@ public class WatermelonNinja extends LongTimeEvent private void dropItem(Npc mob, Player player) { final int npcId = mob.getId(); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] drop : DROPLIST) { if ((npcId == drop[0]) && (chance < drop[2])) @@ -589,7 +588,7 @@ public class WatermelonNinja extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 5) { spawnNext(low, npc); @@ -610,25 +609,25 @@ public class WatermelonNinja extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java index c032f9e183..50c3d6d3e2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java @@ -22,7 +22,6 @@ import java.util.Map.Entry; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; @@ -291,13 +290,13 @@ public class TranscendentZone extends AbstractInstance { if (!instance.getParameters().getBoolean("PlayerIsOut", false) && (instance.getAliveNpcCount() == 1)) { - if (Rnd.get(5) == 0) + if (getRandom(5) == 0) { player.getInstanceWorld().spawnGroup("treasures"); } else { - if (Rnd.get(3) == 0) + if (getRandom(3) == 0) { player.getInstanceWorld().spawnGroup("treasures"); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java index 10bb0513e6..3817e1be30 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/DragonValley/Fellow/Fellow.java @@ -16,7 +16,6 @@ */ package ai.areas.DragonValley.Fellow; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Fellow extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java index 2d4a5ab28d..cc76f9f2ae 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/Arushinai/Arushinai.java @@ -17,7 +17,6 @@ package ai.areas.TowerOfInsolence.Arushinai; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.Party; @@ -80,7 +79,7 @@ public class Arushinai extends AbstractNpcAI return null; // TODO: Find html? } - final int riftLevel = Rnd.get(1, 3); + final int riftLevel = getRandom(1, 3); GlobalVariablesManager.getInstance().set("heavenly_rift_level", riftLevel); GlobalVariablesManager.getInstance().set("heavenly_rift_complete", 4); switch (riftLevel) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java index f1b49f56ba..d918a2bfc3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/Ateld/Ateld.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.Ateld; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -71,7 +70,7 @@ public class Ateld extends AbstractNpcAI } case "CHAT_TIMER": { - npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[Rnd.get(TEXT.length)])); + npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, TEXT[getRandom(TEXT.length)])); startQuestTimer("CHAT_TIMER", 30000, npc, null); break; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java index 1c439e4796..761c841e67 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java @@ -21,7 +21,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SpawnData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.ChanceLocation; @@ -152,7 +151,7 @@ public class EnergyOfInsolence extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= UNIDENTIFIED_STONE_DROP_RATE)) + if (CommonUtil.contains(UNIDENTIFIED_STONE_NPC_IDS, npc.getId()) && ((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= UNIDENTIFIED_STONE_DROP_RATE)) { npc.dropItem(killer, UNIDENTIFIED_STONE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -173,7 +172,7 @@ public class EnergyOfInsolence extends AbstractNpcAI _scheduleTaskAmon = ThreadPool.schedule(new ScheduleAITask(null, POWER_ANGEL_AMON), TIME_UNTIL_MOVE); } } - if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (Rnd.get(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) + if (((killer.getLevel() - npc.getLevel()) <= LEVEL_MAX_DIFF) && (getRandom(100) <= ENERGY_OF_INSOLENCE_DROP_RATE)) { npc.dropItem(killer, ENERGY_OF_INSOLENCE_ITEM_ID, ENERGY_OF_INSOLENCE_DROP_COUNT); } @@ -218,7 +217,7 @@ public class EnergyOfInsolence extends AbstractNpcAI final Spawn spawn = new Spawn(_npcId); final List spawns = SpawnData.getInstance().getNpcSpawns(npcSpawnTemplate -> npcSpawnTemplate.getId() == _npcId); final List locations = spawns.get(0).getLocation(); - final Location location = locations.get(Rnd.get(locations.size())); + final Location location = locations.get(getRandom(locations.size())); spawn.setLocation(location); spawn.doSpawn(); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java index 9f06908fc5..0338460cd8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/areas/TowerOfInsolence/HeavenlyRift/Bomb.java @@ -16,7 +16,6 @@ */ package ai.areas.TowerOfInsolence.HeavenlyRift; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.HeavenlyRiftManager; import org.l2jmobius.gameserver.model.World; @@ -66,7 +65,7 @@ public class Bomb extends AbstractNpcAI @Override public String onKill(Npc npc, Player killer, boolean isSummon) { - if (Rnd.get(100) < 33) + if (getRandom(100) < 33) { AbstractScript.addSpawn(DIVINE_ANGEL, npc, false, 1800000); } @@ -76,18 +75,18 @@ public class Bomb extends AbstractNpcAI { if ((creature != null) && !creature.isDead()) { - creature.reduceCurrentHp(Rnd.get(300, 400), npc, null); + creature.reduceCurrentHp(getRandom(300, 400), npc, null); } }); - if (Rnd.get(100) < 50) + if (getRandom(100) < 50) { - if (Rnd.get(100) < 90) + if (getRandom(100) < 90) { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[Rnd.get(ITEM_DROP_1.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_1[getRandom(ITEM_DROP_1.length)], 1); } else { - npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[Rnd.get(ITEM_DROP_2.length)], 1); + npc.dropItem(killer.getActingPlayer(), ITEM_DROP_2[getRandom(ITEM_DROP_2.length)], 1); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/Atingo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/Atingo.java index a92084fcf5..f146804837 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/Atingo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/Atingo.java @@ -20,7 +20,6 @@ import java.time.Duration; import java.util.function.Consumer; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -94,7 +93,7 @@ public class Atingo extends AbstractNpcAI final Npc creature = (Npc) hpChangeEvent.getCreature(); if ((creature.getScriptValue() == 0) && !creature.isDead() && creature.isInCombat()) { - final Npc pet = addSpawn(Rnd.get(100) <= ATINGO_PET_SPAWN_RATE ? getRandomEntry(PETS) : SIN_EATER, GeoEngine.getInstance().getValidLocation(creature.getX(), creature.getY(), creature.getZ(), creature.getX() + 50, creature.getY() + 50, creature.getZ(), null)); + final Npc pet = addSpawn(getRandom(100) <= ATINGO_PET_SPAWN_RATE ? getRandomEntry(PETS) : SIN_EATER, GeoEngine.getInstance().getValidLocation(creature.getX(), creature.getY(), creature.getZ(), creature.getX() + 50, creature.getY() + 50, creature.getZ(), null)); creature.setScriptValue(pet.getObjectId()); pet.setInvul(true); pet.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.H_ULTIMATE_DEFENCE_B_AVE); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 49c8aa27f7..51dcd7426b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.handler.BypassHandler; @@ -316,7 +315,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler LOGGER.warning(getClass().getSimpleName() + ": Zone: " + nextArena.getStadium().getZone() + " doesn't have specatator spawns defined!"); return false; } - final Location loc = spectatorSpawns.get(Rnd.get(spectatorSpawns.size())); + final Location loc = spectatorSpawns.get(getRandom(spectatorSpawns.size())); player.enterOlympiadObserverMode(loc, arenaId); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/custom/listeners/ListenerTest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/custom/listeners/ListenerTest.java index ded4dba194..4d7b439eb5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/custom/listeners/ListenerTest.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/custom/listeners/ListenerTest.java @@ -16,7 +16,6 @@ */ package custom.listeners; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; @@ -126,7 +125,7 @@ public class ListenerTest extends AbstractNpcAI private void OnCreatureKill(OnCreatureDeath event) { // 70% chance to drop - if (Rnd.get(100) >= 70) + if (getRandom(100) >= 70) { return; } @@ -135,7 +134,7 @@ public class ListenerTest extends AbstractNpcAI if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable()) { final Attackable monster = (Attackable) event.getTarget(); - monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000))); + monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000))); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index af15655c75..9da1db9fc4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -19,7 +19,6 @@ package events.MerrySquashmas; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -583,7 +582,7 @@ public class MerrySquashmas extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -602,7 +601,7 @@ public class MerrySquashmas extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -623,25 +622,25 @@ public class MerrySquashmas extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 6f8c20a54e..08922ed7d4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -19,7 +19,6 @@ package events.SquashEvent; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; @@ -582,7 +581,7 @@ public class SquashEvent extends LongTimeEvent { continue; } - if (Rnd.get(100) < drop[2]) + if (getRandom(100) < drop[2]) { if (ItemTable.getInstance().getTemplate(drop[1]).getCrystalType() != CrystalType.NONE) { @@ -601,7 +600,7 @@ public class SquashEvent extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int _random = Rnd.get(100); + final int _random = getRandom(100); if (_random < 5) { spawnNext(low, npc); @@ -622,25 +621,25 @@ public class SquashEvent extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index b48a865cda..bb70191318 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -19,7 +19,6 @@ package events.WatermelonNinja; import java.util.Arrays; import java.util.List; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; @@ -572,7 +571,7 @@ public class WatermelonNinja extends LongTimeEvent private void dropItem(Npc mob, Player player) { final int npcId = mob.getId(); - final int chance = Rnd.get(100); + final int chance = getRandom(100); for (int[] drop : DROPLIST) { if ((npcId == drop[0]) && (chance < drop[2])) @@ -589,7 +588,7 @@ public class WatermelonNinja extends LongTimeEvent private void randomSpawn(int low, int medium, int high, Npc npc) { - final int random = Rnd.get(100); + final int random = getRandom(100); if (random < 5) { spawnNext(low, npc); @@ -610,25 +609,25 @@ public class WatermelonNinja extends LongTimeEvent private void ChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[getRandom(_CHRONO_TEXT.length)])); } } private void noChronoText(Npc npc) { - if (Rnd.get(100) < 20) + if (getRandom(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[getRandom(_NOCHRONO_TEXT.length)])); } } private void nectarText(Npc npc) { - if (Rnd.get(100) < 30) + if (getRandom(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[getRandom(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java index c032f9e183..50c3d6d3e2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/TranscendentZone/TranscendentZone.java @@ -22,7 +22,6 @@ import java.util.Map.Entry; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; @@ -291,13 +290,13 @@ public class TranscendentZone extends AbstractInstance { if (!instance.getParameters().getBoolean("PlayerIsOut", false) && (instance.getAliveNpcCount() == 1)) { - if (Rnd.get(5) == 0) + if (getRandom(5) == 0) { player.getInstanceWorld().spawnGroup("treasures"); } else { - if (Rnd.get(3) == 0) + if (getRandom(3) == 0) { player.getInstanceWorld().spawnGroup("treasures"); }