mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-30 08:26:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1674 from TwilitRealm/poecount

Browse Source 
map poe counter option
This commit is contained in:
TakaRikka
2026-05-21 00:06:04 -07:00
committed by GitHub
parent 716a2b4020 0cb93a2a9f
commit f7a5d88dfd
11 changed files with 238 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_menu_dmap.h
+5
View File
@@ -183,6 +183,11 @@ public:
/* 0xDD8 */ u8 field_0xdd8;
/* 0xDD9 */ u8 field_0xdd9;
/* 0xDDA */ u8 field_0xdda;
#if TARGET_PC
J2DTextBox* mpPoeCountPane;
J2DPicture* mpPoeCountIcon;
#endif
};
class dMenu_Dmap_c {
include/d/d_menu_fmap2D.h
+6
View File
@@ -421,6 +421,12 @@ public:
/* 0xC2 */ u8 mAlphaButtonZ;
/* 0xC3 */ u8 mAlphaAnalogStick;
/* 0xC4 */ u8 mAlphaDpad;
#if TARGET_PC
J2DTextBox* mpPoeCountPane;
J2DPicture* mpPoeCountIcon;
u8 mSelectRegionNo;
#endif
};
#endif /* D_MENU_D_MENU_FMAP2D_H */
include/d/d_menu_map_common.h
+5
View File
@@ -76,6 +76,11 @@ public:
}
#endif
#if TARGET_PC
static void getDmapPoeCount(const std::string& stageName, int& nowCount, int& totalCount);
static void getFmapPoeCount(const int regionNo, int& nowCount, int& totalCount);
#endif
struct Stage_c {
// Incomplete class
include/dusk/settings.h
+1
View File
@@ -145,6 +145,7 @@ struct UserSettings {
ConfigVar<bool> instantText;
ConfigVar<bool> sunsSong;
ConfigVar<bool> autoSave;
ConfigVar<bool> enhancedMapMenus;
// Preferences
ConfigVar<bool> enableMirrorMode;
src/d/d_menu_dmap.cpp
+47
View File
@@ -135,6 +135,16 @@ dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* i_heap, STControl* i_stick) {
memset(&field_0xd80, 0, 20);
buttonIconScreenInit();
field_0xdd0 = 0;
#if TARGET_PC
mpPoeCountIcon = JKR_NEW J2DPicture((ResTIMG*)JKRGetNameResource("ni_item_icon_pou.bti", dComIfGp_getItemIconArchive()));
mpPoeCountPane = JKR_NEW J2DTextBox();
if (mpPoeCountPane != nullptr) {
mpPoeCountPane->setFontSize(15.0f, 15.0f);
mpPoeCountPane->setFont(mDoExt_getMesgFont());
}
#endif
}
void dMenu_DmapBg_c::mapScreenInit() {
@@ -762,6 +772,14 @@ dMenu_DmapBg_c::~dMenu_DmapBg_c() {
mDoExt_destroyExpHeap(mpTalkHeap);
mpTalkHeap = NULL;
}
#if TARGET_PC
JKR_DELETE(mpPoeCountIcon);
mpPoeCountIcon = NULL;
JKR_DELETE(mpPoeCountPane);
mpPoeCountPane = NULL;
#endif
}
void dMenu_DmapBg_c::setAllAlphaRate(f32 i_rate, bool param_2) {
@@ -1014,6 +1032,35 @@ void dMenu_DmapBg_c::draw() {
}
mButtonScreen->draw(field_0xd94, field_0xd98, grafContext);
#if TARGET_PC
if (dusk::getSettings().game.enhancedMapMenus) {
int nowPoeCount = 0;
int totalPoeCount = 0;
dMenuMapCommon_c::getDmapPoeCount(dComIfGp_getStartStageName(), nowPoeCount, totalPoeCount);
if (dComIfGs_isEventBit(dSv_event_flag_c::F_0456) && totalPoeCount > 0) {
const f32 x = field_0xd94 + mDoGph_gInf_c::ScaleHUDXLeft(80.0f);
const f32 y = 410.0f;
constexpr f32 iconsize = 48.0f * 0.8f;
if (mpPoeCountIcon != nullptr)
mpPoeCountIcon->draw(x - 35.0f, y - 25.0f, iconsize, iconsize, false, false, false);
char counter_text[6];
snprintf(counter_text, sizeof(counter_text), "%d/%d", nowPoeCount, totalPoeCount);
mpPoeCountPane->setString(counter_text);
mpPoeCountPane->setCharColor(0x000000FF);
mpPoeCountPane->setGradColor(0x000000FF);
mpPoeCountPane->draw(x + 1, y + 1, FB_WIDTH, HBIND_LEFT);
mpPoeCountPane->setCharColor(0xC8C8C8FF);
mpPoeCountPane->setGradColor(0xC8C8C8FF);
mpPoeCountPane->draw(x, y, FB_WIDTH, HBIND_LEFT);
}
}
#endif
grafContext->scissor(scissor_left, scissor_top, scissor_width, scissor_height);
grafContext->setScissor();
grafContext->setup2D();
src/d/d_menu_fmap.cpp
+10
View File
@@ -525,6 +525,16 @@ void dMenu_Fmap_c::_move() {
}
mpDraw2DBack->setSpotTextureFadeAlpha(mSpotTextureFadeAlpha);
}
#if TARGET_PC
u8 region = mpDraw2DBack->getSelectRegion();
if (region != 0xFF && mpDraw2DBack->isShowRegion(region)) {
mpDraw2DTop->mSelectRegionNo = region;
} else {
mpDraw2DTop->mSelectRegionNo = 0xFF;
}
#endif
}
void dMenu_Fmap_c::_draw() {
src/d/d_menu_fmap2D.cpp
+49
View File
@@ -2482,6 +2482,18 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
set3DStickString(0x524);
#endif
#if TARGET_PC
mpPoeCountIcon = JKR_NEW J2DPicture((ResTIMG*)JKRGetNameResource("ni_item_icon_pou.bti", dComIfGp_getItemIconArchive()));
mpPoeCountPane = JKR_NEW J2DTextBox();
if (mpPoeCountPane != nullptr) {
mpPoeCountPane->setFontSize(15.0f, 15.0f);
mpPoeCountPane->setFont(mDoExt_getMesgFont());
}
mSelectRegionNo = 0xFF;
#endif
setHIO(true);
}
@@ -2540,6 +2552,14 @@ dMenu_Fmap2DTop_c::~dMenu_Fmap2DTop_c() {
}
JKR_DELETE(mpAnm);
mpAnm = NULL;
#if TARGET_PC
JKR_DELETE(mpPoeCountIcon);
mpPoeCountIcon = NULL;
JKR_DELETE(mpPoeCountPane);
mpPoeCountPane = NULL;
#endif
}
void dMenu_Fmap2DTop_c::_execute() {
@@ -2636,6 +2656,35 @@ void dMenu_Fmap2DTop_c::draw() {
ctx->scissor(mTransX, 0.0f, FB_WIDTH, FB_HEIGHT);
ctx->setScissor();
mpTitleScreen->draw(mTransX, mTransY, ctx);
#if TARGET_PC
if (dusk::getSettings().game.enhancedMapMenus) {
int nowPoeCount = 0;
int totalPoeCount = 0;
dMenuMapCommon_c::getFmapPoeCount(mSelectRegionNo, nowPoeCount, totalPoeCount);
if (dComIfGs_isEventBit(dSv_event_flag_c::F_0456) && totalPoeCount > 0) {
const f32 x = mTransX + mDoGph_gInf_c::ScaleHUDXRight(485.0f);
const f32 y = 380.0f;
constexpr f32 iconsize = 48.0f * 0.8f;
if (mpPoeCountIcon != nullptr)
mpPoeCountIcon->draw(x - 35.0f, y - 25.0f, iconsize, iconsize, false, false, false);
char counter_text[6];
snprintf(counter_text, sizeof(counter_text), "%d/%d", nowPoeCount, totalPoeCount);
mpPoeCountPane->setString(counter_text);
mpPoeCountPane->setCharColor(0x000000FF);
mpPoeCountPane->setGradColor(0x000000FF);
mpPoeCountPane->draw(x + 1, y + 1, FB_WIDTH, HBIND_LEFT);
mpPoeCountPane->setCharColor(0xC8C8C8FF);
mpPoeCountPane->setGradColor(0xC8C8C8FF);
mpPoeCountPane->draw(x, y, FB_WIDTH, HBIND_LEFT);
}
}
#endif
ctx->scissor(scissor_left, scissor_top, scissor_width, scissor_height);
ctx->setScissor();
if (mpScrnExplain) {
src/d/d_menu_map_common.cpp
+110
View File
@@ -747,3 +747,113 @@ void dMenuMapCommon_c::debugIcon() {
setIconInfo(ICON_LV8_WARP_e, pos_x, pos_y, 0.0f, scale, 1.0f, 1);
}
}
#if TARGET_PC
static constexpr struct {
std::string stagename;
u8 switch_no;
s8 region_id;
u8 save_id;
} l_poeInfo[] = {
// Dungeons
{"D_MN06", 0x19, -1, 0x15},
{"D_MN06", 0x18, -1, 0x15},
{"D_MN07", 0x54, -1, 0x16},
{"D_MN07", 0x55, -1, 0x16},
{"D_MN10", 0x1E, -1, 0x13},
{"D_MN10", 0x1F, -1, 0x13},
{"D_MN10", 0x20, -1, 0x13},
{"D_MN10", 0x21, -1, 0x13},
{"D_MN11", 0x72, -1, 0x14},
{"D_MN11", 0x15, -1, 0x14},
{"D_MN11", 0x7F, -1, 0x14},
// Sub-Dungeons
{"D_SB01", 0x45, 4, 0x19},
{"D_SB01", 0x46, 4, 0x19},
{"D_SB01", 0x47, 4, 0x19},
{"D_SB02", 0x60, 2, 0x19},
{"D_SB03", 0x5E, 3, 0x1A},
{"D_SB03", 0x5F, 3, 0x1A},
{"D_SB03", 0x5D, 3, 0x1A},
{"D_SB05", 0xA, 3, 0x1B},
{"D_SB05", 0xB, 3, 0x1B},
{"D_SB07", 0xF, 4, 0x1B},
{"D_SB07", 0x10, 4, 0x1B},
// Field Spots
{"F_SP108", 0x5D, 1, 0x2},
{"F_SP109", 0x5E, 2, 0x3},
{"F_SP109", 0x5F, 2, 0x3},
{"F_SP110", 0x59, 2, 0x3},
{"F_SP111", 0x57, 2, 0x3},
{"F_SP111", 0x58, 2, 0x3},
{"F_SP113", 0x49, 3, 0x4},
{"F_SP113", 0x4A, 3, 0x4},
{"F_SP114", 0x7C, 5, 0x8},
{"F_SP114", 0x7D, 5, 0x8},
{"F_SP114", 0x7B, 5, 0x8},
{"F_SP114", 0x7E, 5, 0x8},
{"F_SP114", 0x7F, 5, 0x8},
{"F_SP115", 0x46, 3, 0x4},
{"F_SP115", 0x47, 3, 0x4},
{"F_SP115", 0x4B, 3, 0x4},
{"F_SP115", 0x4C, 3, 0x4},
{"F_SP115", 0x4D, 3, 0x4},
{"F_SP117", 0xF, 1, 0x7},
{"F_SP117", 0x1E, 1, 0x7},
{"F_SP117", 0x10, 1, 0x7},
{"F_SP117", 0x11, 1, 0x7},
{"F_SP118", 0x78, 4, 0xA},
{"F_SP118", 0x5A, 4, 0xA},
{"F_SP121", 0x3A, 2, 0x6},
{"F_SP121", 0x39, 1, 0x6},
{"F_SP121", 0x33, 3, 0x6},
{"F_SP121", 0x3B, 3, 0x6},
{"F_SP122", 0x49, 3, 0x6},
{"F_SP122", 0x30, 3, 0x6},
{"F_SP122", 0x47, 3, 0x6},
{"F_SP124", 0x5B, 4, 0xA},
{"F_SP124", 0x5C, 4, 0xA},
{"F_SP124", 0x5D, 4, 0xA},
{"F_SP124", 0x33, 4, 0xA},
{"F_SP126", 0x48, 3, 0x4},
{"F_SP128", 0x40, 2, 0x3},
{"R_SP160", 0x1F, 3, 0x9},
};
void dMenuMapCommon_c::getDmapPoeCount(const std::string& stageName, int& nowCount, int& totalCount) {
nowCount = 0;
totalCount = 0;
for (const auto& i : l_poeInfo) {
if (stageName == i.stagename) {
if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == i.save_id) {
nowCount += dComIfGs_isSwitch(i.switch_no, -1);
} else {
nowCount += dComIfGs_isSaveSwitch(i.save_id, i.switch_no);
}
totalCount++;
}
}
}
void dMenuMapCommon_c::getFmapPoeCount(const int regionNo, int& nowCount, int& totalCount) {
nowCount = 0;
totalCount = 0;
if (regionNo < 0)
return;
for (const auto& i : l_poeInfo) {
if (regionNo == i.region_id) {
if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == i.save_id) {
nowCount += dComIfGs_isSwitch(i.switch_no, -1);
} else {
nowCount += dComIfGs_isSaveSwitch(i.save_id, i.switch_no);
}
totalCount++;
}
}
}
#endif
src/dusk/settings.cpp
+2
View File
@@ -45,6 +45,7 @@ UserSettings g_userSettings = {
.instantText {"game.instantText", false},
.sunsSong {"game.sunsSong", false},
.autoSave {"game.autoSave", false},
.enhancedMapMenus {"game.enhancedMapMenus", false},
// Preferences
.enableMirrorMode {"game.enableMirrorMode", false},
@@ -212,6 +213,7 @@ void registerSettings() {
Register(g_userSettings.game.instantText);
Register(g_userSettings.game.sunsSong);
Register(g_userSettings.game.autoSave);
Register(g_userSettings.game.enhancedMapMenus);
Register(g_userSettings.game.enableMirrorMode);
Register(g_userSettings.game.invertCameraXAxis);
Register(g_userSettings.game.invertCameraYAxis);
src/dusk/ui/preset.cpp
+1
View File
@@ -49,6 +49,7 @@ void applyPresetDusk() {
s.game.enableGyroAim.setValue(true);
s.game.autoSave.setValue(true);
s.game.menuScalingMode.setValue(MenuScaling::Dusklight);
s.game.enhancedMapMenus.setValue(true);
}
} // namespace
src/dusk/ui/settings.cpp
+2
View File
@@ -1167,6 +1167,8 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) {
"Link will not recoil when his sword hits walls.");
addOption("No 2nd Fish for Cat", getSettings().game.no2ndFishForCat,
"Skip needing to catch a second fish for Sera's cat.");
addOption("Show Poe Count on Map", getSettings().game.enhancedMapMenus,
"Displays collected/total number of Poe Souls for a region on the map.");
addSpeedrunDisabledOption("Sun's Song (R+X)", getSettings().game.sunsSong,
"Allows Wolf Link to howl and change the time of day.");
addOption("Quick Transform (R+Y)", getSettings().game.enableQuickTransform,