diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Aphrodite.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Aphrodite.binka deleted file mode 100644 index c33618af..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Aphrodite.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Apollo.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Apollo.binka deleted file mode 100644 index 45be573e..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Apollo.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Ares.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Ares.binka deleted file mode 100644 index 8c9ad1ec..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Ares.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Artemis.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Artemis.binka deleted file mode 100644 index 07bc3e73..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Artemis.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Athena.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Athena.binka deleted file mode 100644 index 47c4dd97..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Athena.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Demeter.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Demeter.binka deleted file mode 100644 index a367f0ee..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Demeter.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/GameRules.grf b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/GameRules.grf deleted file mode 100644 index 018f9b5f..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/GameRules.grf and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hades_Persephone.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hades_Persephone.binka deleted file mode 100644 index 50040a51..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hades_Persephone.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hephaestus.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hephaestus.binka deleted file mode 100644 index 0e130192..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hephaestus.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hermes.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hermes.binka deleted file mode 100644 index 1479fa8a..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hermes.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hestia.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hestia.binka deleted file mode 100644 index f00f4565..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Hestia.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Mythology.mcs b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Mythology.mcs deleted file mode 100644 index 10e90702..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Mythology.mcs and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Poseidon.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Poseidon.binka deleted file mode 100644 index 5a4c9385..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Poseidon.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/SongOfSeikilos.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/SongOfSeikilos.binka deleted file mode 100644 index 95267e23..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/SongOfSeikilos.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Zeus_Hera.binka b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Zeus_Hera.binka deleted file mode 100644 index b0ca86b4..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Zeus_Hera.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/media.arc b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/media.arc deleted file mode 100644 index 2b0a4f93..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/media.arc and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/x32Data.pck b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/x32Data.pck deleted file mode 100644 index 078faa52..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/x32Data.pck and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/TexturePack.pck b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/TexturePack.pck deleted file mode 100644 index 2563651a..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/TexturePack.pck and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/GameRules.grf b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/GameRules.grf deleted file mode 100644 index 52c8812b..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/GameRules.grf and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/Halloween.mcs b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/Halloween.mcs deleted file mode 100644 index fb45fa38..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/Halloween.mcs and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/h1.binka b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/h1.binka deleted file mode 100644 index 0279502b..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/h1.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/h2.binka b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/h2.binka deleted file mode 100644 index 8644737d..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/h2.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/h3.binka b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/h3.binka deleted file mode 100644 index 6b7f73b9..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/h3.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/hN1.binka b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/hN1.binka deleted file mode 100644 index e6459f1d..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/hN1.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/hN2.binka b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/hN2.binka deleted file mode 100644 index 7939326f..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/hN2.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/hmenu.binka b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/hmenu.binka deleted file mode 100644 index ad2a37a9..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/hmenu.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/htheend.binka b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/htheend.binka deleted file mode 100644 index 3d03539e..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/htheend.binka and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/media.arc b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/media.arc deleted file mode 100644 index dd51f28a..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/media.arc and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/x16Data.pck b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/x16Data.pck deleted file mode 100644 index 55bf5d68..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/x16Data.pck and /dev/null differ diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/TexturePack.pck b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/TexturePack.pck deleted file mode 100644 index 5fc445c1..00000000 Binary files a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/TexturePack.pck and /dev/null differ diff --git a/Minecraft.World/FishingHelper.cpp b/Minecraft.World/FishingHelper.cpp index b9903c9b..052670c7 100644 --- a/Minecraft.World/FishingHelper.cpp +++ b/Minecraft.World/FishingHelper.cpp @@ -50,6 +50,7 @@ CatchType FishingHelper::getRandCatchType(int luck, Random* random) CatchTypeWeighedItem* catchTypeWeighedItem = nullptr; catchTypeArray.calcWeights(luck); // Recalculate the weights based on the luck level of the player catchTypeWeighedItem = static_cast(WeighedRandom::getRandomItem(random, catchTypeArray)); + return catchTypeWeighedItem->getType(); } CatchWeighedItem* FishingHelper::getRandCatch(CatchType catchType, Random* random) @@ -75,11 +76,11 @@ std::shared_ptr FishingHelper::handleCatch(CatchWeighedItem* weigh itemInstance->setAuxValue((int) (itemInstance->getMaxDamage() * ((double) random->nextInt(901) + 100.0) / 1000.0)); // 10% to 100% damage } else if (itemInstance->id == Item::fishingRod_Id && catchType == CatchType::TREASURE) { - itemInstance->setAuxValue((int)(itemInstance->getMaxDamage() * ((double)random->nextInt(251) / 1000.0)); // 0% to 25% damage + itemInstance->setAuxValue((int)(itemInstance->getMaxDamage() * ((double)random->nextInt(251) / 1000.0))); // 0% to 25% damage itemInstance = EnchantmentHelper::enchantItem(random, itemInstance, 30); } else if (itemInstance->id == Item::bow_Id) { - itemInstance->setAuxValue((int)(itemInstance->getMaxDamage() * ((double)random->nextInt(251) / 1000.0)); // 0% to 25% damage + itemInstance->setAuxValue((int)(itemInstance->getMaxDamage() * ((double)random->nextInt(251) / 1000.0))); // 0% to 25% damage itemInstance = EnchantmentHelper::enchantItem(random, itemInstance, 30); } else if (itemInstance->id == Item::book_Id) {