From e35594040dffa7a995a28e2673dcb3c9f3e63335 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Thu, 9 Jun 2022 09:53:41 +0300 Subject: [PATCH] Add custom karma folder graphics Closes #38 --- src/character_editor.cc | 108 +++++++++++++++++++++++++++++++++++++++- src/character_editor.h | 4 ++ src/sfall_config.h | 2 + 3 files changed, 113 insertions(+), 1 deletion(-) diff --git a/src/character_editor.cc b/src/character_editor.cc index c2c6d46..f1c810c 100644 --- a/src/character_editor.cc +++ b/src/character_editor.cc @@ -23,6 +23,7 @@ #include "platform_compat.h" #include "proto.h" #include "scripts.h" +#include "sfall_config.h" #include "skill.h" #include "stat.h" #include "text_font.h" @@ -36,6 +37,8 @@ #include #include +#include + #define RENDER_ALL_STATS 7 #define EDITOR_WINDOW_WIDTH 640 @@ -581,6 +584,13 @@ unsigned char _free_perk; // 0x570A2A unsigned char _first_skill_list; +struct CustomKarmaFolderDescription { + int frmId; + int threshold; +}; + +static std::vector gCustomKarmaFolderDescriptions; + // 0x431DF8 int _editor_design(bool isCreationMode) { @@ -1078,6 +1088,9 @@ int characterEditorWindowInit() return -1; } + // SFALL: Custom karma folder. + customKarmaFolderInit(); + soundContinueAll(); for (i = 0; i < EDITOR_GRAPHIC_COUNT; i++) { @@ -1637,6 +1650,9 @@ void characterEditorWindowFree() // NOTE: Uninline. karmaFree(); + // SFALL: Custom karma folder. + customKarmaFolderFree(); + messageListFree(&editorMessageList); interfaceBarRefresh(); @@ -5372,7 +5388,8 @@ void editorRenderKarma() } if (!hasSelection) { - _folder_card_fid = 47; + // SFALL: Custom karma folder. + _folder_card_fid = customKarmaFolderGetFrmId(); _folder_card_title = getmsg(&editorMessageList, &editorMessageListItem, 125); _folder_card_title2 = NULL; _folder_card_desc = getmsg(&editorMessageList, &editorMessageListItem, 128); @@ -6851,3 +6868,92 @@ int genericReputationCompare(const void* a1, const void* a2) } return 0; } + +void customKarmaFolderInit() +{ + char* karmaFrms = NULL; + configGetString(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_KARMA_FRMS_KEY, &karmaFrms); + if (karmaFrms != NULL && karmaFrms[0] == '\0') { + karmaFrms = NULL; + } + + if (karmaFrms == NULL) { + return; + } + + char* karmaPoints = NULL; + configGetString(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_KARMA_POINTS_KEY, &karmaPoints); + if (karmaPoints != NULL && karmaPoints[0] == '\0') { + karmaPoints = NULL; + } + + if (karmaPoints == NULL) { + return; + } + + int karmaFrmsCount = 0; + for (char* pch = karmaFrms; pch != NULL; pch = strchr(pch + 1, ',')) { + karmaFrmsCount++; + } + + int karmaPointsCount = 0; + for (char* pch = karmaPoints; pch != NULL; pch = strchr(pch + 1, ',')) { + karmaPointsCount++; + } + + gCustomKarmaFolderDescriptions.resize(karmaFrmsCount); + + for (int index = 0; index < karmaFrmsCount; index++) { + char* pch; + + pch = strchr(karmaFrms, ','); + if (pch != NULL) { + *pch = '\0'; + } + + gCustomKarmaFolderDescriptions[index].frmId = atoi(karmaFrms); + + if (pch != NULL) { + *pch = ','; + } + + karmaFrms = pch + 1; + + if (index < karmaPointsCount) { + pch = strchr(karmaPoints, ','); + if (pch != NULL) { + *pch = '\0'; + } + + gCustomKarmaFolderDescriptions[index].threshold = atoi(karmaPoints); + + if (pch != NULL) { + *pch = ','; + } + + karmaPoints = pch + 1; + } else { + gCustomKarmaFolderDescriptions[index].threshold = INT_MAX; + } + } +} + +void customKarmaFolderFree() +{ + gCustomKarmaFolderDescriptions.clear(); +} + +int customKarmaFolderGetFrmId() +{ + if (gCustomKarmaFolderDescriptions.empty()) { + return 47; + } + + int reputation = gGameGlobalVars[GVAR_PLAYER_REPUTATION]; + for (auto& entry : gCustomKarmaFolderDescriptions) { + if (reputation < entry.threshold) { + return entry.frmId; + } + } + return gCustomKarmaFolderDescriptions.end()->frmId; +} diff --git a/src/character_editor.h b/src/character_editor.h index a562caa..adade09 100644 --- a/src/character_editor.h +++ b/src/character_editor.h @@ -311,4 +311,8 @@ int genericReputationInit(); void genericReputationFree(); int genericReputationCompare(const void* a1, const void* a2); +void customKarmaFolderInit(); +void customKarmaFolderFree(); +int customKarmaFolderGetFrmId(); + #endif /* CHARACTER_EDITOR_H */ diff --git a/src/sfall_config.h b/src/sfall_config.h index 4c576cf..ea5795b 100644 --- a/src/sfall_config.h +++ b/src/sfall_config.h @@ -15,6 +15,8 @@ #define SFALL_CONFIG_MAIN_MENU_FONT_COLOR "MainMenuFontColour" #define SFALL_CONFIG_SKIP_OPENING_MOVIES_KEY "SkipOpeningMovies" #define SFALL_CONFIG_STARTING_MAP_KEY "StartingMap" +#define SFALL_CONFIG_KARMA_FRMS_KEY "KarmaFRMs" +#define SFALL_CONFIG_KARMA_POINTS_KEY "KarmaPoints" #define SFALL_CONFIG_DISPLAY_KARMA_CHANGES_KEY "DisplayKarmaChanges" extern bool gSfallConfigInitialized;