Fix level skips #712

cxong · Jun 1, 2024 · 00d1e9c · 00d1e9c
1 parent 41b9f47
commit 00d1e9c
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 2 deletions.
diff --git a/data/.wolf3d/N3D.cdogscpn/campaign.json b/data/.wolf3d/N3D.cdogscpn/campaign.json
@@ -1,6 +1,6 @@
 {
 	"Version": 16,
-	"Title": "Super 3-D Noah's Ark",
+	"Title": "Super 2D Noah's Ark",
 	"Author": "Wisdom Tree",
 	"Description": "",
 	"Ammo": true,

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/campaign.json b/data/.wolf3d/N3Ddata.cdogscpn/campaign.json
@@ -1,6 +1,6 @@
 {
 	"Version": 16,
-	"Title": "Super 3-D Noah's Ark",
+	"Title": "Super 2D Noah's Ark",
 	"Author": "Wisdom Tree",
 	"Description": "",
 	"Ammo": true,

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/characters.json b/data/.wolf3d/N3Ddata.cdogscpn/characters.json
@@ -533,6 +533,48 @@
 		"probabilityToShoot": 42,
 		"actionDelay": 40
 	},
+	{
+		"Class": "Ogre",
+		"Skin": "00ff00ff",
+		"Arms": "404040ff",
+		"Body": "404040ff",
+		"Legs": "404040ff",
+		"Hair": "000000ff",
+		"Feet": "404040ff",
+		"Facehair": "404040ff",
+		"Hat": "404040ff",
+		"Glasses": "404040ff",
+		"speed": 256,
+		"Gun": "Machine gun",
+		"maxHealth": 40,
+		"excessHealth": 80,
+		"flags": 1024,
+		"probabilityToMove": 50,
+		"probabilityToTrack": 25,
+		"probabilityToShoot": 2,
+		"actionDelay": 15
+	},
+	{
+		"Class": "Ogre",
+		"Skin": "00ff00ff",
+		"Arms": "404040ff",
+		"Body": "404040ff",
+		"Legs": "404040ff",
+		"Hair": "000000ff",
+		"Feet": "404040ff",
+		"Facehair": "404040ff",
+		"Hat": "404040ff",
+		"Glasses": "404040ff",
+		"speed": 256,
+		"Gun": "Machine gun",
+		"maxHealth": 40,
+		"excessHealth": 80,
+		"flags": 1024,
+		"probabilityToMove": 50,
+		"probabilityToTrack": 25,
+		"probabilityToShoot": 2,
+		"actionDelay": 15
+	},
 	{
 		"Class": "Lady",
 		"PlayerTemplateName": "Naamah",

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/pillar.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/pillar.png
diff --git a/src/cdogs/map_wolf.c b/src/cdogs/map_wolf.c
@@ -1448,11 +1448,18 @@ static void TryLoadWallObject(
 					e.Hidden = true;
 					e.Mission = missionIndex + 1;
 					// Check if coming back from secret level
+					// For boss levels, skip the secret level
 					switch (missionIndex)
 					{
+					case 10:
+						e.Mission++;
+						break;
 					case 11:
 						e.Mission = 8;
 						break;
+					case 28:
+						e.Mission++;
+						break;
 					case 29:
 						e.Mission = 26;
 						break;
@@ -1530,6 +1537,7 @@ static void TryLoadWallObject(
 			}
 			break;
 		}
+		break;
 	case CWWALL_RED_BRICK_FLAG:
 		switch (map->type)
 		{
@@ -1686,6 +1694,7 @@ static void TryLoadWallObject(
 			}
 			break;
 		}
+		break;
 	case CWWALL_PURPLE_BLOOD:
 		switch (map->type)
 		{
@@ -2145,6 +2154,7 @@ typedef enum
 	CHAR_PACMAN_GHOST_YELLOW,
 	CHAR_PACMAN_GHOST_ROSE,
 	CHAR_PACMAN_GHOST_BLUE,
+	// 10
 	CHAR_HANS,
 	CHAR_SCHABBS,
 	CHAR_FAKE_HITLER,
@@ -2155,6 +2165,7 @@ typedef enum
 	CHAR_FETTGESICHT,
 	CHAR_TRANS,
 	CHAR_WILHELM,
+	// 20
 	CHAR_UBERMUTANT,
 	CHAR_DEATH_KNIGHT,
 	CHAR_GHOST,