feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/Minecraft.World/MobCategory.h b/Minecraft.World/MobCategory.h
index a978c40e..4fe5c826 100644
--- a/Minecraft.World/MobCategory.h
+++ b/Minecraft.World/MobCategory.h
@@ -9,6 +9,7 @@ public:
 	// 4J - putting constants for xbox spawning in one place to tidy things up a bit - all numbers are per level
 	static const int CONSOLE_MONSTERS_HARD_LIMIT = 50;									// Max number of enemies (skeleton, zombie, creeper etc) that the mob spawner will produce
 	static const int CONSOLE_ANIMALS_HARD_LIMIT = 50;									// Max number of animals (cows, sheep, pigs) that the mob spawner will produce	
+	static const int CONSOLE_AMBIENT_HARD_LIMIT = 20;									// Ambient mobs
 
 	static const int MAX_XBOX_CHICKENS = 8;										// Max number of chickens that the mob spawner will produce
 	static const int MAX_XBOX_WOLVES = 8;										// Max number of wolves that the mob spawner will produce
@@ -16,6 +17,7 @@ public:
 	static const int MAX_XBOX_SNOWMEN = 16;										// Max number of snow golems that can be created by placing blocks - 4J-PB increased limit due to player requests
 	static const int MAX_XBOX_IRONGOLEM = 16;									// Max number of iron golems that can be created by placing blocks - 4J-PB increased limit due to player requests
 	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
@@ -30,6 +32,7 @@ public:
 	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;
 
 	/*
 		Maximum animals = 50 + 20 + 20 = 90
@@ -48,6 +51,7 @@ public:
 
 	static MobCategory *monster;
 	static MobCategory *creature;
+	static MobCategory *ambient;
 	static MobCategory *waterCreature;
 	// 4J added extra categories, to break these out of general creatures & give us more control of levels
 	static MobCategory *creature_wolf;
@@ -64,10 +68,11 @@ private:
 	const int m_maxPerLevel;
 	const Material *spawnPositionMaterial;
 	const bool m_isFriendly;
+	const bool m_isPersistent;
 	const bool m_isSingleType; // 4J Added
-	const eINSTANCEOF m_eBase;	// 4J added
+	const eINSTANCEOF m_eBase; // 4J added
 
-	MobCategory(int maxVar, Material *spawnPositionMaterial, bool isFriendly, eINSTANCEOF eBase, bool isSingleType, int maxPerLevel);
+	MobCategory(int maxVar, Material *spawnPositionMaterial, bool isFriendly, bool isPersistent, eINSTANCEOF eBase, bool isSingleType, int maxPerLevel);
 
 public:
 	const type_info getBaseClass();
@@ -77,6 +82,8 @@ public:
 	Material *getSpawnPositionMaterial();
 	bool isFriendly();
 	bool isSingleType();
+	bool isPersistent();
+
 public:
 	static void staticCtor();
 };