Select Map | B Switch Zock State

ReimousTH · ReimousTH · commit f898dc9d206e · 2025-08-24T21:25:21.000+03:00
diff --git a/MarathonRecomp/api/Marathon.h b/MarathonRecomp/api/Marathon.h
@@ -25,6 +25,7 @@
 #include "Sonicteam/DocMarathonState.h"
 #include "Sonicteam/GameImp.h"
 #include "Sonicteam/GameMode.h"
+#include "Sonicteam/MyPhantom.h"
 #include "Sonicteam/Player/IDynamicLink.h"
 #include "Sonicteam/Player/IExportPostureRequestFlag.h"
 #include "Sonicteam/Player/IExportWeaponRequestFlag.h"
@@ -34,6 +35,8 @@
 #include "Sonicteam/Player/IScore.h"
 #include "Sonicteam/Player/IStepable.h"
 #include "Sonicteam/Player/IVariable.h"
+#include "Sonicteam/Player/IZock.h"
+#include "Sonicteam/Player/Zock.h"
 #include "Sonicteam/Player/Object.h"
 #include "Sonicteam/Player/Score.h"
 #include "Sonicteam/Player/SonicGauge.h"
@@ -54,16 +57,24 @@
 #include "Sonicteam/SoX/Engine/Doc.h"
 #include "Sonicteam/SoX/Engine/DocMode.h"
 #include "Sonicteam/SoX/Engine/Task.h"
+#include "Sonicteam/SoX/Input/Manager.h"
 #include "Sonicteam/SoX/MessageReceiver.h"
 #include "Sonicteam/SoX/Object.h"
-#include "Sonicteam/SoX/Physics/Havok/WorldHavok.h"
+#include "Sonicteam/SoX/Math/Vector.h"
+#include "Sonicteam/SoX/Physics/Havok/EntityHavok.h"
+#include "Sonicteam/SoX/Physics/Havok/EntityHavokImp.h"
+#include "Sonicteam/SoX/Physics/Havok/PhantomHavok.h"
 #include "Sonicteam/SoX/Physics/World.h"
-#include "Sonicteam/SoX/Input/Manager.h"
+#include "Sonicteam/SoX/Physics/Entity.h"
+#include "Sonicteam/SoX/Physics/Phantom.h"
 #include "Sonicteam/SoX/RefCountObject.h"
 #include "Sonicteam/System/CreateStatic.h"
 #include "Sonicteam/System/Singleton.h"
 #include "Sonicteam/TitleTask.h"
 #include "boost/smart_ptr/make_shared_object.h"
 #include "boost/smart_ptr/shared_ptr.h"
+#include "Physics/RigidBody.h"
+#include "Physics/Entity.h"
+#include "Physics/Shape.h"
 #include "stdx/string.h"
 #include "stdx/vector.h"
diff --git a/MarathonRecomp/api/Physics/Entity.h b/MarathonRecomp/api/Physics/Entity.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Physics/Shape.h>
+
+namespace Phys
+{
+    class Entity:public Shape
+    {
+        MARATHON_INSERT_PADDING(0x5C);
+    };
+}
+
diff --git a/MarathonRecomp/api/Physics/RigidBody.h b/MarathonRecomp/api/Physics/RigidBody.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Physics/Entity.h>
+
+namespace Phys
+{
+    class RigidBody:public Entity
+    {
+    };
+}
+
diff --git a/MarathonRecomp/api/Physics/Shape.h b/MarathonRecomp/api/Physics/Shape.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <Marathon.inl>
+
+namespace Phys
+{
+    class Shape
+    {
+    public:
+        xpointer<void> m_pVftable;
+        MARATHON_INSERT_PADDING(0x34);
+        be<uint32_t> m_CollisionFilter;
+        MARATHON_INSERT_PADDING(0x34);
+    };
+}
+
diff --git a/MarathonRecomp/api/Sonicteam/MyPhantom.h b/MarathonRecomp/api/Sonicteam/MyPhantom.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Physics/Havok/PhantomHavok.h>
+
+namespace Sonicteam
+{
+    class MyPhantom : public SoX::Physics::Havok::PhantomHavok
+    {
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/Player/IZock.h b/MarathonRecomp/api/Sonicteam/Player/IZock.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/Player/IPlugIn.h>
+
+
+namespace Sonicteam::Player
+{
+    class IZock : public IPlugIn {};
+}
diff --git a/MarathonRecomp/api/Sonicteam/Player/Object.h b/MarathonRecomp/api/Sonicteam/Player/Object.h
@@ -2,6 +2,9 @@
 
 #include <Marathon.h>
 #include <Sonicteam/Player/State/Machine2.h>
+#include <boost/smart_ptr/shared_ptr.h>
+#include <Sonicteam/Player/IPlugIn.h>
+#include <stdx/vector.h>
 
 namespace Sonicteam::Player
 {
@@ -14,16 +17,23 @@ namespace Sonicteam::Player
         bool m_IsPlayer;
         bool m_IsPosture;
         bool m_IsAmigo;
-        MARATHON_INSERT_PADDING(0x19);
+        MARATHON_INSERT_PADDING(0x1);
+        xpointer<Sonicteam::SoX::RefCountObject> m_RootFrame;
+        MARATHON_INSERT_PADDING(0x14);
         boost::shared_ptr<State::Machine2> m_spStateMachine;
         MARATHON_INSERT_PADDING(0x10);
         be<uint32_t> m_SetupModuleIndexPrefix;
         be<uint32_t> m_SetupModuleIndexPostfix;
         boost::shared_ptr<IGauge> m_spGauge;
-        MARATHON_INSERT_PADDING(0x204);
+        MARATHON_INSERT_PADDING(0x8);
+        stdx::vector<boost::shared_ptr<Sonicteam::Player::IPlugIn>> m_PlayerPlugins;
+        MARATHON_INSERT_PADDING(0x1F4);
 
         template <typename T>
         inline T* GetGauge();
+
+        template <typename T = Sonicteam::Player::IPlugIn>
+        inline T* GetPlugin(const char* PluginName);
     };
 }
 
diff --git a/MarathonRecomp/api/Sonicteam/Player/Object.inl b/MarathonRecomp/api/Sonicteam/Player/Object.inl
@@ -5,4 +5,17 @@ namespace Sonicteam::Player
     {
         return (T*)m_spGauge.get();
     }
+
+    template<typename T>
+    inline T* Sonicteam::Player::Object::GetPlugin(const char* PluginName)
+    {
+        for (stdx::vector<boost::shared_ptr<Sonicteam::Player::IPlugIn>>::iterator it = m_PlayerPlugins.begin(); it != m_PlayerPlugins.end(); it = it + 1)
+        {
+            if (it->get()->m_Name == PluginName)
+            {
+                return static_cast<T*>(it->get());
+            }
+        }
+        return nullptr;
+    }
 }
diff --git a/MarathonRecomp/api/Sonicteam/Player/Zock.h b/MarathonRecomp/api/Sonicteam/Player/Zock.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/Player/IZock.h>
+#include <Sonicteam/Player/IFlagCommunicator.h>
+#include <Sonicteam/Player/IStepable.h>
+#include <Sonicteam/Player/IDynamicLink.h>
+#include <Sonicteam/Player/IVariable.h>
+#include <Sonicteam/MyPhantom.h>
+
+namespace Sonicteam::Player
+{
+    class Zock : public IZock, public IFlagCommunicator, public IStepable, public IDynamicLink, public IVariable
+    {
+    public:
+        MARATHON_INSERT_PADDING(0x8);
+        xpointer<Sonicteam::MyPhantom> m_pPhantom;
+        MARATHON_INSERT_PADDING(0x20);
+        xpointer<Sonicteam::MyPhantom> m_pPhantomB;
+        MARATHON_INSERT_PADDING(0x84);
+
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Input/Manager.h b/MarathonRecomp/api/Sonicteam/SoX/Input/Manager.h
@@ -4,6 +4,7 @@
 
 namespace Sonicteam::SoX::Input
 {
+
     enum KeyState
     {
         KeyState_DpadUp = 0x40,
@@ -20,13 +21,16 @@ namespace Sonicteam::SoX::Input
         KeyState_B = 0x2,
         KeyState_X = 0x8,
         KeyState_Y = 0x10,
+        KeyState_LeftTrigger = 0x4000,
+        KeyState_RightTrigger = 0x8000,
     };
 
     struct PadState
     {
         be<uint32_t> LastButtons;
         be<uint32_t> InvertedLastButtons;
-        MARATHON_INSERT_PADDING(8);
+        be<uint32_t> PressedButtons;
+        be<uint32_t> ReleasedButtons;
 
         be<float> LeftStickHorizontal;
         be<float> LeftStickVertical;
@@ -37,6 +41,10 @@ namespace Sonicteam::SoX::Input
         be<float> RightStickVertical;
         be<short> RightStickHorizontalS16;
         be<short> RightStickVerticalS16;
+
+        bool IsDown(const KeyState in_Keys) const;
+        bool IsPressed(const KeyState in_Keys) const;
+        bool IsReleased(const KeyState in_Keys) const;
     };
 
     class Manager
@@ -48,3 +56,5 @@ namespace Sonicteam::SoX::Input
         MARATHON_INSERT_PADDING(0x28);
     };
 }
+
+#include "Manger.inl"
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Input/Manger.inl b/MarathonRecomp/api/Sonicteam/SoX/Input/Manger.inl
@@ -0,0 +1,17 @@
+namespace Sonicteam::SoX::Input
+{
+    inline bool PadState::IsDown(const KeyState in_Keys) const
+    {
+        return (LastButtons & in_Keys) == in_Keys;
+    }
+
+    inline bool PadState::IsPressed(const KeyState in_Keys) const
+    {
+        return (PressedButtons & in_Keys) == in_Keys;
+    }
+
+    inline bool PadState::IsReleased(const KeyState in_Keys) const
+    {
+        return (ReleasedButtons & in_Keys) == in_Keys;
+    }
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Math/Vector.h b/MarathonRecomp/api/Sonicteam/SoX/Math/Vector.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "Marathon.inl"
+
+namespace Sonicteam::SoX::Math
+{
+    class Vector2
+    {
+    public:
+        be<float> X;
+        be<float> Y;
+    };
+
+    class __declspec(align(16)) Vector
+    {
+    public:
+        be<float> X;
+        be<float> Y;
+        be<float> Z;
+        be<float> W;
+    };
+
+    class __declspec(align(16)) Vector4
+    {
+    public:
+        be<float> X;
+        be<float> Y;
+        be<float> Z;
+        be<float> W;
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Physics/Entity.h b/MarathonRecomp/api/Sonicteam/SoX/Physics/Entity.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Engine/Task.h>
+#include <Sonicteam/SoX/MessageReceiver.h>
+#include <Sonicteam/SoX/RefCountObject.h>
+#include <Sonicteam/SoX/Physics/Shape.h>
+
+namespace Sonicteam::SoX::Physics
+{
+    class Entity : public SoX::MessageReceiver, public SoX::RefCountObject
+    {
+    public:
+        MARATHON_INSERT_PADDING(0x14);
+        xpointer<SoX::MessageReceiver> m_Receiver;
+        xpointer<SoX::Physics::Shape> m_RefShape; //Reference_type
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Physics/Havok/EntityHavok.h b/MarathonRecomp/api/Sonicteam/SoX/Physics/Havok/EntityHavok.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Math/Vector.h>
+#include <Sonicteam/SoX/Physics/Havok/WorldHavok.h>
+#include <Physics/RigidBody.h>
+
+namespace Sonicteam::SoX::Physics::Havok
+{
+    class EntityHavok
+    {
+    public:
+        xpointer<void> m_pVftable;
+        MARATHON_INSERT_PADDING(0xC);
+        xpointer<Phys::RigidBody> m_RigidBody;
+        xpointer<SoX::Physics::Havok::WorldHavok> m_RefWorldHavok; //Ref_type
+        Sonicteam::SoX::Math::Vector m_Rotation;
+        Sonicteam::SoX::Math::Vector m_Translation;
+        MARATHON_INSERT_PADDING(0xC);
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Physics/Havok/EntityHavokImp.h b/MarathonRecomp/api/Sonicteam/SoX/Physics/Havok/EntityHavokImp.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Physics/Havok/WorldHavok.h>
+#include <Sonicteam/SoX/Physics/Havok/EntityHavok.h>
+
+namespace Sonicteam::SoX::Physics::Havok
+{
+    template<typename T>
+    class EntityHavokImp :
+        public T,
+        public Sonicteam::SoX::Physics::Havok::EntityHavok
+    {
+        //padding 0x8?????
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Physics/Havok/PhantomHavok.h b/MarathonRecomp/api/Sonicteam/SoX/Physics/Havok/PhantomHavok.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Physics/Havok/EntityHavokImp.h>
+#include <Sonicteam/SoX/Physics/Phantom.h>
+
+namespace Sonicteam::SoX::Physics::Havok
+{
+
+    class PhantomHavok : public EntityHavokImp <SoX::Physics::Phantom>
+    {
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Physics/Phantom.h b/MarathonRecomp/api/Sonicteam/SoX/Physics/Phantom.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Physics/Entity.h>
+
+namespace Sonicteam::SoX::Physics
+{
+    class Phantom : public Entity
+    {
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/Physics/Shape.h b/MarathonRecomp/api/Sonicteam/SoX/Physics/Shape.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/RefCountObject.h>
+
+namespace Sonicteam::SoX::Physics
+{
+    class Shape : public RefCountObject 
+    {
+        be<uint32_t> m_ShapeType;
+        be<float> m_ShapeVolume; //w * h *... * FLT_MIN
+        //vft
+        //Destruction
+        //ShapeVFT4(_out VECTOR* u1,__out VECTOR* u2)
+        //InitializeVolume()
+    };
+}
diff --git a/MarathonRecomp/api/Sonicteam/SoX/RefCountObject.h b/MarathonRecomp/api/Sonicteam/SoX/RefCountObject.h
diff --git a/MarathonRecomp/api/stdx/vector.h b/MarathonRecomp/api/stdx/vector.h
diff --git a/MarathonRecomp/patches/player_patches.cpp b/MarathonRecomp/patches/player_patches.cpp
diff --git a/MarathonRecompLib/config/Marathon.toml b/MarathonRecompLib/config/Marathon.toml

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,17 @@ namespace Sonicteam::Player`
`5`	`5`	`{`
`6`	`6`	`return (T*)m_spGauge.get();`
`7`	`7`	`}`
	`8`	`+`
	`9`	`+ template<typename T>`
	`10`	`+ inline T* Sonicteam::Player::Object::GetPlugin(const char* PluginName)`
	`11`	`+ {`
	`12`	`+ for (stdx::vector<boost::shared_ptr<Sonicteam::Player::IPlugIn>>::iterator it = m_PlayerPlugins.begin(); it != m_PlayerPlugins.end(); it = it + 1)`
	`13`	`+ {`
	`14`	`+ if (it->get()->m_Name == PluginName)`
	`15`	`+ {`
	`16`	`+ return static_cast<T*>(it->get());`
	`17`	`+ }`
	`18`	`+ }`
	`19`	`+ return nullptr;`
	`20`	`+ }`
`8`	`21`	`}`