Fix low% loadout. Add IS start/stop. Add version in menu.

Author: Pwootage

CMakeLists.txt

@@ -74,6 +74,7 @@ set(SOURCE_FILES
         src/include/prime/CScriptRelay.hpp
         src/include/prime/CScriptDoor.hpp
         src/include/prime/CScriptCameraHint.hpp
+        src/include/prime/CCameraBobber.hpp
         src/include/STriggerRenderConfig.hpp
         src/include/NewPauseScreen.hpp
         src/include/GetField.hpp
@@ -98,6 +99,7 @@ set(SOURCE_FILES
         src/libc/printf.c
         src/libc/sscanf.c
 
+        src/version.h
         src/new.cpp
         src/NewPauseScreen.cpp
         src/duk_mem.h

README.md

@@ -67,6 +67,10 @@ Youtube video on macOS (Linux is similar): [https://www.youtube.com/watch?v=fyz6
 
 ## Changelog
 
+### 2.3.1 (beta)
+- Add IS & lightshowfix to player menu
+- Add version to main menu
+
 ### 2.3.0 (beta)
 - Compile statically & link directly into default.dol
 - This reduces the size of the mod by ~100k

src/NewPauseScreen.cpp

@@ -22,6 +22,7 @@
 #include "settings.hpp"
 #include "font_atlas.hpp"
 #include "ImGuiEngine.hpp"
+#include "version.h"
 
 #define PAD_MAX_CONTROLLERS 4
 
@@ -147,6 +148,7 @@ void NewPauseScreen::RenderMenu() {
     GUI::drawPlayerMenu();
     GUI::drawInventoryMenu();
     GUI::drawSettingsMenu();
+    ImGui::Text("v%s", PRAC_MOD_VERSION);
   }
   ImGui::End();
 

src/UI/InventoryMenu.cpp

@@ -44,7 +44,7 @@ static constexpr SItemAmt StartingItems[] = {
 };
 
 static constexpr SItemAmt LowPercentItems[] = {
-    {CPlayerState::EItemType::EnergyTanks, 1},
+    {CPlayerState::EItemType::EnergyTanks, 0},
     {CPlayerState::EItemType::Missiles, 5},
 
     {CPlayerState::EItemType::MorphBall},

src/UI/PlayerMenu.cpp

@@ -67,10 +67,44 @@ namespace GUI {
         ImGui::Text("Saved position: %.2fx, %.2fy, %.2fz", savedPos.x, savedPos.y, savedPos.z);
       }
 
+      float xyz[3] = {
+          player->getTransform()->x,
+          player->getTransform()->y,
+          player->getTransform()->z
+      };
+
+      ImGui::DragFloat3("", xyz, 1.f, -FLT_MAX, FLT_MAX, "%.3f", flags);
+      player->getTransform()->x = xyz[0];
+      player->getTransform()->y = xyz[1];
+      player->getTransform()->z = xyz[2];
+
+      if (ImGui::Button("IS on")) {
+        player->GetAngularVelocity()->x = NAN;
+        player->GetAngularVelocity()->y = NAN;
+        player->GetAngularVelocity()->z = NAN;
+      }
+      ImGui::SameLine();
+      ImGui::Text("Use while morphed");
+
+      auto *bobber = player->getCameraBobber();
+      if (ImGui::Button("Lightshow fix")) {
+        player->GetAngularVelocity()->x = 0;
+        player->GetAngularVelocity()->y = 0;
+        player->GetAngularVelocity()->z = 0;
+
+
+        *(bobber->getTargetBobMagnitude()) = 0;
+        *(bobber->getBobMagnitude()) = 0;
+        *(bobber->getBobTimescale()) = 0;
+        *(bobber->getBobTime()) = 0;
+        bobber->getCameraBobTransform()->x = 0;
+        bobber->getCameraBobTransform()->y = 0;
+        bobber->getCameraBobTransform()->z = 0;
+      }
+
+      ImGui::SameLine();
+      ImGui::Text("Use while unmorphed");
 
-      ImGui::DragFloat("X", &player->getTransform()->x, 1.f, -FLT_MAX, FLT_MAX, "%.3f", flags);
-      ImGui::DragFloat("Y", &player->getTransform()->y, 1.f, -FLT_MAX, FLT_MAX, "%.3f", flags);
-      ImGui::DragFloat("Z", &player->getTransform()->z, 1.f, -FLT_MAX, FLT_MAX, "%.3f", flags);
       ImGui::TreePop();
     }
   }

src/include/prime/CCameraBobber.hpp

@@ -0,0 +1,16 @@
+#ifndef PRIME_PRACTICE_NATIVE_CCAMERABOBBER_HPP
+#define PRIME_PRACTICE_NATIVE_CCAMERABOBBER_HPP
+
+#include "GetField.hpp"
+#include "MathyTypes.hpp"
+
+class CCameraBobber {
+public:
+  float *getTargetBobMagnitude() { return GetField<float>(this, 0x10); }
+  float *getBobMagnitude() { return GetField<float>(this, 0x14); }
+  float *getBobTimescale() { return GetField<float>(this, 0x18); }
+  float *getBobTime() { return GetField<float>(this, 0x1C); }
+  CTransform4f *getCameraBobTransform() { return GetField<CTransform4f>(this, 0x38); }
+};
+
+#endif //PRIME_PRACTICE_NATIVE_CCAMERABOBBER_HPP

src/include/prime/CPlayer.hpp

@@ -3,10 +3,14 @@
 
 #include "prime/CStateManager.hpp"
 #include "prime/CPhysicsActor.hpp"
+#include "prime/CCameraBobber.hpp"
 
 class CPlayer : public CPhysicsActor {
 public:
 	void Teleport(const CTransform4f& newTransform, CStateManager&, bool resetBallCam);
+
+
+  CCameraBobber *getCameraBobber() { return *GetField<CCameraBobber*>(this, 0x76C); }
 };
 
 #endif //PRIME_PRACTICE_CPLAYER_HPP

src/version.h

@@ -0,0 +1 @@
+#define PRAC_MOD_VERSION "2.3.1"