From 5996a7000c57c3a1d784deed089719f111009221 Mon Sep 17 00:00:00 2001
From: G C <hdt80bro.phi@gmail.com>
Date: Thu, 14 Jul 2022 11:56:28 -0700
Subject: [PATCH 1/4] Conform `/Engine/` to Moho

---
 engine/Sim/CAiAttackerImpl.lua        |  5 +++
 engine/Sim/CAiNavigatorImpl.lua       |  4 +++
 engine/Sim/CAiPersonality.lua         |  4 +++
 engine/Sim/CAimManipulator.lua        |  5 +++
 engine/Sim/CAnimationManipulator.lua  |  5 +++
 engine/Sim/CBuilderArmManipulator.lua |  5 +++
 engine/Sim/CCollisionManipulator.lua  |  5 ---
 engine/Sim/CDamage.lua                |  5 +++
 engine/Sim/CFootPlantManipulator.lua  |  3 +-
 engine/Sim/CManipulator.lua           | 22 ------------
 engine/Sim/CRotateManipulator.lua     |  4 +++
 engine/Sim/CSlaveManipulator.lua      |  5 ---
 engine/Sim/CSlideManipulator.lua      |  5 +++
 engine/Sim/Entity.lua                 |  8 +++++
 engine/Sim/IAniManipulator.lua        | 23 +++++++++++++
 engine/Sim/Projectile.lua             |  5 +++
 engine/Sim/Unit.lua                   |  5 +++
 engine/Sim/UnitWeapon.lua             |  5 +++
 engine/moho.lua                       | 48 +++++++++++++++++----------
 lua/aipersonality.lua                 |  1 +
 lua/sim/Blip.lua                      |  2 +-
 lua/sim/Navigator.lua                 |  1 +
 lua/sim/Unit.lua                      |  2 +-
 23 files changed, 124 insertions(+), 53 deletions(-)
 delete mode 100644 engine/Sim/CManipulator.lua
 create mode 100644 engine/Sim/IAniManipulator.lua

diff --git a/engine/Sim/CAiAttackerImpl.lua b/engine/Sim/CAiAttackerImpl.lua
index d5af55a1dc..bbf72f4e9a 100644
--- a/engine/Sim/CAiAttackerImpl.lua
+++ b/engine/Sim/CAiAttackerImpl.lua
@@ -2,6 +2,11 @@
 ---@class moho.CAiAttackerImpl_methods
 local CAiAttackerImpl = {}
 
+---
+---@return boolean
+function CAiAttackerImpl:AttackerWeaponsBusy()
+end
+
 ---
 --  Loop through the weapons to see if the target can be attacked
 function CAiAttackerImpl:CanAttackTarget()
diff --git a/engine/Sim/CAiNavigatorImpl.lua b/engine/Sim/CAiNavigatorImpl.lua
index ec61a68cbc..ada0d33f00 100644
--- a/engine/Sim/CAiNavigatorImpl.lua
+++ b/engine/Sim/CAiNavigatorImpl.lua
@@ -2,6 +2,10 @@
 ---@class moho.navigator_methods
 local CNavigator = {}
 
+---
+function CNavigator:AbortMove()
+end
+
 ---
 --
 function CNavigator:AtGoal()
diff --git a/engine/Sim/CAiPersonality.lua b/engine/Sim/CAiPersonality.lua
index 601faa4441..979957f804 100644
--- a/engine/Sim/CAiPersonality.lua
+++ b/engine/Sim/CAiPersonality.lua
@@ -2,6 +2,10 @@
 ---@class moho.aipersonality_methods
 local CAiPersonality = {}
 
+---
+function CAiPersonality:AdjustDelay()
+end
+
 ---
 --  CAiPersonality:GetAirUnitsEmphasis()
 function CAiPersonality:GetAirUnitsEmphasis()
diff --git a/engine/Sim/CAimManipulator.lua b/engine/Sim/CAimManipulator.lua
index 5c643beafe..dc453db6ab 100644
--- a/engine/Sim/CAimManipulator.lua
+++ b/engine/Sim/CAimManipulator.lua
@@ -2,6 +2,11 @@
 ---@class moho.AimManipulator : moho.manipulator_methods
 local CAimManipulator = {}
 
+---
+---@return number
+function CAimManipulator:GetHeadingPitch()
+end
+
 ---
 --  AimManipulator:OnTarget()
 function CAimManipulator:OnTarget()
diff --git a/engine/Sim/CAnimationManipulator.lua b/engine/Sim/CAnimationManipulator.lua
index 10d84cbd53..235a57ee87 100644
--- a/engine/Sim/CAnimationManipulator.lua
+++ b/engine/Sim/CAnimationManipulator.lua
@@ -2,6 +2,11 @@
 ---@class moho.AnimationManipulator : moho.manipulator_methods
 local CAnimationManipulator = {}
 
+---
+---@return number
+function CAnimationManipulator:GetAnimationDuration()
+end
+
 ---
 --  fraction = AnimationManipulator:GetAnimationFraction()
 function CAnimationManipulator:GetAnimationFraction()
diff --git a/engine/Sim/CBuilderArmManipulator.lua b/engine/Sim/CBuilderArmManipulator.lua
index 98cdd56c78..2563fddf93 100644
--- a/engine/Sim/CBuilderArmManipulator.lua
+++ b/engine/Sim/CBuilderArmManipulator.lua
@@ -2,6 +2,11 @@
 ---@class moho.BuilderArmManipulator : moho.manipulator_methods
 local CBuilderArmManipulator = {}
 
+---
+---@return number
+function CBuilderArmManipulator:GetHeadingPitch()
+end
+
 ---
 --  BuilderArmManipulator:SetAimingArc(minHeading, maxHeading, headingMaxSlew, minPitch, maxPitch, pitchMaxSlew)
 function CBuilderArmManipulator:SetAimingArc(minHeading,  maxHeading,  headingMaxSlew,  minPitch,  maxPitch,  pitchMaxSlew)
diff --git a/engine/Sim/CCollisionManipulator.lua b/engine/Sim/CCollisionManipulator.lua
index e71ce7181f..360af53a1a 100644
--- a/engine/Sim/CCollisionManipulator.lua
+++ b/engine/Sim/CCollisionManipulator.lua
@@ -18,10 +18,5 @@ end
 function CCollisionManipulator:WatchBone(bone)
 end
 
----
---  derived from IAniManipulator
-function CCollisionManipulator:base()
-end
-
 return CCollisionManipulator
 
diff --git a/engine/Sim/CDamage.lua b/engine/Sim/CDamage.lua
index c810c7a09d..3283aee3e2 100644
--- a/engine/Sim/CDamage.lua
+++ b/engine/Sim/CDamage.lua
@@ -2,6 +2,11 @@
 ---@class moho.CDamage
 local CDamage = {}
 
+---
+---@return Entity
+function CDamage:GetInstigator()
+end
+
 ---
 --  CDamage:GetTarget()
 function CDamage:GetTarget()
diff --git a/engine/Sim/CFootPlantManipulator.lua b/engine/Sim/CFootPlantManipulator.lua
index c49a64e110..40f284755c 100644
--- a/engine/Sim/CFootPlantManipulator.lua
+++ b/engine/Sim/CFootPlantManipulator.lua
@@ -1,6 +1,5 @@
 ---@declare-global
----@class moho.EconomyEvent : moho.manipulator_methods
+---@class moho.FootPlantManipulator : moho.manipulator_methods
 local CFootPlantManipulator = {}
 
 return CFootPlantManipulator
-
diff --git a/engine/Sim/CManipulator.lua b/engine/Sim/CManipulator.lua
deleted file mode 100644
index fe46947b75..0000000000
--- a/engine/Sim/CManipulator.lua
+++ /dev/null
@@ -1,22 +0,0 @@
----@declare-global
----@class moho.manipulator_methods
-local CManipulator = {}
----
---  Manipulator:Disable() -- disable a manipulator. This immediately removes it from the bone computation, which may result in the bone's position snapping.
-function CManipulator:Disable()
-end
-
----
---  Manipulator:Enable() -- enable a manipulator. Manipulators start out enabled so you only need this after calling Disable().
-function CManipulator:Enable()
-end
-
----
---  Manipulator:SetPrecedence(integer) -- change the precedence of this manipulator. Manipulators with higher precedence run first.
-function CManipulator:SetPrecedence(integer)
-end
-
-function CManipulator:Destroy()
-end
-
-return CManipulator
diff --git a/engine/Sim/CRotateManipulator.lua b/engine/Sim/CRotateManipulator.lua
index 890761e99c..7d81258349 100644
--- a/engine/Sim/CRotateManipulator.lua
+++ b/engine/Sim/CRotateManipulator.lua
@@ -2,6 +2,10 @@
 ---@class moho.RotateManipulator : moho.manipulator_methods
 local CRotateManipulator = {}
 
+---
+function CRotateManipulator:ClearFollowBone()
+end
+
 ---
 --  RotateManipulator:ClearGoal()
 function CRotateManipulator:ClearGoal()
diff --git a/engine/Sim/CSlaveManipulator.lua b/engine/Sim/CSlaveManipulator.lua
index 9798278c8a..b5013348c2 100644
--- a/engine/Sim/CSlaveManipulator.lua
+++ b/engine/Sim/CSlaveManipulator.lua
@@ -2,11 +2,6 @@
 ---@class moho.SlaveManipulator : moho.manipulator_methods
 local CSlaveManipulator = {}
 
----
---  derived from IAniManipulator
-function CSlaveManipulator:base()
-end
-
 ---
 --
 function CSlaveManipulator:SetMaxRate()
diff --git a/engine/Sim/CSlideManipulator.lua b/engine/Sim/CSlideManipulator.lua
index 2118d28dee..9848513e38 100644
--- a/engine/Sim/CSlideManipulator.lua
+++ b/engine/Sim/CSlideManipulator.lua
@@ -2,6 +2,11 @@
 ---@class moho.SlideManipulator : moho.manipulator_methods
 local CSlideManipulator = {}
 
+---
+---@return boolean
+function CSlideManipulator:BeenDestroyed()
+end
+
 ---
 --  CSlideManipulator:SetAcceleration(acc)
 function CSlideManipulator:SetAcceleration(acc)
diff --git a/engine/Sim/Entity.lua b/engine/Sim/Entity.lua
index 6b405df272..8bfd434c59 100644
--- a/engine/Sim/Entity.lua
+++ b/engine/Sim/Entity.lua
@@ -5,6 +5,10 @@ local Entity = {}
 ---@alias Army number
 ---@alias EntityId number
 
+---
+function Entity:AddLocalImpulse(Ix, Iy, Iz, Px, Py, Pz)
+end
+
 ---
 --  Entity:AddManualScroller(scrollSpeed1, scrollSpeed2)
 function Entity:AddManualScroller(scrollSpeed1,  scrollSpeed2)
@@ -322,4 +326,8 @@ end
 function Entity:ShakeCamera(radius,  max,  min,  duration)
 end
 
+--- Sink into the ground
+function Entity:SinkAway(vy)
+end
+
 return Entity
\ No newline at end of file
diff --git a/engine/Sim/IAniManipulator.lua b/engine/Sim/IAniManipulator.lua
new file mode 100644
index 0000000000..47795c72b1
--- /dev/null
+++ b/engine/Sim/IAniManipulator.lua
@@ -0,0 +1,23 @@
+---@declare-global
+---@class moho.manipulator_methods
+local IAniManipulator = {}
+
+---
+function IAniManipulator:Destroy()
+end
+
+--- Disables a manipulator. This immediately removes it from the bone computation,
+--- which may result in the bone's position snapping.
+function IAniManipulator:Disable()
+end
+
+--- Enables a manipulator. Manipulators start out enabled so you only need this after calling `Disable()`.
+function IAniManipulator:Enable()
+end
+
+--- Changes the precedence of this manipulator. Manipulators with higher precedence run first.
+---@param precedence number
+function IAniManipulator:SetPrecedence(precedence)
+end
+
+return IAniManipulator
diff --git a/engine/Sim/Projectile.lua b/engine/Sim/Projectile.lua
index 291c09c55f..62fb2a9c25 100644
--- a/engine/Sim/Projectile.lua
+++ b/engine/Sim/Projectile.lua
@@ -2,6 +2,11 @@
 ---@class moho.projectile_methods : moho.entity_methods
 local Projectile = {}
 
+--- Change the detonate above height for the projectile
+---@param height number
+function Projectile:ChangeDetonateAboveHeight(height)
+end
+
 ---
 --  Change the detonate below height for the projectile
 function Projectile:ChangeDetonateBelowHeight()
diff --git a/engine/Sim/Unit.lua b/engine/Sim/Unit.lua
index 1dc0fb9ba7..309fdf5261 100644
--- a/engine/Sim/Unit.lua
+++ b/engine/Sim/Unit.lua
@@ -4,6 +4,11 @@ local Unit = {}
 
 ---@class UnitId: string
 
+---
+---@param category moho.EntityCategory
+function Unit:AddBuildRestriction(category)
+end
+
 ---@return UnitBlueprint
 function Unit:GetBlueprint()
 end
diff --git a/engine/Sim/UnitWeapon.lua b/engine/Sim/UnitWeapon.lua
index 0dc2e763ab..f8503d15c7 100644
--- a/engine/Sim/UnitWeapon.lua
+++ b/engine/Sim/UnitWeapon.lua
@@ -2,6 +2,11 @@
 ---@class moho.weapon_methods
 local UnitWeapon = {}
 
+---
+---@return boolean
+function UnitWeapon:BeenDestroyed()
+end
+
 ---@return WeaponBlueprint
 function UnitWeapon:GetBlueprint()
 end
diff --git a/engine/moho.lua b/engine/moho.lua
index 96f2b8c783..c99a0eb5ac 100644
--- a/engine/moho.lua
+++ b/engine/moho.lua
@@ -4,24 +4,38 @@
 moho = {
     -- sim
 
-    aibrain_methods = require('/engine/sim/caibrain.lua'),
-    entity_methods = require('/engine/sim/entity.lua'),
-    unit_methods = require('/engine/sim/unit.lua'),
-    projectile_methods = require('/engine/sim/projectile.lua'),
-    prop_methods = require('/engine/sim/prop.lua'),
-    shield_methods = require('/engine/sim/shield.lua'),
-    weapon_methods = require('/engine/sim/unitweapon.lua'),
-    platoon_methods = require('/engine/sim/cplatoon.lua'),
-    CollisionBeamEntity = require('/engine/sim/collisionbeamentity.lua'),
-    SlideManipulator = require('/engine/sim/cslidemanipulator.lua'),
-    IEffect = require('/engine/sim/ieffect.lua'),
+    AimManipulator = require('/engine/Sim/CAimManipulator.lua'),
+    AnimationManipulator = require('/engine/Sim/CAnimationManipulator.lua'),
+    BoneEntityManipulator = require('/engine/Sim/CBoneEntityManipulator.lua'),
+    BuilderArmManipulator = require('/engine/Sim/CBuilderArmManipulator.lua'),
+    CDamage = require('/engine/Sim/CDamage.lua'),
+    CDecalHandle = require('/engine/Sim/CDecalHandle.lua'),
+    CollisionBeamEntity = require('/engine/Sim/CollisionBeamEntity.lua'),
+    CollisionManipulator = require('/engine/Sim/CCollisionManipulator.lua'),
+    EconomyEvent = require('/engine/Sim/CEconomyEvent.lua'),
+    FootPlantManipulator = require('/engine/Sim/CFootPlantManipulator.lua'),
+    IEffect = require('/engine/Sim/IEffect.lua'),
+    MotorFallDown = require('/engine/Sim/MotorFallDown.lua'),
+    RotateManipulator = require('/engine/Sim/CRotateManipulator.lua'),
+    SlaveManipulator = require('/engine/Sim/CSlaveManipulator.lua'),
+    SlideManipulator = require('/engine/Sim/CSlideManipulator.lua'),
+    StorageManipulator = require('/engine/Sim/CStorageManipulator.lua'),
+    ThrustManipulator = require('/engine/Sim/CThrustManipulator.lua'),
 
-    manipulator_methods = require('/engine/sim/ianimanipulator.lua'),
-    BuilderArmManipulator = require('/engine/sim/cbuilderarmmanipulator.lua'),
-    AimManipulator = require('/engine/sim/caimmanipulator.lua'),
-    AnimationManipulator = require('/engine/sim/canimationmanipulator.lua'),
-    CollisionManipulator = require('/engine/sim/ccollisionmanipulator.lua'),
-    RotateManipulator = require('/engine/sim/crotatemanipulator.lua'),
+    aibrain_methods = require('/engine/Sim/CAiBrain.lua'),
+    aipersonality_methods = require('/engine/Sim/CAiPersonality.lua'),
+    CAiAttackerImpl_methods = require('/engine/Sim/CAiAttackerImpl.lua'),
+    blip_methods = require('/engine/Sim/ReconBlip.lua'),
+    entity_methods = require('/engine/Sim/Entity.lua'),
+    manipulator_methods = require('/engine/Sim/IAniManipulator.lua'),
+    navigator_methods = require('/engine/Sim/CAiNavigatorImpl.lua'),
+    projectile_methods = require('/engine/Sim/Projectile.lua'),
+    prop_methods = require('/engine/Sim/Prop.lua'),
+    ScriptTask_Methods = require('/engine/Sim/CUnitScriptTask.lua'),
+    shield_methods = require('/engine/Sim/Shield.lua'),
+    unit_methods = require('/engine/Sim/Unit.lua'),
+    weapon_methods = require('/engine/Sim/UnitWeapon.lua'),
+    platoon_methods = require('/engine/Sim/CPlatoon.lua'),
 
     -- user
 
diff --git a/lua/aipersonality.lua b/lua/aipersonality.lua
index 1919ffcb66..40b756bbb2 100644
--- a/lua/aipersonality.lua
+++ b/lua/aipersonality.lua
@@ -11,6 +11,7 @@
 -- AIPersonality Lua Module              --
 ----------------------------------------------------------------------------------
 
+---@class AIPpersonality : moho.aipersonality_methods
 AIPersonality = Class(moho.aipersonality_methods) {}
 
 AIPersonalityTemplate = {
diff --git a/lua/sim/Blip.lua b/lua/sim/Blip.lua
index bc2bafee0c..3637653d5a 100644
--- a/lua/sim/Blip.lua
+++ b/lua/sim/Blip.lua
@@ -8,7 +8,7 @@
 --**  Copyright © 2006 Gas Powered Games, Inc.  All rights reserved.
 --****************************************************************************
 
----@class Blip
+---@class Blip : moho.blip_methods
 Blip = Class(moho.blip_methods) {
 
     AddDestroyHook = function(self,hook)
diff --git a/lua/sim/Navigator.lua b/lua/sim/Navigator.lua
index cbbacb0ddc..2af46a1b2b 100644
--- a/lua/sim/Navigator.lua
+++ b/lua/sim/Navigator.lua
@@ -10,6 +10,7 @@ NAVSTATUS = {
     Steering = 2,
 }
 
+---@class Navigator: moho.navigator_methods
 Navigator = Class(moho.navigator_methods) {
     
     -- NATIVE METHODS 
diff --git a/lua/sim/Unit.lua b/lua/sim/Unit.lua
index 806512ac33..7cb2f63be0 100644
--- a/lua/sim/Unit.lua
+++ b/lua/sim/Unit.lua
@@ -115,7 +115,7 @@ local function PopulateBlueprintCache(entity, blueprint)
 end
 
 local cUnit = moho.unit_methods
----@class Unit : moho.unit_methods, moho.entity_methods
+---@class Unit : moho.unit_methods
 ---@field Brain AIBrain
 ---@field Buffs {Affects: BlueprintBuff.Affects, buffTable: table<string, table>}
 ---@field Army Army

From a2f057bfb1e8f1ec1ca43c9fefd9664b5c6abd2f Mon Sep 17 00:00:00 2001
From: G C <hdt80bro.phi@gmail.com>
Date: Thu, 14 Jul 2022 11:58:18 -0700
Subject: [PATCH 2/4] Remove `base()`

---
 engine/Sim/CAimManipulator.lua | 5 -----
 engine/Sim/Projectile.lua      | 5 -----
 engine/Sim/Unit.lua            | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/engine/Sim/CAimManipulator.lua b/engine/Sim/CAimManipulator.lua
index dc453db6ab..3ea2295cee 100644
--- a/engine/Sim/CAimManipulator.lua
+++ b/engine/Sim/CAimManipulator.lua
@@ -37,10 +37,5 @@ end
 function CAimManipulator:SetResetPoseTime(resetTime)
 end
 
----
---  derived from IAniManipulator
-function CAimManipulator:base()
-end
-
 return CAimManipulator
 
diff --git a/engine/Sim/Projectile.lua b/engine/Sim/Projectile.lua
index 62fb2a9c25..e43accf78a 100644
--- a/engine/Sim/Projectile.lua
+++ b/engine/Sim/Projectile.lua
@@ -153,9 +153,4 @@ end
 function Projectile:TrackTarget(onoff)
 end
 
----
---  derived from Entity
-function Projectile:base()
-end
-
 return Projectile
\ No newline at end of file
diff --git a/engine/Sim/Unit.lua b/engine/Sim/Unit.lua
index 309fdf5261..b9876a7ffd 100644
--- a/engine/Sim/Unit.lua
+++ b/engine/Sim/Unit.lua
@@ -727,9 +727,4 @@ end
 function Unit:TransportHasSpaceFor(target)
 end
 
----
---  derived from Entity
-function Unit:base()
-end
-
 return Unit
\ No newline at end of file

From 7a212548598d9187aa719b3abfbeb9a07f12c62f Mon Sep 17 00:00:00 2001
From: G C <hdt80bro.phi@gmail.com>
Date: Sat, 16 Jul 2022 11:09:17 -0700
Subject: [PATCH 3/4] Cleanup Lua classes

---
 lua/sim/Attacker.lua   | 68 ++----------------------------------------
 lua/sim/Navigator.lua  | 41 +------------------------
 lua/sim/ScriptTask.lua |  1 +
 3 files changed, 4 insertions(+), 106 deletions(-)

diff --git a/lua/sim/Attacker.lua b/lua/sim/Attacker.lua
index ec43b8d023..21e3ad46c4 100644
--- a/lua/sim/Attacker.lua
+++ b/lua/sim/Attacker.lua
@@ -4,69 +4,5 @@
 --* Copyright © 2008 Gas Powered Games, Inc.  All rights reserved.
 --*****************************************************************************
 
-Attacker = Class(moho.attacker_methods) {
-    
-    -- NATIVE METHODS 
-    --[[
-
-    -- Returns the unit this attacker is bound to.
-    unit GetUnit()
-
-    -- Returns if the attacker has any weapon that is currently attacking any enemies
-    bool AttackerWeaponsBusy()
-
-    -- Return the count of weapons.
-    int GetWeaponCount()
-
-    -- Force the unit to set the given unit as its enemy. AI takes
-    -- care of how to attack the enemy if possible. Each of our
-    -- weapons has its own target, and the AI will do its best to set
-    -- those targets to our specified enemy, but if the weapon is
-    -- unable to fire upon this enemy it will continue searching for
-    -- other things it can attack. If it engages another enemy it
-    -- will continually attempt to acquire the desired target.
-    nil SetDesiredTarget(AITarget)
-    AITarget GetDesiredTarget()
-
-    -- Stop will cease all firing upon enemies or ground
-    -- positions.  However the weapons can still pick up enemies and
-    -- begin firing on their own. Same as SetDesiredTarget(nil)
-    Stop()
-
-    -- Loop through the weapons to see if the target can be attacked
-    bool CanAttackTarget(AITarget)
-
-    -- Find the best enemy target for a weapon
-    entity FindBestEnemy(range)
-
-    -- Loop through the weapons to find one that we can use to attack target
-    index GetTargetWeapon(AITarget)
-
-    -- Loop through the weapons to find our primary weapon
-    index GetPrimaryWeapon()
-
-    -- Loop through the weapons to find the weapon with the longest range that is not manual fire
-    float GetMaxWeaponRange()
-    
-    -- Check if the target is within any weapon range
-    bool IsWithinAttackRange(AITarget)
-    bool IsWithinAttackRange(weaponIndex, AITarget)
-    bool IsWithinAttackRange(position)
-    bool IsWithinAttackRange(weaponIndex, position)
-
-    -- Check if the target is too close to our weapons
-    bool IsTooClose(AITarget)
-
-    -- Check if the target is exempt from being attacked
-    bool IsTargetExempt(entity)
-
-    -- Check if the attack has a slaved weapon that currently has a target
-    AITarget HasSlavedTarget()
-
-    -- Reset reporting state
-    ResetReportingState()
-
-    -- Force to engage enemy target
-    ForceEngage(entity)
-    --]]
-}
+---@class Attacker : moho.CAiAttackerImpl_methods
+Attacker = Class(moho.CAiAttackerImpl_methods) {}
diff --git a/lua/sim/Navigator.lua b/lua/sim/Navigator.lua
index 2af46a1b2b..aa28921123 100644
--- a/lua/sim/Navigator.lua
+++ b/lua/sim/Navigator.lua
@@ -11,43 +11,4 @@ NAVSTATUS = {
 }
 
 ---@class Navigator: moho.navigator_methods
-Navigator = Class(moho.navigator_methods) {
-    
-    -- NATIVE METHODS 
-    --[[
-    -- Set the navigator's destination as a particular position
-    SetGoal(vector)
-
-    -- Set the navigator's destination as another unit (chase/follow)
-    SetDestUnit(Entity *unit)
-
-    -- Abort the current move and put the navigator back to an idle state
-    AbortMove()
-
-    -- Broadcast event to resume any listening task that is currently suspended
-    BroadcastResumeTaskEvent()
-
-    -- Set flag in navigator so the unit will know whether to stop at final goal 
-    -- or speed through it. This would be set to True during a patrol or a series 
-    -- of waypoints in a complex path.
-    SetSpeedThroughGoal(bool flag)
-
-    -- This returns the current navigator target position for the unit.
-    vector GetCurrentTargetPos()
-
-    -- This returns the current goal position of our navigator
-    vector GetGoalPos()
-
-    -- Get the status of the navigator in terms of reaching the destination
-    NAVSTATUS GetStatus()
-    bool HasGoodPath()
-    bool FollowingLeader()
-    
-    IgnoreFormation(bool flag)
-    bool IsIgnorningFormation()
-    
-    bool AtGoal()
-    bool CanPathToGoal(vector)
-    
-    --]]
-}
+Navigator = Class(moho.navigator_methods) {}
diff --git a/lua/sim/ScriptTask.lua b/lua/sim/ScriptTask.lua
index dd3c6e71a7..ca1485548c 100644
--- a/lua/sim/ScriptTask.lua
+++ b/lua/sim/ScriptTask.lua
@@ -55,6 +55,7 @@ AIRESULT = {
     Ignored=3,
 }
 
+---@class ScriptTask : moho.ScriptTask_Methods
 ScriptTask = Class(moho.ScriptTask_Methods) {
 
     -- Called immediately when task is created

From 3f4ca84803fb64e5e3474e9ea3712dabb319574a Mon Sep 17 00:00:00 2001
From: Willem Bart Wijnia <w.b.wijnia@gmail.com>
Date: Sat, 16 Jul 2022 21:25:36 +0200
Subject: [PATCH 4/4] Add comments about unusued class on the Lua end

---
 engine/Sim/CAiNavigatorImpl.lua | 2 +-
 engine/Sim/CDamage.lua          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/engine/Sim/CAiNavigatorImpl.lua b/engine/Sim/CAiNavigatorImpl.lua
index ada0d33f00..8015a8e4d1 100644
--- a/engine/Sim/CAiNavigatorImpl.lua
+++ b/engine/Sim/CAiNavigatorImpl.lua
@@ -1,5 +1,5 @@
 ---@declare-global
----@class moho.navigator_methods
+---@class moho.navigator_methods This particular class is not made approachable in Lua, and it appears to be unfinished implementation-wise. This is therefore merely a dummy class
 local CNavigator = {}
 
 ---
diff --git a/engine/Sim/CDamage.lua b/engine/Sim/CDamage.lua
index 3283aee3e2..62fb632eeb 100644
--- a/engine/Sim/CDamage.lua
+++ b/engine/Sim/CDamage.lua
@@ -1,5 +1,6 @@
 ---@declare-global
----@class moho.CDamage
+---@class moho.CDamage This particular class is not made approachable in Lua, and it appears to be unfinished implementation-wise. This is therefore merely a dummy class
+---@deprecated
 local CDamage = {}
 
 ---