Monkey #712

cxong · May 16, 2024 · 78a059b · 78a059b
1 parent c769886
commit 78a059b
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 24 deletions.
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/character_classes.json b/data/.wolf3d/N3Ddata.cdogscpn/character_classes.json
@@ -101,13 +101,13 @@
       "Sounds": "hitler"
     },
     {
-      "Name": "Otto Giftmacher",
+      "Name": "Monkey",
       "HeadPics": {
         "Type": "Directional",
-        "Sprites": "chars/heads/jones"
+        "Sprites": "chars/heads/monkey"
       },
       "Body": "big_soldier",
-      "Sounds": "otto"
+      "Sounds": "monkey"
     },
     {
       "Name": "Gretel Grosse",

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/characters.json b/data/.wolf3d/N3Ddata.cdogscpn/characters.json
@@ -333,13 +333,12 @@
 		"actionDelay": 40
 	},
 	{
-		"Class": "Otto Giftmacher",
-		"HatType": "peak_cap",
+		"Class": "Monkey",
 		"Skin": "ffbb63ff",
 		"Arms": "ecececff",
 		"Body": "f8f8ffff",
 		"Legs": "fcfcfcff",
-		"Hair": "ffededff",
+		"Hair": "6d410cff",
 		"Feet": "404040ff",
 		"Facehair": "ffededff",
 		"Hat": "ffededff",

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/heads/monkey_12x12.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/heads/monkey_12x12.png
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/hitler_portrait.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/hitler_portrait.png
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/monkey_portrait.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/monkey_portrait.png
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json b/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json
@@ -266,10 +266,10 @@
       "Flags": ["Inside", "OnWall"]
     },
     {
-      "Name": "hitler_portrait",
+      "Name": "monkey_portrait",
       "Pic": {
         "Type": "Normal",
-        "Pic": "hitler_portrait"
+        "Pic": "monkey_portrait"
       },
       "Offset": [-5, -10],
       "Health": 0,

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/missions.json b/data/.wolf3d/N3Ddata.cdogscpn/missions.json
@@ -899,11 +899,6 @@
 			"MapObject": "wall_vent",
 			"Positions": [[9, 10]]
 		},
-		{
-			"MapObject": "hitler_portrait",
-			"Positions": [[7, 2],
-			[5, 4]]
-		},
 		{
 			"MapObject": "brick_eagle",
 			"Positions": [[11, 2]]
@@ -1138,6 +1133,14 @@
 		{
 			"MapObject": "wood_slime",
 			"Positions": [[3, 2]]
+		},
+		{
+			"MapObject": "yellow_flag",
+			"Positions": [[5, 2]]
+		},
+		{
+			"MapObject": "monkey_portrait",
+			"Positions": [[7, 2]]
 		}],
 		"StaticCharacters": [{
 			"Index": 0,

diff --git a/src/cdogs/map_wolf.c b/src/cdogs/map_wolf.c
@@ -1197,7 +1197,7 @@ static void TryLoadWallObject(
 		switch (map->type)
 		{
 		case CWMAPTYPE_N3D:
-			moName = "wood_slime";
+			moName = "yellow_flag";
 			break;
 		default:
 			switch (spearMission)
@@ -1215,13 +1215,21 @@ static void TryLoadWallObject(
 		}
 		break;
 	case CWWALL_GREY_BRICK_HITLER:
-		switch (spearMission)
+		switch (map->type)
 		{
-		case 1:
-			moName = "hitler_portrait";
+		case CWMAPTYPE_N3D:
+			moName = "monkey_portrait";
 			break;
-		case 3:
-			moName = "no_sign";
+		default:
+			switch (spearMission)
+			{
+			case 1:
+				moName = "hitler_portrait";
+				break;
+			case 3:
+				moName = "no_sign";
+				break;
+			}
 			break;
 		}
 		break;
@@ -1295,13 +1303,21 @@ static void TryLoadWallObject(
 		}
 		break;
 	case CWWALL_WOOD_HITLER:
-		switch (spearMission)
+		switch (map->type)
 		{
-		case 1:
-			moName = "hitler_portrait";
+		case CWMAPTYPE_N3D:
+			moName = "monkey_portrait";
 			break;
-		case 3:
-			moName = "wall_light";
+		default:
+			switch (spearMission)
+			{
+			case 1:
+				moName = "hitler_portrait";
+				break;
+			case 3:
+				moName = "wall_light";
+				break;
+			}
 			break;
 		}
 		break;