thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'more-keys' into 'master'

Browse source 
Make chao keys easier

See merge request KartKrew/Kart!2310
This commit is contained in:
Sal 2024-04-26 20:16:05 +00:00
commit 23bcddca7f
2 changed files with 43 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/g_gamedata.cpp
View file

@ -28,6 +28,9 @@
namespace fs = std::filesystem; namespace fs = std::filesystem;
using json = nlohmann::json; using json = nlohmann::json;
#define GD_VERSION_MAJOR (0xBA5ED321)
#define GD_VERSION_MINOR (1)
void srb2::save_ng_gamedata() void srb2::save_ng_gamedata()
{ {
if (gamedata == NULL || !gamedata->loaded) if (gamedata == NULL || !gamedata->loaded)
@ -294,8 +297,8 @@ void srb2::save_ng_gamedata()
srb2::io::BufferedOutputStream<srb2::io::FileStream> bos {std::move(file)}; srb2::io::BufferedOutputStream<srb2::io::FileStream> bos {std::move(file)};
// The header is necessary to validate during loading. // The header is necessary to validate during loading.
srb2::io::write(static_cast<uint32_t>(0xBA5ED321), bos); // major srb2::io::write(static_cast<uint32_t>(GD_VERSION_MAJOR), bos); // major
srb2::io::write(static_cast<uint8_t>(0), bos); // minor/flags srb2::io::write(static_cast<uint8_t>(GD_VERSION_MINOR), bos); // minor/flags
srb2::io::write(static_cast<uint8_t>(gamedata->evercrashed), bos); // dirty (crash recovery) srb2::io::write(static_cast<uint8_t>(gamedata->evercrashed), bos); // dirty (crash recovery)
std::vector<uint8_t> ubjson = json::to_ubjson(ng); std::vector<uint8_t> ubjson = json::to_ubjson(ng);
@ -414,7 +417,7 @@ void srb2::load_ng_gamedata()
return; return;
} }
if (majorversion != 0xBA5ED321) if (majorversion != GD_VERSION_MAJOR)
{ {
const char* gdfolder = G_GameDataFolder(); const char* gdfolder = G_GameDataFolder();
I_Error("Game data is not for Ring Racers v2.0.\nDelete %s (maybe in %s) and try again.", gamedatafilename, gdfolder); I_Error("Game data is not for Ring Racers v2.0.\nDelete %s (maybe in %s) and try again.", gamedatafilename, gdfolder);
@ -829,7 +832,42 @@ void srb2::load_ng_gamedata()
} }
} }
bool converted = false;
UINT32 chao_key_rounds = GDCONVERT_ROUNDSTOKEY;
UINT32 start_keys = GDINIT_CHAOKEYS;
if (minorversion == 0)
{
chao_key_rounds = 14;
start_keys = 3;
}
if (chao_key_rounds != GDCONVERT_ROUNDSTOKEY)
{
// Chao key rounds changed.
// Just reset all round progress, because there is a dumbass
// bug that can cause infinite chao keys from loading.
gamedata->pendingkeyrounds = 0;
gamedata->pendingkeyroundoffset = 0;
gamedata->keyspending = 0;
converted = true;
}
if (GDINIT_CHAOKEYS > start_keys)
{
// Chao key starting amount changed.
// Give some free keys!
gamedata->chaokeys += GDINIT_CHAOKEYS - start_keys;
converted = true;
}
M_FinaliseGameData(); M_FinaliseGameData();
if (converted)
{
CONS_Printf("Gamedata was converted from version %d to version %d\n",
minorversion, GD_VERSION_MINOR);
}
} }
// G_LoadGameData // G_LoadGameData

4
src/m_cond.h
View file

@ -299,9 +299,9 @@ typedef enum {
#define GDMAX_CHAOKEYS 9999 #define GDMAX_CHAOKEYS 9999
#define GDMAX_SEALEDSWAPS 7 #define GDMAX_SEALEDSWAPS 7
#define GDCONVERT_ROUNDSTOKEY 14 #define GDCONVERT_ROUNDSTOKEY 5
#define GDINIT_CHAOKEYS 3 // Start with 3 Chao Keys !! #define GDINIT_CHAOKEYS 10 // Start with 10 Chao Keys !!
#define GDINIT_PRISONSTOPRIZE 30 // 30 Prison Eggs to your [Wild Prize] !! #define GDINIT_PRISONSTOPRIZE 30 // 30 Prison Eggs to your [Wild Prize] !!
typedef enum { typedef enum {