diff --git a/Minecraft.World/MobCategory.h b/Minecraft.World/MobCategory.h index 4fe5c826..47c14ef6 100644 --- a/Minecraft.World/MobCategory.h +++ b/Minecraft.World/MobCategory.h @@ -19,20 +19,20 @@ public: static const int CONSOLE_SQUID_HARD_LIMIT = 5; static const int MAX_CONSOLE_BOSS = 1; // Max number of bosses (enderdragon/wither) - static const int MAX_XBOX_ANIMALS_WITH_BREEDING = CONSOLE_ANIMALS_HARD_LIMIT + 20; // Max number of animals that we can produce (in total), when breeding - static const int MAX_XBOX_CHICKENS_WITH_BREEDING = MAX_XBOX_CHICKENS + 8; // Max number of chickens that we can produce (in total), when breeding/hatching - static const int MAX_XBOX_MUSHROOMCOWS_WITH_BREEDING = MAX_XBOX_MUSHROOMCOWS + 20; // Max number of mushroom cows that we can produce (in total), when breeding - static const int MAX_XBOX_WOLVES_WITH_BREEDING = MAX_XBOX_WOLVES + 8; // Max number of wolves that we can produce (in total), when breeding - static const int MAX_VILLAGERS_WITH_BREEDING = 35; + static constexpr int MAX_XBOX_ANIMALS_WITH_BREEDING = 0; + static constexpr int MAX_XBOX_CHICKENS_WITH_BREEDING = 0; + static constexpr int MAX_XBOX_MUSHROOMCOWS_WITH_BREEDING = 0; + static constexpr int MAX_XBOX_WOLVES_WITH_BREEDING = 0; + static constexpr int MAX_VILLAGERS_WITH_BREEDING = 0; - static const int MAX_XBOX_ANIMALS_WITH_SPAWN_EGG = MAX_XBOX_ANIMALS_WITH_BREEDING + 20; - static const int MAX_XBOX_CHICKENS_WITH_SPAWN_EGG = MAX_XBOX_CHICKENS_WITH_BREEDING + 10; - static const int MAX_XBOX_WOLVES_WITH_SPAWN_EGG = MAX_XBOX_WOLVES_WITH_BREEDING + 10; - static const int MAX_XBOX_MONSTERS_WITH_SPAWN_EGG = CONSOLE_MONSTERS_HARD_LIMIT + 20; - static const int MAX_XBOX_VILLAGERS_WITH_SPAWN_EGG = MAX_VILLAGERS_WITH_BREEDING + 15; // 4J-PB - increased this limit due to player requests - static const int MAX_XBOX_MUSHROOMCOWS_WITH_SPAWN_EGG = MAX_XBOX_MUSHROOMCOWS_WITH_BREEDING + 8; - static const int MAX_XBOX_SQUIDS_WITH_SPAWN_EGG = CONSOLE_SQUID_HARD_LIMIT + 8; - static const int MAX_AMBIENT_WITH_SPAWN_EGG = CONSOLE_AMBIENT_HARD_LIMIT + 8; + static constexpr int MAX_XBOX_ANIMALS_WITH_SPAWN_EGG = 0; + static constexpr int MAX_XBOX_CHICKENS_WITH_SPAWN_EGG = 0; + static constexpr int MAX_XBOX_WOLVES_WITH_SPAWN_EGG = 0; + static constexpr int MAX_XBOX_MONSTERS_WITH_SPAWN_EGG = 0; + static constexpr int MAX_XBOX_VILLAGERS_WITH_SPAWN_EGG = 0; + static constexpr int MAX_XBOX_MUSHROOMCOWS_WITH_SPAWN_EGG = 0; + static constexpr int MAX_XBOX_SQUIDS_WITH_SPAWN_EGG = 0; + static constexpr int MAX_AMBIENT_WITH_SPAWN_EGG = 0; /* Maximum animals = 50 + 20 + 20 = 90