From 536840485b88ea7b2c5c8039d1212d21743176f7 Mon Sep 17 00:00:00 2001 From: toaster Date: Thu, 11 Apr 2024 20:11:25 +0100 Subject: [PATCH] The default Emerald pickup in a Sealed Star is a fake SA2 yellow-gold Chaos Emerald Minimal effort disambiguation for a Sealed Star's Page 2/3 rematch from its Page 1 canon appearance, without also repeating the green Chaos Emerald. --- src/k_podium.cpp | 10 ++++++++-- src/objects/ufo.c | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/k_podium.cpp b/src/k_podium.cpp index 4085092f4..64e812a53 100644 --- a/src/k_podium.cpp +++ b/src/k_podium.cpp @@ -641,12 +641,15 @@ void podiumData_s::Draw(void) if (emeraldNum == 0) { - emeraldPatch = static_cast( W_CachePatchName("K_BLNA", PU_CACHE) ); + // Prize -- todo, currently using fake Emerald + emeraldColor = SKINCOLOR_GOLD; } else { emeraldColor = static_cast( SKINCOLOR_CHAOSEMERALD1 + ((emeraldNum - 1) % 7) ); + } + { std::string emeraldName; if (emeraldNum > 7) { @@ -854,12 +857,15 @@ void podiumData_s::Draw(void) if (emeraldNum == 0) { - emeraldOverlay = static_cast( W_CachePatchName("KBLNC0", PU_CACHE) ); + // Prize -- todo, currently using fake Emerald + emeraldColor = SKINCOLOR_GOLD; } else { emeraldColor = static_cast( SKINCOLOR_CHAOSEMERALD1 + ((emeraldNum - 1) % 7) ); + } + { if (emeraldNum > 7) { emeraldOverlay = static_cast( W_CachePatchName("SEMRA0", PU_CACHE) ); diff --git a/src/objects/ufo.c b/src/objects/ufo.c index be3be399f..dd1e8958e 100644 --- a/src/objects/ufo.c +++ b/src/objects/ufo.c @@ -1244,9 +1244,10 @@ static mobj_t *InitSpecialUFO(waypoint_t *start) } else { - // Prize -- todo, currently using standard Emerald + // Prize -- todo, currently using fake Emerald P_SetMobjState(emerald, S_CHAOSEMERALD1); P_SetMobjState(overlay, S_CHAOSEMERALD_UNDER); + emerald->color = SKINCOLOR_GOLD; } P_SetTarget(&emerald->target, ufo);