From 4c03cd306edec1b3be026b5a7089f9fed13a8a84 Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 1 May 2024 00:48:01 +0100 Subject: [PATCH] Give Prison Egg CDs more frequently (every 15, rather than every 30) Sets a cap to the value loaded from gamedata, too --- src/g_gamedata.cpp | 5 +++++ src/m_cond.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/g_gamedata.cpp b/src/g_gamedata.cpp index bd2939c75..a2f60b92d 100644 --- a/src/g_gamedata.cpp +++ b/src/g_gamedata.cpp @@ -493,7 +493,12 @@ void srb2::load_ng_gamedata() gamedata->tutorialdone = js.milestones.tutorialdone; gamedata->gonerlevel = js.milestones.gonerlevel; gamedata->thisprisoneggpickup = js.prisons.thisprisoneggpickup; + gamedata->prisoneggstothispickup = js.prisons.prisoneggstothispickup; + if (gamedata->prisoneggstothispickup > GDINIT_PRISONSTOPRIZE) + { + gamedata->prisoneggstothispickup = GDINIT_PRISONSTOPRIZE; + } size_t emblems_size = js.emblems.size(); for (size_t i = 0; i < std::min((size_t)MAXEMBLEMS, emblems_size); i++) diff --git a/src/m_cond.h b/src/m_cond.h index b9197f3f0..eccd88f5f 100644 --- a/src/m_cond.h +++ b/src/m_cond.h @@ -302,7 +302,7 @@ typedef enum { #define GDCONVERT_ROUNDSTOKEY 5 #define GDINIT_CHAOKEYS 10 // Start with 10 Chao Keys !! -#define GDINIT_PRISONSTOPRIZE 30 // 30 Prison Eggs to your [Wild Prize] !! +#define GDINIT_PRISONSTOPRIZE 15 // 15 Prison Eggs to your [Wild Prize] !! typedef enum { GDGONER_INIT = 0,