Merge pull request #11 from dcvz/chore/game-interactor

Chore/game interactor

soh/CMakeLists.txt

@@ -257,6 +257,12 @@ set(Header_Files__soh__Enhancements__item_tables
 
 source_group("Header Files\\soh\\Enhancements\\item-tables" FILES ${Header_Files__soh__Enhancements__item_tables})
 
+set(Header_Files__soh__Enhancements__game_interactor
+ "soh/Enhancements/game-interactor/GameInteractor.h"
+ "soh/Enhancements/game-interactor/GameInteractionEffect.h"
+)
+source_group("Header Files\\soh\\Enhancements\\game-interactor" FILES ${Header_Files__soh__Enhancements__game_interactor})
+
 if (BUILD_CROWD_CONTROL)
 set(Header_Files__soh__Enhancements__crowd_control
  "soh/Enhancements/crowd-control/CrowdControl.h"
@@ -411,6 +417,12 @@ set(Source_Files__soh__Enhancements__item_tables
 
 source_group("Source Files\\soh\\Enhancements\\item-tables" FILES ${Source_Files__soh__Enhancements__item_tables})
 
+set(Source_Files__soh__Enhancements__game_interactor
+ "soh/Enhancements/game-interactor/GameInteractor.cpp"
+ "soh/Enhancements/game-interactor/GameInteractionEffect.cpp"
+)
+source_group("Source Files\\soh\\Enhancements\\game-interactor" FILES ${Source_Files__soh__Enhancements__game_interactor})
+
 if (BUILD_CROWD_CONTROL)
 set(Source_Files__soh__Enhancements__crowd_control
  "soh/Enhancements/crowd-control/CrowdControl.cpp"
@@ -1629,6 +1641,7 @@ set(ALL_FILES
  ${Header_Files__soh__Enhancements__randomizer__3drando}
  ${Header_Files__soh__Enhancements__item_tables}
  ${Header_Files__soh__Enhancements__custom_message}
+ ${Header_Files__soh__Enhancements__game_interactor}
  ${Header_Files__soh__Enhancements__crowd_control}
  ${Source_Files__soh}
  ${Source_Files__soh__Enhancements}
@@ -1642,6 +1655,7 @@ set(ALL_FILES
  ${Source_Files__soh__Enhancements__randomizer__3drando__location_access}
  ${Source_Files__soh__Enhancements__item_tables}
  ${Source_Files__soh__Enhancements__custom_message}
+ ${Source_Files__soh__Enhancements__game_interactor}
  ${Source_Files__soh__Enhancements__crowd_control}
  ${Source_Files__src__boot}
  ${Source_Files__src__buffers}

soh/soh/Enhancements/crowd-control/CrowdControl.h

@@ -17,6 +17,8 @@
 #include <chrono>
 #include <future>
 
+#include "../game-interactor/GameInteractor.h"
+
 class CrowdControl {
  private:
  enum EffectResult {
@@ -61,10 +63,9 @@ class CrowdControl {
 
  typedef struct Effect {
  uint32_t id;
- std::string type;
- uint32_t value;
  std::string category;
  long timeRemaining;
+ GameInteractionEffectBase *giEffect;
 
  // Metadata used while executing (only for timed effects)
  bool isPaused;
@@ -88,11 +89,13 @@ class CrowdControl {
  void ListenToServer();
  void ProcessActiveEffects();
 
- void EmitMessage(TCPsocket socket, uint32_t eventId, long timeRemaining,
-  CrowdControl::EffectResult status);
+ void EmitMessage(TCPsocket socket, uint32_t eventId, long timeRemaining, EffectResult status);
+ void EmitMessage(TCPsocket socket, uint32_t eventId, long timeRemaining, GameInteractionEffectQueryResult status);
  Effect* ParseMessage(char payload[512]);
- EffectResult ExecuteEffect(std::string effectId, uint32_t value, bool dryRun);
- void RemoveEffect(std::string effectId);
+ EffectResult ExecuteEffect(Effect* effect);
+ void RemoveEffect(Effect* effect);
+// EffectResult ExecuteEffect(std::string effectId, uint32_t value, bool dryRun);
+// void RemoveEffect(std::string effectId);
  bool SpawnEnemy(std::string effectId);
 
  public:

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

@@ -0,0 +1,68 @@
+//
+// GameInteractionEffect.cpp
+// soh
+//
+// Created by David Chavez on 15.12.22.
+//
+
+#include "GameInteractionEffect.h"
+#include "GameInteractor.h"
+
+extern "C" {
+#include <z64.h>
+#include "variables.h"
+#include "functions.h"
+#include "macros.h"
+extern PlayState* gPlayState;
+}
+
+// Effect State
+
+uint32_t GameInteractor_NoUI;
+
+// AddHeartContainer
+
+namespace GameInteractionEffect {
+ GameInteractionEffectQueryResult AddHeartContainer::CanBeApplied() {
+ return gSaveContext.healthCapacity >= 0x140
+ ? GameInteractionEffectQueryResult::NotPossibe
+ : GameInteractionEffectQueryResult::Possible;
+ }
+
+ void AddHeartContainer::Apply() {
+ Health_GiveHearts(1);
+ }
+
+ // RemoveHeartContainer
+
+ GameInteractionEffectQueryResult RemoveHeartContainer::CanBeApplied() {
+ return ((gSaveContext.healthCapacity - 0x10) <= 0)
+ ? GameInteractionEffectQueryResult::NotPossibe
+ : GameInteractionEffectQueryResult::Possible;
+ }
+
+ void RemoveHeartContainer::Apply() {
+ Health_RemoveHearts(1);
+ }
+
+ // GiveRupees
+
+ GameInteractionEffectQueryResult GiveRupees::CanBeApplied() {
+ return GameInteractionEffectQueryResult::Possible;
+ }
+
+ void GiveRupees::Apply() {
+ Rupees_ChangeBy(amount);
+ }
+
+
+ // NoUIEffect
+
+ GameInteractionEffectQueryResult NoUI::CanBeApplied() {
+ return GameInteractionEffectQueryResult::Possible;
+ }
+
+ void NoUI::Apply() {
+ GameInteractor_NoUI = 1;
+ }
+}

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

@@ -0,0 +1,67 @@
+//
+// GameInteractionEffect.h
+// soh
+//
+// Created by David Chavez on 15.12.22.
+//
+
+#ifndef GameInteractionEffect_h
+#define GameInteractionEffect_h
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern uint32_t GameInteractor_NoUI;
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef __cplusplus
+enum GameInteractionEffectQueryResult {
+ Possible = 0x00,
+ TemporarilyNotPossible = 0x01,
+ NotPossibe = 0xFF
+};
+
+class GameInteractionEffectBase {
+public:
+ virtual GameInteractionEffectQueryResult CanBeApplied() = 0;
+ virtual void Apply() = 0;
+};
+
+namespace GameInteractionEffect {
+ class AddHeartContainer: public GameInteractionEffectBase {
+ GameInteractionEffectQueryResult CanBeApplied() override;
+ void Apply() override;
+ };
+
+ class RemoveHeartContainer: public GameInteractionEffectBase {
+ GameInteractionEffectQueryResult CanBeApplied() override;
+ void Apply() override;
+ };
+
+ class AddOrRemoveHeartContainer: public GameInteractionEffectBase {
+ int32_t amount;
+
+ GameInteractionEffectQueryResult CanBeApplied() override;
+ void Apply() override;
+ };
+
+ class GiveRupees: public GameInteractionEffectBase {
+ public:
+ uint32_t amount;
+
+ GameInteractionEffectQueryResult CanBeApplied() override;
+ void Apply() override;
+ };
+
+ class NoUI: public GameInteractionEffectBase {
+ GameInteractionEffectQueryResult CanBeApplied() override;
+ void Apply() override;
+ };
+}
+
+#endif /* __cplusplus */
+#endif /* GameInteractionEffect_h */

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

@@ -0,0 +1,16 @@
+//
+// GameInteractor.cpp
+// soh
+//
+// Created by David Chavez on 07.12.22.
+//
+
+#include "GameInteractor.h"
+
+GameInteractionEffectQueryResult GameInteractor::CanApplyEffect(GameInteractionEffectBase effect) {
+ return effect.CanBeApplied();
+}
+
+void GameInteractor::ApplyEffect(GameInteractionEffectBase effect) {
+ return effect.Apply();
+}

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

@@ -0,0 +1,27 @@
+//
+// GameInteractor.h
+// soh
+//
+// Created by David Chavez on 07.12.22.
+//
+
+#ifndef GameInteractor_h
+#define GameInteractor_h
+
+#include "GameInteractionEffect.h"
+
+#ifdef __cplusplus
+class GameInteractor {
+public:
+ static GameInteractor* Instance;
+
+ static GameInteractionEffectQueryResult CanApplyEffect(GameInteractionEffectBase effect);
+ static void ApplyEffect(GameInteractionEffectBase effect);
+ static void RemoveEffect();
+
+ static bool CanSpawnEnemy();
+ static void SpawnEnemy();
+};
+
+#endif
+#endif /* GameInteractor_h */

soh/soh/OTRGlobals.cpp

@@ -1,4 +1,4 @@
-#include "OTRGlobals.h"
+#include "OTRGlobals.h"
 #include "OTRAudio.h"
 #include <iostream>
 #include <algorithm>
@@ -78,10 +78,13 @@
 CrowdControl* CrowdControl::Instance;
 #endif
 
+#include "Enhancements/game-interactor/GameInteractor.h"
+
 OTRGlobals* OTRGlobals::Instance;
 SaveManager* SaveManager::Instance;
 CustomMessageManager* CustomMessageManager::Instance;
 ItemTableManager* ItemTableManager::Instance;
+GameInteractor* GameInteractor::Instance;
 
 OTRGlobals::OTRGlobals() {
  std::vector<std::string> OTRFiles;
@@ -434,6 +437,7 @@ extern "C" void InitOTR() {
  SaveManager::Instance = new SaveManager();
  CustomMessageManager::Instance = new CustomMessageManager();
  ItemTableManager::Instance = new ItemTableManager();
+ GameInteractor::Instance = new GameInteractor();
 
  clearMtx = (uintptr_t)&gMtxClear;
  OTRMessage_Init();

soh/src/code/z_parameter.c

@@ -13,6 +13,7 @@
 #endif
 
 #include "soh/Enhancements/debugconsole.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 
 
 static uint16_t _doActionTexWidth, _doActionTexHeight = -1;
@@ -4962,7 +4963,7 @@ void Interface_Draw(PlayState* play) {
  s16 svar6;
  bool fullUi = !CVar_GetS32("gMinimalUI", 0) || !R_MINIMAP_DISABLED || play->pauseCtx.state != 0;
 
- if (chaosEffectNoUI) {
+ if (GameInteractor_NoUI) {
  return;
  }