Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conform /Engine/Sim/ to Moho #4047

Merged
merged 5 commits into from
Jul 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions engine/Sim/CAiAttackerImpl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 5 additions & 1 deletion engine/Sim/CAiNavigatorImpl.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
---@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 = {}

---
function CNavigator:AbortMove()
end

---
--
function CNavigator:AtGoal()
Expand Down
4 changes: 4 additions & 0 deletions engine/Sim/CAiPersonality.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
---@class moho.aipersonality_methods
local CAiPersonality = {}

---
function CAiPersonality:AdjustDelay()
end

---
-- CAiPersonality:GetAirUnitsEmphasis()
function CAiPersonality:GetAirUnitsEmphasis()
Expand Down
10 changes: 5 additions & 5 deletions engine/Sim/CAimManipulator.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
---@class moho.AimManipulator : moho.manipulator_methods
local CAimManipulator = {}

---
---@return number
function CAimManipulator:GetHeadingPitch()
end

---
-- AimManipulator:OnTarget()
function CAimManipulator:OnTarget()
Expand Down Expand Up @@ -32,10 +37,5 @@ end
function CAimManipulator:SetResetPoseTime(resetTime)
end

---
-- derived from IAniManipulator
function CAimManipulator:base()
end

return CAimManipulator

5 changes: 5 additions & 0 deletions engine/Sim/CAnimationManipulator.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
---@class moho.AnimationManipulator : moho.manipulator_methods
local CAnimationManipulator = {}

---
---@return number
function CAnimationManipulator:GetAnimationDuration()
end

---
-- fraction = AnimationManipulator:GetAnimationFraction()
function CAnimationManipulator:GetAnimationFraction()
Expand Down
5 changes: 5 additions & 0 deletions engine/Sim/CBuilderArmManipulator.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions engine/Sim/CCollisionManipulator.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,5 @@ end
function CCollisionManipulator:WatchBone(bone)
end

---
-- derived from IAniManipulator
function CCollisionManipulator:base()
end

return CCollisionManipulator

8 changes: 7 additions & 1 deletion engine/Sim/CDamage.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
---@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 = {}

---
---@return Entity
function CDamage:GetInstigator()
end

---
-- CDamage:GetTarget()
function CDamage:GetTarget()
Expand Down
3 changes: 1 addition & 2 deletions engine/Sim/CFootPlantManipulator.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---@declare-global
---@class moho.EconomyEvent : moho.manipulator_methods
---@class moho.FootPlantManipulator : moho.manipulator_methods
local CFootPlantManipulator = {}

return CFootPlantManipulator

22 changes: 0 additions & 22 deletions engine/Sim/CManipulator.lua

This file was deleted.

4 changes: 4 additions & 0 deletions engine/Sim/CRotateManipulator.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
---@class moho.RotateManipulator : moho.manipulator_methods
local CRotateManipulator = {}

---
function CRotateManipulator:ClearFollowBone()
end

---
-- RotateManipulator:ClearGoal()
function CRotateManipulator:ClearGoal()
Expand Down
5 changes: 0 additions & 5 deletions engine/Sim/CSlaveManipulator.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
---@class moho.SlaveManipulator : moho.manipulator_methods
local CSlaveManipulator = {}

---
-- derived from IAniManipulator
function CSlaveManipulator:base()
end

---
--
function CSlaveManipulator:SetMaxRate()
Expand Down
5 changes: 5 additions & 0 deletions engine/Sim/CSlideManipulator.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 8 additions & 0 deletions engine/Sim/Entity.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -325,4 +329,8 @@ end
function Entity:ShakeCamera(radius, max, min, duration)
end

--- Sink into the ground
function Entity:SinkAway(vy)
end

return Entity
23 changes: 23 additions & 0 deletions engine/Sim/IAniManipulator.lua
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions engine/Sim/Projectile.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 above height for the projectile, relative to the terrain
---@param height number
function Projectile:ChangeDetonateAboveHeight(height)
Expand Down
16 changes: 9 additions & 7 deletions engine/Sim/Unit.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ local Unit = {}

---@alias LayerName "Air" | "Land" | "Orbital" | "Seabed" | "Sub" | "Water"

---@return UnitBlueprint
function Unit:GetBlueprint()

---
---@param category moho.EntityCategory
function Unit:AddBuildRestriction(category)
end

--- Add a command cap to a unit.
Expand Down Expand Up @@ -118,6 +120,11 @@ end
function Unit:GetBlip(army)
end

---
---@return UnitBlueprint
function Unit:GetBlueprint()
end

--- Returns the build rate of a unit.
-- What fraction of target unit it builds per second.
-- @return rate
Expand Down Expand Up @@ -735,9 +742,4 @@ end
function Unit:TransportHasSpaceFor(target)
end

---
-- derived from Entity
function Unit:base()
end

return Unit
4 changes: 4 additions & 0 deletions engine/Sim/UnitWeapon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ local UnitWeapon = {}
function UnitWeapon:BeenDestroyed()
end

---@return WeaponBlueprint
function UnitWeapon:GetBlueprint()
end

---
---@return boolean
function UnitWeapon:CanFire()
Expand Down
48 changes: 31 additions & 17 deletions engine/moho.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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'),

-- core (both sim and user)

Expand Down
1 change: 1 addition & 0 deletions lua/aipersonality.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
-- AIPersonality Lua Module --
----------------------------------------------------------------------------------

---@class AIPpersonality : moho.aipersonality_methods
AIPersonality = Class(moho.aipersonality_methods) {}

AIPersonalityTemplate = {
Expand Down
Loading