Long hair, wood wall, some N3D walls #712

cxong · May 13, 2024 · c769886 · c769886
1 parent 3046c51
commit c769886
Show file tree

Hide file tree

Showing 25 changed files with 56 additions and 33 deletions.
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/characters.json b/data/.wolf3d/N3Ddata.cdogscpn/characters.json
@@ -537,7 +537,7 @@
 	{
 		"Class": "Lady",
 		"PlayerTemplateName": "Naamah",
-		"HairType": "ponytail",
+		"HairType": "long",
 		"Skin": "ffb26aff",
 		"Arms": "ff412aff",
 		"Body": "ff352aff",

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/heer_flag.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/heer_flag.png
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wood_slime.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wood_slime.png
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/yellow_flag.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/yellow_flag.png
diff --git a/...d/N3Ddata.cdogscpn/graphics/heer_flag.txt → ...N3Ddata.cdogscpn/graphics/yellow_flag.txt b/...d/N3Ddata.cdogscpn/graphics/heer_flag.txt → ...N3Ddata.cdogscpn/graphics/yellow_flag.txt
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json b/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json
@@ -256,10 +256,10 @@
       "Flags": ["Inside", "NoWalls"]
     },
     {
-      "Name": "heer_flag",
+      "Name": "yellow_flag",
       "Pic": {
         "Type": "Normal",
-        "Pic": "heer_flag"
+        "Pic": "yellow_flag"
       },
       "Offset": [-7, -11],
       "Health": 0,
@@ -355,6 +355,16 @@
       "Health": 0,
       "Flags": ["Outside", "OnWall"]
     },
+    {
+      "Name": "wood_slime",
+      "Pic": {
+        "Type": "Normal",
+        "Pic": "wood_slime"
+      },
+      "Offset": [-8, -23],
+      "Health": 0,
+      "Flags": ["Outside", "OnWall"]
+    },
     {
       "Name": "hitler_glass",
       "Pic": {

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/missions.json b/data/.wolf3d/N3Ddata.cdogscpn/missions.json
@@ -296,9 +296,9 @@
 			"3": {
 				"Name": "wall",
 				"Type": "Wall",
-				"Style": "cobble",
-				"Mask": "ffffffff",
-				"MaskAlt": "008400ff",
+				"Style": "wood",
+				"Mask": "85521eff",
+				"MaskAlt": "bdbdbdff",
 				"CanWalk": false,
 				"IsOpaque": true,
 				"Shootable": true,
@@ -428,9 +428,9 @@
 			"4": {
 				"Name": "wall",
 				"Type": "Wall",
-				"Style": "cobble",
-				"Mask": "ffffffff",
-				"MaskAlt": "008400ff",
+				"Style": "wood",
+				"Mask": "85521eff",
+				"MaskAlt": "bdbdbdff",
 				"CanWalk": false,
 				"IsOpaque": true,
 				"Shootable": true,
@@ -560,9 +560,9 @@
 			"5": {
 				"Name": "wall",
 				"Type": "Wall",
-				"Style": "cobble",
-				"Mask": "ffffffff",
-				"MaskAlt": "008400ff",
+				"Style": "wood",
+				"Mask": "85521eff",
+				"MaskAlt": "bdbdbdff",
 				"CanWalk": false,
 				"IsOpaque": true,
 				"Shootable": true,
@@ -692,9 +692,9 @@
 			"6": {
 				"Name": "wall",
 				"Type": "Wall",
-				"Style": "cobble",
-				"Mask": "ffffffff",
-				"MaskAlt": "008400ff",
+				"Style": "wood",
+				"Mask": "85521eff",
+				"MaskAlt": "bdbdbdff",
 				"CanWalk": false,
 				"IsOpaque": true,
 				"Shootable": true,
@@ -899,12 +899,6 @@
 			"MapObject": "wall_vent",
 			"Positions": [[9, 10]]
 		},
-		{
-			"MapObject": "heer_flag",
-			"Positions": [[5, 2],
-			[13, 12],
-			[7, 14]]
-		},
 		{
 			"MapObject": "hitler_portrait",
 			"Positions": [[7, 2],
@@ -1140,6 +1134,10 @@
 		{
 			"MapObject": "cage",
 			"Positions": [[25, 7]]
+		},
+		{
+			"MapObject": "wood_slime",
+			"Positions": [[3, 2]]
 		}],
 		"StaticCharacters": [{
 			"Index": 0,

diff --git a/graphics/chars/hairs/long_14x12.png b/graphics/chars/hairs/long_14x12.png
diff --git a/graphics/wall/wood/e.png b/graphics/wall/wood/e.png
diff --git a/graphics/wall/wood/et.png b/graphics/wall/wood/et.png
diff --git a/graphics/wall/wood/h.png b/graphics/wall/wood/h.png
diff --git a/graphics/wall/wood/n.png b/graphics/wall/wood/n.png
diff --git a/graphics/wall/wood/ne.png b/graphics/wall/wood/ne.png
diff --git a/graphics/wall/wood/nt.png b/graphics/wall/wood/nt.png
diff --git a/graphics/wall/wood/nw.png b/graphics/wall/wood/nw.png
diff --git a/graphics/wall/wood/o.png b/graphics/wall/wood/o.png
diff --git a/graphics/wall/wood/s.png b/graphics/wall/wood/s.png
diff --git a/graphics/wall/wood/se.png b/graphics/wall/wood/se.png
diff --git a/graphics/wall/wood/st.png b/graphics/wall/wood/st.png
diff --git a/graphics/wall/wood/sw.png b/graphics/wall/wood/sw.png
diff --git a/graphics/wall/wood/v.png b/graphics/wall/wood/v.png
diff --git a/graphics/wall/wood/w.png b/graphics/wall/wood/w.png
diff --git a/graphics/wall/wood/wt.png b/graphics/wall/wood/wt.png
diff --git a/graphics/wall/wood/x.png b/graphics/wall/wood/x.png
diff --git a/src/cdogs/map_wolf.c b/src/cdogs/map_wolf.c
@@ -1178,25 +1178,40 @@ static void TryLoadWallObject(
 	switch (wall)
 	{
 	case CWWALL_GREY_BRICK_2:
-		switch (spearMission)
+		switch (map->type)
 		{
-		case 3:
-			moName = "wall_light";
+		case CWMAPTYPE_N3D:
+			moName = "wood_slime";
+			break;
+		default:
+			switch (spearMission)
+			{
+			case 3:
+				moName = "wall_light";
+				break;
+			}
 			break;
 		}
 		break;
 	case CWWALL_GREY_BRICK_FLAG:
-		switch (spearMission)
+		switch (map->type)
 		{
-		case 1:
-			moName = "heer_flag";
-			break;
-		case 2:
-			moName = "wall_light";
-			break;
-		case 3:
-			moName = "wall_light";
+		case CWMAPTYPE_N3D:
+			moName = "wood_slime";
 			break;
+		default:
+			switch (spearMission)
+			{
+			case 1:
+				moName = "heer_flag";
+				break;
+			case 2:
+				moName = "wall_light";
+				break;
+			case 3:
+				moName = "wall_light";
+				break;
+			}
 		}
 		break;
 	case CWWALL_GREY_BRICK_HITLER: