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, 132 insertions, 131 deletions

diff --git a/Minecraft.World/HouseFeature.cpp b/Minecraft.World/HouseFeature.cpp
index f8c5d173..40b4e770 100644
--- a/Minecraft.World/HouseFeature.cpp
+++ b/Minecraft.World/HouseFeature.cpp
@@ -7,187 +7,188 @@
 
 bool HouseFeature::place(Level *level, Random *random, int x, int y, int z)
 {
-    while (y > 0 && !level->getMaterial(x, y - 1, z)->blocksMotion())
-        y--;
+	while (y > 0 && !level->getMaterial(x, y - 1, z)->blocksMotion())
+		y--;
 
 	int w = random->nextInt(7) + 7;
 	int h = 4 + random->nextInt(3) / 2;
 	int d = random->nextInt(7) + 7;
 
-    int x0 = x - w / 2;
-    int y0 = y;
-    int z0 = z - d / 2;
+	int x0 = x - w / 2;
+	int y0 = y;
+	int z0 = z - d / 2;
 
-    int doorSide = random->nextInt(4);
-    if (doorSide < 2) d += 2;
-    else w += 2;
+	int doorSide = random->nextInt(4);
+	if (doorSide < 2) d += 2;
+	else w += 2;
 
-    for (int xx = x0; xx < x0 + w; xx++)
+	for (int xx = x0; xx < x0 + w; xx++)
 	{
-        for (int zz = z0; zz < z0 + d; zz++)
+		for (int zz = z0; zz < z0 + d; zz++)
 		{
-            Material *m = level->getMaterial(xx, y - 1, zz);
-            if (!m->blocksMotion() || m == Material::ice) return false;
-
-            bool ok = false;
-            if (doorSide == 0 && xx < x0 + 2) ok = true;
-            if (doorSide == 1 && xx > x0 + w - 1 - 2) ok = true;
-            if (doorSide == 2 && zz < z0 + 2) ok = true;
-            if (doorSide == 3 && zz > z0 + d - 1 - 2) ok = true;
-            int t = level->getTile(xx, y, zz);
-            if (ok)
+			Material *m = level->getMaterial(xx, y - 1, zz);
+			if (!m->blocksMotion() || m == Material::ice) return false;
+
+			bool ok = false;
+			if (doorSide == 0 && xx < x0 + 2) ok = true;
+			if (doorSide == 1 && xx > x0 + w - 1 - 2) ok = true;
+			if (doorSide == 2 && zz < z0 + 2) ok = true;
+			if (doorSide == 3 && zz > z0 + d - 1 - 2) ok = true;
+			int t = level->getTile(xx, y, zz);
+			if (ok)
 			{
-                if (t != 0) return false;
-            }
+				if (t != 0) return false;
+			}
 			else
 			{
-                if (t == Tile::stoneBrick_Id || t == Tile::mossStone_Id) return false;
+				if (t == Tile::cobblestone_Id || t == Tile::mossyCobblestone_Id) return false;
 			}
 
-        }
-    }
+		}
+	}
 
-    if (doorSide == 0)
+	if (doorSide == 0)
 	{
-        x0++;
-        w--;
-    }
+		x0++;
+		w--;
+	}
 	else if (doorSide == 1)
 	{
-        w--;
-    }
+		w--;
+	}
 	else if (doorSide == 2)
 	{
-        z0++;
-        d--;
-    }
+		z0++;
+		d--;
+	}
 	else if (doorSide == 3)
 	{
-        d--;
-    }
-
-    int xx0 = x0;
-    int xx1 = x0 + w - 1;
-    int zz0 = z0;
-    int zz1 = z0 + d - 1;
-    if (doorSide >= 2)
+		d--;
+	}
+
+	int xx0 = x0;
+	int xx1 = x0 + w - 1;
+	int zz0 = z0;
+	int zz1 = z0 + d - 1;
+	if (doorSide >= 2)
 	{
 		xx0++;
 		xx1--;
-    }
+	}
 	else
 	{
 		zz0++;
 		zz1--;
-    }
-    for (int xx = x0; xx < x0 + w; xx++)
+	}
+	for (int xx = x0; xx < x0 + w; xx++)
 	{
-        for (int zz = z0; zz < z0 + d; zz++)
+		for (int zz = z0; zz < z0 + d; zz++)
 		{
-            int ho = h;
+			int ho = h;
 
-            int d1 = zz - z0;
-            int d2 = (z0 + d - 1) - zz;
-            if (doorSide < 2)
+			int d1 = zz - z0;
+			int d2 = (z0 + d - 1) - zz;
+			if (doorSide < 2)
 			{
-                d1 = xx - x0;
-                d2 = (x0 + w - 1) - xx;
-            }
+				d1 = xx - x0;
+				d2 = (x0 + w - 1) - xx;
+			}
 
-            if (d2 < d1) d1 = d2;
-            h += d1;
-            for (int yy = y0 - 1; yy < y0 + h; yy++)
+			if (d2 < d1) d1 = d2;
+			h += d1;
+			for (int yy = y0 - 1; yy < y0 + h; yy++)
 			{
-                int material = -1;
-                if (yy == y0 + h - 1)
+				int material = -1;
+				if (yy == y0 + h - 1)
 				{
-                    material = Tile::wood_Id;
-                }
+					material = Tile::wood_Id;
+				}
 				else if (xx >= xx0 && xx <= xx1 && zz >= zz0 && zz <= zz1)
 				{
-                    material = 0;
-                    if (yy == y0 - 1 || yy == y0 + h - 1 || xx == xx0 || zz == zz0 || xx == xx1 || zz == zz1)
+					material = 0;
+					if (yy == y0 - 1 || yy == y0 + h - 1 || xx == xx0 || zz == zz0 || xx == xx1 || zz == zz1)
 					{
-                        if (yy <= y0 + random->nextInt(3)) material = Tile::mossStone_Id;
-                        else material = Tile::stoneBrick_Id;
-                    }
-                }
+						if (yy <= y0 + random->nextInt(3)) material = Tile::mossyCobblestone_Id;
+						else material = Tile::cobblestone_Id;
+					}
+				}
 
-                if (material >= 0)
+				if (material >= 0)
 				{
-                    level->setTileNoUpdate(xx, yy, zz, material);
-                }
-            }
-            h = ho;
-        }
-    }
-    {
-        int xx = x0 + random->nextInt(w - 4) + 2;
-        int zz = z0 + random->nextInt(d - 4) + 2;
-        if (doorSide == 0) xx = x0;
-        if (doorSide == 1) xx = x0 + w - 1;
-        if (doorSide == 2) zz = z0;
-        if (doorSide == 3) zz = z0 + d - 1;
-        level->setTileNoUpdate(xx, y0, zz, 0);
-        level->setTileNoUpdate(xx, y0 + 1, zz, 0);
-
-        int dir = 0;
-        if (doorSide == 0) dir = 0;
-        if (doorSide == 2) dir = 1;
-        if (doorSide == 1) dir = 2;
-        if (doorSide == 3) dir = 3;
-
-        DoorItem::place(level, xx, y0, zz, dir, Tile::door_wood);
-    }
-
-    for (int i = 0; i < (w * 2 + d * 2) * 3; i++)
+					level->setTileAndData(xx, yy, zz, material, 0, Tile::UPDATE_CLIENTS);
+				}
+			}
+			h = ho;
+		}
+	}
+	{
+		int xx = x0 + random->nextInt(w - 4) + 2;
+		int zz = z0 + random->nextInt(d - 4) + 2;
+		if (doorSide == 0) xx = x0;
+		if (doorSide == 1) xx = x0 + w - 1;
+		if (doorSide == 2) zz = z0;
+		if (doorSide == 3) zz = z0 + d - 1;
+		level->setTileAndData(xx, y0, zz, 0, 0, Tile::UPDATE_CLIENTS);
+		level->setTileAndData(xx, y0 + 1, zz, 0, 0, Tile::UPDATE_CLIENTS);
+
+		int dir = 0;
+		if (doorSide == 0) dir = 0;
+		if (doorSide == 2) dir = 1;
+		if (doorSide == 1) dir = 2;
+		if (doorSide == 3) dir = 3;
+
+		DoorItem::place(level, xx, y0, zz, dir, Tile::door_wood);
+	}
+
+	for (int i = 0; i < (w * 2 + d * 2) * 3; i++)
 	{
-        int xx = x0 + random->nextInt(w - 4) + 2;
-        int zz = z0 + random->nextInt(d - 4) + 2;
-        int side = random->nextInt(4);
+		int xx = x0 + random->nextInt(w - 4) + 2;
+		int zz = z0 + random->nextInt(d - 4) + 2;
+		int side = random->nextInt(4);
 
-        if (side == 0) xx = xx0;
-        if (side == 1) xx = xx1;
-        if (side == 2) zz = zz0;
-        if (side == 3) zz = zz1;
+		if (side == 0) xx = xx0;
+		if (side == 1) xx = xx1;
+		if (side == 2) zz = zz0;
+		if (side == 3) zz = zz1;
 
-        if (level->isSolidBlockingTile(xx, y0 + 1, zz))
+		if (level->isSolidBlockingTile(xx, y0 + 1, zz))
 		{
-            int count = 0;
-            if (level->isSolidBlockingTile(xx - 1, y0 + 1, zz) && level->isSolidBlockingTile(xx + 1, y0 + 1, zz)) count++;
-            if (level->isSolidBlockingTile(xx, y0 + 1, zz - 1) && level->isSolidBlockingTile(xx, y0 + 1, zz + 1)) count++;
-            if (count == 1) {
-                level->setTileNoUpdate(xx, y0 + 1, zz, Tile::glass_Id);
-            }
-        }
-    }
-
-    int ww = xx1 - xx0;
-    int dd = zz1 - zz0;
-    for (int i = 0; i < (ww * 2 + dd * 2); i++)
+			int count = 0;
+			if (level->isSolidBlockingTile(xx - 1, y0 + 1, zz) && level->isSolidBlockingTile(xx + 1, y0 + 1, zz)) count++;
+			if (level->isSolidBlockingTile(xx, y0 + 1, zz - 1) && level->isSolidBlockingTile(xx, y0 + 1, zz + 1)) count++;
+			if (count == 1)
+			{
+				level->setTileAndData(xx, y0 + 1, zz, Tile::glass_Id, 0, Tile::UPDATE_CLIENTS);
+			}
+		}
+	}
+
+	int ww = xx1 - xx0;
+	int dd = zz1 - zz0;
+	for (int i = 0; i < (ww * 2 + dd * 2); i++)
 	{
-        int xx = xx0 + random->nextInt(ww - 1) + 1;
-        int zz = zz0 + random->nextInt(dd - 1) + 1;
-        int yy = y0;
+		int xx = xx0 + random->nextInt(ww - 1) + 1;
+		int zz = zz0 + random->nextInt(dd - 1) + 1;
+		int yy = y0;
 
-        if (level->getTile(xx, yy + 2, zz) == 0)
+		if (level->getTile(xx, yy + 2, zz) == 0)
 		{
-            int count = 0;
-            if (level->isSolidBlockingTile(xx - 1, yy + 2, zz)) count++;
-            if (level->isSolidBlockingTile(xx + 1, yy + 2, zz)) count++;
-            if (level->isSolidBlockingTile(xx, yy + 2, zz - 1)) count++;
-            if (level->isSolidBlockingTile(xx, yy + 2, zz + 1)) count++;
-            if (count == 1)
+			int count = 0;
+			if (level->isSolidBlockingTile(xx - 1, yy + 2, zz)) count++;
+			if (level->isSolidBlockingTile(xx + 1, yy + 2, zz)) count++;
+			if (level->isSolidBlockingTile(xx, yy + 2, zz - 1)) count++;
+			if (level->isSolidBlockingTile(xx, yy + 2, zz + 1)) count++;
+			if (count == 1)
 			{
-                level->setTileNoUpdate(xx, y0 + 2, zz, Tile::torch_Id);
-            }
-        }
-    }
+				level->setTileAndData(xx, y0 + 2, zz, Tile::torch_Id, 0, Tile::UPDATE_CLIENTS);
+			}
+		}
+	}
 
-    shared_ptr<PigZombie>(pz) = shared_ptr<PigZombie>(new PigZombie(level));
-    pz->moveTo(x0 + w / 2.0 + 0.5, y0 + 0.5, z0 + d / 2.0 + 0.5, 0, 0);
-    level->addEntity(pz);
+	shared_ptr<PigZombie>(pz) = shared_ptr<PigZombie>(new PigZombie(level));
+	pz->moveTo(x0 + w / 2.0 + 0.5, y0 + 0.5, z0 + d / 2.0 + 0.5, 0, 0);
+	level->addEntity(pz);
 
-    return true;
+	return true;
 
 }
\ No newline at end of file