Skip to content

[WIP] Add trigger explain button #1313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jamiras merged 18 commits into from
May 19, 2026
Merged

[WIP] Add trigger explain button #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c356f28
move MemSize and related functions to ra::data::Memory static class
Jamiras Dec 27, 2025
5daba10
remove underscores from Memory::Sizes
Jamiras Dec 27, 2025
e38a42d
add TriggerSummaryViewModel
Jamiras Dec 30, 2025
97b247f
add delta self logic
Jamiras Dec 30, 2025
faa24d4
add changed logic
Jamiras Dec 30, 2025
8f7400a
merge indices when merging conditions
Jamiras Dec 30, 2025
08bfc69
Merge branch 'master' into feature/trigger_summary
Jamiras Jan 6, 2026
a255ee1
add trigger summary dialog
Jamiras Jan 6, 2026
b50d924
update operation for delta/prior
Jamiras Jan 6, 2026
f804cff
add AddHeaders function
Jamiras Jan 6, 2026
65a2ed6
handle change to/from specific values
Jamiras Jan 7, 2026
6616f88
fix issue where entire note is enum
Jamiras Jan 7, 2026
57d73e4
Merge branch 'master' into feature/trigger_summary
Jamiras May 2, 2026
71c92e7
add colors specific to explain dialog
Jamiras May 2, 2026
d1b26ad
hide button in release build
Jamiras May 2, 2026
3fff4c4
Merge branch 'master' into feature/trigger_summary
Jamiras May 4, 2026
42a4cc8
address analysis warnings
Jamiras May 4, 2026
b6b2dc8
address analysis warnings
Jamiras May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/RA_Integration.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
<ClCompile Include="ui\viewmodels\ScoreboardViewModel.cpp" />
<ClCompile Include="ui\viewmodels\ScoreTrackerViewModel.cpp" />
<ClCompile Include="ui\viewmodels\TriggerConditionViewModel.cpp" />
<ClCompile Include="ui\viewmodels\TriggerSummaryViewModel.cpp" />
<ClCompile Include="ui\viewmodels\TriggerViewModel.cpp" />
<ClCompile Include="ui\viewmodels\UnknownGameViewModel.cpp" />
<ClCompile Include="ui\win32\AssetEditorDialog.cpp" />
Expand Down Expand Up @@ -188,6 +189,7 @@
<ClCompile Include="ui\win32\PointerInspectorDialog.cpp" />
<ClCompile Include="ui\win32\ProgressDialog.cpp" />
<ClCompile Include="ui\win32\RichPresenceDialog.cpp" />
<ClCompile Include="ui\win32\TriggerSummaryDialog.cpp" />
<ClCompile Include="ui\win32\UnknownGameDialog.cpp" />
<ClCompile Include="ui\WindowViewModelBase.cpp" />
<ClInclude Include="..\RAInterface\RA_Consoles.h" />
Expand Down Expand Up @@ -333,6 +335,7 @@
<ClInclude Include="ui\viewmodels\ScoreboardViewModel.hh" />
<ClInclude Include="ui\viewmodels\ScoreTrackerViewModel.hh" />
<ClInclude Include="ui\viewmodels\TriggerConditionViewModel.hh" />
<ClInclude Include="ui\viewmodels\TriggerSummaryViewModel.hh" />
<ClInclude Include="ui\viewmodels\TriggerViewModel.hh" />
<ClInclude Include="ui\viewmodels\UnknownGameViewModel.hh" />
<ClInclude Include="ui\viewmodels\WindowManager.hh" />
Expand Down Expand Up @@ -379,6 +382,7 @@
<ClInclude Include="ui\win32\ProgressDialog.hh" />
<ClInclude Include="ui\win32\RichPresenceDialog.hh" />
<ClInclude Include="ui\win32\IDialogPresenter.hh" />
<ClInclude Include="ui\win32\TriggerSummaryDialog.hh" />
<ClInclude Include="ui\win32\UnknownGameDialog.hh" />
<ClInclude Include="ui\WindowViewModelBase.hh" />
<ClInclude Include="windows_nodefines.h" />
Expand Down
12 changes: 12 additions & 0 deletions src/RA_Integration.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,12 @@
<ClCompile Include="services\impl\WindowsDebuggerDetector.cpp">
<Filter>Services\Impl</Filter>
</ClCompile>
<ClCompile Include="ui\viewmodels\TriggerSummaryViewModel.cpp">
<Filter>UI\ViewModels</Filter>
</ClCompile>
<ClCompile Include="ui\win32\TriggerSummaryDialog.cpp">
<Filter>UI\Win32</Filter>
</ClCompile>
<ClCompile Include="data\models\RichPresenceModel.cpp">
<Filter>Data\Models</Filter>
</ClCompile>
Expand Down Expand Up @@ -974,6 +980,12 @@
<ClInclude Include="services\impl\WindowsDebuggerDetector.hh">
<Filter>Services\Impl</Filter>
</ClInclude>
<ClInclude Include="ui\viewmodels\TriggerSummaryViewModel.hh">
<Filter>UI\ViewModels</Filter>
</ClInclude>
<ClInclude Include="ui\win32\TriggerSummaryDialog.hh">
<Filter>UI\Win32</Filter>
</ClInclude>
<ClInclude Include="data\models\RichPresenceModel.hh">
<Filter>Data\Models</Filter>
</ClInclude>
Expand Down
4 changes: 3 additions & 1 deletion src/RA_Resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
#define IDC_RA_LBX_REGIONS 1248
#define IDC_RA_ADD_REGION 1249
#define IDC_RA_REMOVE_REGION 1250
#define IDC_RA_VIEW_DETAIL 1251


#define IDD_RA_MEMORY 1501
Expand All @@ -170,6 +171,7 @@
#define IDD_RA_POINTERFINDER 1514
#define IDD_RA_POINTERINSPECTOR 1515
#define IDD_RA_MEMORYREGIONS 1516
#define IDD_RA_TRIGGERSUMMARY 1517
#define IDC_RA_PASSWORD 1535
#define IDC_RA_SAVEPASSWORD 1536
#define IDC_RA_USERNAME 1549
Expand Down Expand Up @@ -224,7 +226,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 122
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1251
#define _APS_NEXT_CONTROL_VALUE 1252
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
10 changes: 10 additions & 0 deletions src/RA_Shared.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ BEGIN
LTEXT "Requirements:",IDC_STATIC,50,55,48,8
ICON "",IDC_RA_ERROR_INDICATOR,98,53,13,13,SS_NOTIFY | SS_CENTERIMAGE
CONTROL "",IDC_RA_LBX_CONDITIONS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,50,66,391,109
PUSHBUTTON "Explain",IDC_RA_VIEW_DETAIL,207,53,44,13
CONTROL "Highlights",IDC_RA_CHK_HIGHLIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,257,53,45,13
CONTROL "Pause on Reset",IDC_RA_CHK_PAUSE_ON_RESET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,307,53,65,13
CONTROL "Pause on Trigger",IDC_RA_CHK_PAUSE_ON_TRIGGER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,376,53,65,13
Expand All @@ -166,6 +167,15 @@ BEGIN
CONTROL "Show Decimal",IDC_RA_CHK_SHOW_DECIMALS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,383,179,54,10
END

IDD_RA_TRIGGERSUMMARY DIALOGEX 0, 0, 480, 240
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
CAPTION "Trigger Summary"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
CONTROL "",IDC_RA_LBX_CONDITIONS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_CLIPCHILDREN | WS_BORDER,4,4,472,216
PUSHBUTTON "OK",IDOK,426,223,50,14
END

IDD_RA_GAMETITLESEL DIALOGEX 0, 0, 249, 156
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW
Expand Down
2 changes: 1 addition & 1 deletion src/devkit/data/ModelPropertyContainer.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ModelPropertyContainer
public:
GSL_SUPPRESS_F6 ModelPropertyContainer() = default;

#ifdef DEBUG
#ifndef NDEBUG
virtual ~ModelPropertyContainer() noexcept {
m_bDestructed = true;
}
Expand Down
18 changes: 18 additions & 0 deletions src/ui/EditorTheme.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ public:
Color ColorTriggerResetTrue() const noexcept { return m_colorTriggerResetTrue; }
Color ColorTriggerPauseTrue() const noexcept { return m_colorTriggerPauseTrue; }

// ===== explain =====

Color ColorExplainConflicting() const noexcept { return m_colorExplainConflicting; }
Color ColorExplainTriggerWhen() const noexcept { return m_colorExplainTriggerWhen; }
Color ColorExplainWhile() const noexcept { return m_colorExplainWhile; }
Color ColorExplainUnless() const noexcept { return m_colorExplainUnless; }
Color ColorExplainStartingWhen() const noexcept { return m_colorExplainStartingWhen; }
Color ColorExplainFailingWhen() const noexcept { return m_colorExplainFailingWhen; }
Color ColorExplainImpotent() const noexcept { return m_colorExplainImpotent; }

// ===== methods =====

void LoadFromFile();
Expand Down Expand Up @@ -76,6 +86,14 @@ private:
Color m_colorTriggerBecomingTrue{ 255, 192, 255, 255 };
Color m_colorTriggerResetTrue{ 255, 255, 255, 192 };
Color m_colorTriggerPauseTrue{ 255, 255, 192, 192 };

Color m_colorExplainConflicting{ 255, 255, 192, 192 }; // red
Color m_colorExplainTriggerWhen{ 255, 192, 255, 192 }; // green
Color m_colorExplainWhile{ 255, 192, 192, 255 }; // blue
Color m_colorExplainUnless{ 255, 255, 192, 100 }; // orange
Color m_colorExplainStartingWhen{ 255, 255, 232, 128 }; // yellow
Color m_colorExplainFailingWhen{ 255, 255, 192, 192 }; // red
Color m_colorExplainImpotent{ 255, 192, 192, 192 }; // gray
};

} // namespace ui
Expand Down
Loading
Loading