SonicGaugeCode

Author: ReimousTH

MarathonRecomp/api/Marathon.h

@@ -46,6 +46,7 @@
 #include "Sonicteam/Player/State/IMachine.h"
 #include "Sonicteam/Player/State/Machine2.h"
 #include "Sonicteam/Player/State/Object2.h"
+#include "Sonicteam/Player/State/SonicContext.h"
 #include "Sonicteam/Player/State/TailsContext.h"
 #include "Sonicteam/SoX/AI/StateMachine.h"
 #include "Sonicteam/SoX/Component.h"

MarathonRecomp/api/Sonicteam/GameImp.h

@@ -11,7 +11,7 @@ namespace Sonicteam
         {
             be<uint32_t> ActorID;
             be<uint32_t> RingCount;
-            MARATHON_INSERT_PADDING(4);
+            be<uint32_t> TownRingCount;
             be<uint32_t> LifeCount;
             be<uint32_t> ScoreCount;
             be<float> AliveTime;

MarathonRecomp/api/Sonicteam/Player/SonicGauge.h

@@ -12,6 +12,15 @@ namespace Sonicteam::Player
         be<uint32_t> m_Flags;
         be<uint32_t> m_GroundedFlags;
         be<float> m_Maximum;
-        MARATHON_INSERT_PADDING(0x28);
+        be<float> m_Green;
+        be<float> m_Red;
+        be<float> m_Blue;
+        be<float> m_White;
+        be<float> m_Sky;
+        be<float> m_Yellow;
+        be<float> m_Purple;
+        be<float> m_Super;
+        be<float> m_Heal;
+        be<float> m_HealDelay;
     };
 }

MarathonRecomp/api/Sonicteam/Player/State/CommonContext.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <Marathon.inl>
 #include <Sonicteam/Player/State/ICommonContext.h>
 #include <Sonicteam/Player/IExportPostureRequestFlag.h>
@@ -8,10 +7,35 @@
 
 namespace Sonicteam::Player::State
 {
+
+  
+  
     class CommonContext : public ICommonContext, public IExportPostureRequestFlag, public IExportWeaponRequestFlag
     {
     public:
-        MARATHON_INSERT_PADDING(0x90);
+
+        //(Gordon Ramsay)
+        enum PostureEnum:uint32_t{
+            CC_GROUND = 0x1,				// detects Ground 
+            CC_WALLBRUSHING = 0x8,		    // detects brushing against a wall
+            CC_HEADONWALL = 0x10,			// detects head-on wall collision (will always be enabled w/ 2^3)
+            CC_RAILGRIND = 0x40,			// Rail grinding
+            CC_BEFOREFALL = 0x100,		    // seems like Neutral or Pre-Fall? The moment before transitioning from the Jump to Fall animation
+            CC_FALL = 0x200,				// FALL
+            CC_WATERLCOL = 0x800,			// Water collision (making you slide down an incline)? 2^8(CC_BEFOREFALL) is often set with this
+            CC_LIGHTDASHIN = 0x4000,		// Light Dashing (2 ^ 14)
+            CC_QUICKROTATE = 0x8000,		// is moving the control stick in a non-forward direction (usually only active for a frame since the character instantly rotates)
+            CC_TENTATIVE = 0x10000,		    // is Tentative collision 
+            CC_WATERSLIDE = 0x20000,		// Water sliding (2^17)	
+            CC_GRASS = 0x100000,			// grass 2^20
+            CC_DIRTCLAY = 0x200000,		    // dirt/clay (2^21)
+            CC_STONE = 0x400000,			// stone (2^22)
+            CC_SHORELINE = 0x1000000,		// shoreline? sand? Uncertain (2^24) 
+        };
+
+        MARATHON_INSERT_PADDING(0x2C);
+        be<uint32_t> m_PostureFlags;
+        MARATHON_INSERT_PADDING(0x60);
         xpointer<Score> m_pScore;
         MARATHON_INSERT_PADDING(0x104);
     };

MarathonRecomp/api/Sonicteam/Player/State/ContextSpeedAndJump.h

@@ -4,5 +4,11 @@
 
 namespace Sonicteam::Player::State
 {
-    class ContextSpeedAndJump {};
+    class ContextSpeedAndJump 
+    {
+        be<float> base_speed_z;
+        be<float> gimmick_speed_z;
+        be<float> base_speed_y;
+        be<float> gimmick_speed_y;
+    };
 }

MarathonRecomp/api/Sonicteam/Player/State/ICommonContext.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <Marathon.inl>
 #include <Sonicteam/Player/State/ContextSpeedAndJump.h>
 #include <Sonicteam/Player/State/ICommonContextIF.h>
@@ -10,6 +9,13 @@ namespace Sonicteam::Player::State
     class ICommonContext : public IContext, public ICommonContextIF, public ContextSpeedAndJump
     {
     public:
-        MARATHON_INSERT_PADDING(0x60);
+        be<uint32_t> m_CurrentAnimation;
+        be<float> m_LockInputTime;
+        be<uint32_t> m_LastVelocityZ;
+        be<uint32_t> m_LastVelocityY;
+        be<uint32_t> m_LastLockInputTime;
+        be<uint32_t> m_Input;
+        MARATHON_INSERT_PADDING(0x38);
     };
+
 }

MarathonRecomp/api/Sonicteam/Player/State/Machine2.h

@@ -4,6 +4,7 @@
 #include <Sonicteam/Player/State/IContext.h>
 #include <Sonicteam/Player/State/IMachine.h>
 #include <Sonicteam/SoX/AI/StateMachine.h>
+#include <Sonicteam/Player/State/IContext.h>
 
 namespace Sonicteam::Player::State
 {

MarathonRecomp/api/Sonicteam/Player/State/SonicContext.h

@@ -0,0 +1,60 @@
+#pragma once
+#include <Marathon.inl>
+#include <Sonicteam/Player/State/CommonContext.h>
+#include <Sonicteam/Player/SonicGauge.h>
+#include <boost/smart_ptr/shared_ptr.h>
+
+
+namespace Sonicteam::Player::State
+{
+    class SonicContext : public CommonContext
+    {
+    public:
+
+        
+        //Sprite
+        enum GemsS:uint32_t {
+            SGreen = 1,
+            SRed,
+            SBlue,
+            SWhite,
+            SSky,
+            SYellow,
+            SPurple,
+            SSuper
+        };
+        enum Gems:uint32_t {
+            Blue = 1,
+            Red,
+            Green,
+            Purple,
+            Sky,
+            White,
+            Yellow,
+            Super
+        };
+
+  
+    
+        be<GemsS> m_CurrentGemSprite;
+        boost::shared_ptr<Sonicteam::Player::SonicGauge> m_Gauge;
+        uint8_t m_HomingLockOn;
+        uint8_t m_DisablePlayerMovement;
+        uint8_t m_AntigravityHitBox;
+        uint8_t m_23F;
+        uint8_t m_BoundAttackHitBox;
+        uint8_t m_241;
+        uint8_t m_Shrink;
+        uint8_t m_ThunderGuard;
+        uint8_t m_Tornado;
+        uint8_t m_FPS;
+        uint8_t m_ThrowGem;
+        uint8_t m_SlowTime;
+        uint8_t m_MachAura;
+        uint8_t m_GemsEnabled;
+        uint8_t m_24A;
+        uint8_t m_24B;
+        be<uint32_t> m_HomingFlip;
+        be<Gems> m_CurrentGem;
+    };
+}