Stats test

soh/include/functions.h

@@ -1093,7 +1093,6 @@ void func_80088AA0(s16 seconds);
 void func_80088AF0(PlayState* play);
 void func_80088B34(s16 arg0);
 void Interface_Draw(PlayState* play);
-void Interface_DrawTotalGameplayTimer(PlayState* play);
 void Interface_Update(PlayState* play);
 Path* Path_GetByIndex(PlayState* play, s16 index, s16 max);
 f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw);

soh/include/z64save.h

@@ -86,8 +86,6 @@ typedef struct {
     /*      */ s16 sceneNum;
     /*      */ s8 roomNum;
     /*      */ bool gameComplete;
-    /*      */ u32 itemTimestamp[TIMESTAMP_MAX];
-    /*      */ SceneTimestamp sceneTimestamps[8191];
     /*      */ u32 tsIdx;
     /*      */ u32 count[COUNT_MAX];
     /*      */ u32 entrancesDiscovered[SAVEFILE_ENTRANCES_DISCOVERED_IDX_COUNT];

soh/soh/Enhancements/ExtraTraps.cpp

@@ -188,13 +188,13 @@ void RegisterExtraTraps() {
 
         *should = true;
         gSaveContext.ship.pendingIceTrapCount--;
-        gSaveContext.ship.stats.count[COUNT_ICE_TRAPS]++;
         GameInteractor_ExecuteOnItemReceiveHooks(ItemTable_RetrieveEntry(MOD_RANDOMIZER, RG_ICE_TRAP));
         if (CVAR_EXTRA_TRAPS_VALUE) {
             RollRandomTrap(gPlayState->sceneNum + player->getItemEntry.drawItemId);
         } else {
             GameInteractor::RawAction::FreezePlayer();
         }
+        GameInteractor_ExecuteOnIceTrapReceived(RG_ICE_TRAP, CVAR_EXTRA_TRAPS_VALUE ? roll : 0);
     });
 }
 

soh/soh/Enhancements/GameplayStats/gameplaystats2.h

@@ -0,0 +1,58 @@
+#pragma once
+
+#include "soh/cvar_prefixes.h"
+#include <stdint.h>
+#include <string>
+#include "imgui.h"
+
+extern "C" {
+uint64_t GetUnixTimestamp(void);
+};
+
+// New
+
+typedef enum {
+    TIMESTAMP_DEFEAT_GOHMA = 0xA0,
+    TIMESTAMP_DEFEAT_KING_DODONGO,
+    TIMESTAMP_DEFEAT_BARINADE,
+    TIMESTAMP_DEFEAT_PHANTOM_GANON,
+    TIMESTAMP_DEFEAT_VOLVAGIA,
+    TIMESTAMP_DEFEAT_MORPHA,
+    TIMESTAMP_DEFEAT_BONGO_BONGO,
+    TIMESTAMP_DEFEAT_TWINROVA,
+    TIMESTAMP_DEFEAT_GANONDORF,
+    TIMESTAMP_DEFEAT_GANON,
+    TIMESTAMP_BOSSRUSH_FINISH,
+    TIMESTAMP_TRIFORCE_COMPLETED,
+} GameplayStatTimestamp;
+
+typedef enum {
+    STAT_TYPE_SCENE,
+    STAT_TYPE_ITEM,
+    STAT_TYPE_EVENT,
+    STAT_TYPE_ALL,
+} GameplayStatEntryTypes;
+
+typedef enum {
+    STAT_TYPE_ENEMY = 0x4,
+    STAT_TYPE_PLAYER,
+    STAT_TYPE_COLLECT,
+} GameplaystatCountTypes;
+
+typedef enum {
+    STAT_ACTION_SAVE,
+    STAT_ACTION_LOAD,
+    STAT_ACTION_DELETE,
+} GameplayStatsActions;
+
+typedef struct {
+    uint32_t entryType;
+    std::string entryName;
+    ImVec4 entryColor;
+    uint32_t entryTimestamp;
+} GameplayStatObject;
+
+extern void GameplayStats_AddTimestamp(GameplayStatObject statObject);
+extern GameplayStatObject GameplayStats_GetObject(uint32_t entryId, uint32_t entryType);
+
+// End

soh/soh/Enhancements/TimeDisplay/TimeDisplay.h

@@ -35,3 +35,4 @@ typedef struct {
 } TimeObject;
 
 extern const std::vector<TimeObject> timeDisplayList;
+extern std::string formatTimeDisplay(uint32_t value);

soh/soh/Enhancements/boss-rush/BossRush.cpp

@@ -4,6 +4,7 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh_assets.h"
 #include "soh/frame_interpolation.h"
+#include "soh/Enhancements/GameplayStats/gameplaystats2.h"
 
 #include <array>
 #include <string>
@@ -560,8 +561,7 @@ void BossRush_HandleCompleteBoss(PlayState* play) {
         play->sceneNum == SCENE_GANON_BOSS) {
         gSaveContext.ship.stats.playTimer += 2;
         gSaveContext.ship.stats.gameComplete = 1;
-        gSaveContext.ship.stats.itemTimestamp[TIMESTAMP_BOSSRUSH_FINISH] =
-            static_cast<uint32_t>(GAMEPLAYSTAT_TOTAL_TIME);
+        GameplayStats_AddTimestamp(GameplayStats_GetObject(TIMESTAMP_BOSSRUSH_FINISH, STAT_TYPE_EVENT));
     }
 }
 

soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp

@@ -453,7 +453,7 @@ static const char* MarginCvarList[]{
     CVAR_COSMETIC("HUD.CLeftButton"),   CVAR_COSMETIC("HUD.CRightButton"),   CVAR_COSMETIC("HUD.Dpad"),
     CVAR_COSMETIC("HUD.Minimap"),       CVAR_COSMETIC("HUD.SmallKey"),       CVAR_COSMETIC("HUD.Rupees"),
     CVAR_COSMETIC("HUD.Carrots"),       CVAR_COSMETIC("HUD.Timers"),         CVAR_COSMETIC("HUD.ArcheryScore"),
-    CVAR_COSMETIC("HUD.TitleCard.Map"), CVAR_COSMETIC("HUD.TitleCard.Boss"), CVAR_COSMETIC("HUD.IGT"),
+    CVAR_COSMETIC("HUD.TitleCard.Map"), CVAR_COSMETIC("HUD.TitleCard.Boss"),
 };
 
 static const char* MarginCvarNonAnchor[]{
@@ -1804,10 +1804,6 @@ void Draw_Placements() {
                         "Title cards (Bosses)", CVAR_COSMETIC("HUD.TitleCard.Boss"), 0,
                         static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50,
                         static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 10, 1.0f);
-    Draw_Table_Dropdown("In-game Gameplay Timer position", "tablegameplaytimer", "In-game Gameplay Timer settings",
-                        "In-game Gameplay Timer", CVAR_COSMETIC("HUD.IGT"), 0,
-                        static_cast<int>(ImGui::GetWindowViewport()->Size.y / 2), -50,
-                        static_cast<int>(ImGui::GetWindowViewport()->Size.x / 2) + 10, 1.0f);
     if (ImGui::CollapsingHeader("Enemy Health Bar position")) {
         if (ImGui::BeginTable("enemyhealthbar", 1, FlagsTable)) {
             ImGui::TableSetupColumn("Enemy Health Bar settings", FlagsCell, TablesCellsWidth);

soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h

@@ -34,6 +34,8 @@ DEFINE_HOOK(OnActorDestroy, (void* actor));
 DEFINE_HOOK(OnEnemyDefeat, (void* actor));
 DEFINE_HOOK(OnBossDefeat, (void* actor));
 DEFINE_HOOK(OnTimestamp, (u8 item));
+DEFINE_HOOK(OnAmmoUsed, (s16 item, s16 ammoUsed));
+DEFINE_HOOK(OnIceTrapReceived, (s16 item, s16 trapType));
 DEFINE_HOOK(OnPlayerBonk, ());
 DEFINE_HOOK(OnPlayerHealthChange, (int16_t amount));
 DEFINE_HOOK(OnPlayerBottleUpdate, (int16_t contents));

soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp

@@ -154,6 +154,14 @@ void GameInteractor_ExecuteOnTimestamp(u8 item) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnTimestamp>(item);
 }
 
+void GameInteractor_ExecuteOnAmmoUsed(s16 item, s16 ammoUsed) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnAmmoUsed>(item, ammoUsed);
+}
+
+void GameInteractor_ExecuteOnIceTrapReceived(s16 item, s16 trapType) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnIceTrapReceived>(item, trapType);
+}
+
 void GameInteractor_ExecuteOnPlayerBonk() {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayerBonk>();
 }

soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h

@@ -36,6 +36,8 @@ void GameInteractor_ExecuteOnActorDestroy(void* actor);
 void GameInteractor_ExecuteOnEnemyDefeat(void* actor);
 void GameInteractor_ExecuteOnBossDefeat(void* actor);
 void GameInteractor_ExecuteOnTimestamp(u8 item);
+void GameInteractor_ExecuteOnAmmoUsed(s16 item, s16 ammoUsed);
+void GameInteractor_ExecuteOnIceTrapReceived(s16 item, s16 trapType);
 void GameInteractor_ExecuteOnPlayerBonk();
 void GameInteractor_ExecuteOnPlayerHealthChange(int16_t amount);
 void GameInteractor_ExecuteOnPlayerBottleUpdate(int16_t contents);