Added manual crouching, and toggle-to-run

Author: Causeless

CHANGELOG.md

@@ -16,10 +16,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	New `Actor` Lua property `JumpHeight` (R) to estimate the jump height of the actor (in metres), based on the actor's jetpack and weight. Actors without a jetpack return 0.  
 	The new function `GetPathFindingFlyingJumpHeight()` can be used to get a jumpHeight that allows flying (i.e infinite jump height). This is also the value that `ACRocket`s and `ACDropships` return for `JumpHeight`.
 
-- Added running.
-	Players on PC can enable running by holding the shift key. TBD add other platforms  
-	When running, you cannot sharpaim or shoot your weapon.  
+- Improved Locomotion.
+	Added the ability to run. When running, you cannot sharpaim whatsoever.
+	Added the ability to manually crouch. When crouching, your sharpaim distance is sligtly increased.
+	Players on PC can enable running by holding the shift key, or crouch by holding control. Players using the arrow keys can use right ctrl/shift. Controllers can run by clicking in the left stick, or crouch by holding the left stick down. Prone on controllers is now performed by clicking in the right stick. SNES/d-pad controllers run using the right bumper.
 	Added new `MovementState` type `RUN` for script.
+	Added new `Controller` state `WALKCROUCH` for crouching, and `PRONE` for prone. The existing `CROUCH` state has been deprecated, as it referred to PRONE. 
 
 - New music system, including a dynamic horizontal sequencing system, under the new music manager `MusicMan`.  
 	`PlayDynamicSong(string songName, string songSectionName, bool playImmediately, bool playTransition, bool smoothFade)` to play a new DynamicSong.

Data/Base.rte/AI/HumanBehaviors.lua

@@ -1223,7 +1223,7 @@ function HumanBehaviors.ShootTarget(AI, Owner, Abort)
 				AI.Ctrl.AnalogAim = SceneMan:ShortestDistance(Owner.Pos, AI.Target.Pos, false).Normalized;
 				if AI.lateralMoveState == Actor.LAT_STILL then
 					AI.proneState = AHuman.PRONE;
-					--AI.Ctrl:SetState(Controller.BODY_CROUCH, true);
+					--AI.Ctrl:SetState(Controller.BODY_PRONE, true);
 				end
 			elseif Owner:EquipFirearm(true) then
 				local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame, just in case the magazine is replenished by another script

Data/Base.rte/AI/NativeHumanAI.lua

@@ -361,7 +361,7 @@ function NativeHumanAI:Update(Owner)
 						local dist = SceneMan:ShortestDistance(Owner.Pos, Leader.Pos, false).Largest;
 						local radius = (Leader.Height + Owner.Height) * 0.5;
 						if dist < radius then
-							local copyControls = {Controller.MOVE_LEFT, Controller.MOVE_RIGHT, Controller.BODY_JUMPSTART, Controller.BODY_JUMP, Controller.BODY_CROUCH};
+							local copyControls = {Controller.MOVE_LEFT, Controller.MOVE_RIGHT, Controller.BODY_JUMPSTART, Controller.BODY_JUMP, Controller.BODY_PRONE};
 							for _, control in pairs(copyControls) do
 								local state = Leader:GetController():IsState(control);
 								self.Ctrl:SetState(control, state);
@@ -634,7 +634,7 @@ function NativeHumanAI:Update(Owner)
 	if self.proneState == AHuman.GOPRONE then
 		self.proneState = AHuman.PRONE;
 	elseif self.proneState == AHuman.PRONE then
-		self.Ctrl:SetState(Controller.BODY_CROUCH, true);
+		self.Ctrl:SetState(Controller.BODY_PRONE, true);
 	end
 
 	if self.lateralMoveState == Actor.LAT_LEFT then

Data/Base.rte/Actors/Shared/Scripts/SelfHeal.lua

@@ -52,7 +52,7 @@ function Update(self)
 			for state = 1, 15 do
 				controller:SetState(state, false);
 			end
-			controller:SetState(Controller.BODY_CROUCH, true);
+			controller:SetState(Controller.BODY_PRONE, true);
 		end
 	elseif self:NumberValueExists("SelfHeal") then
 		self.healing = {};

Data/Base.rte/Devices/Tools/Constructor/Constructor.lua

@@ -434,7 +434,7 @@ function Update(self)
 					cursorMovement = cursorMovement + Vector(0, -1);
 				end
 
-				if ctrl:IsState(Controller.HOLD_DOWN) or ctrl:IsState(Controller.BODY_CROUCH) then
+				if ctrl:IsState(Controller.HOLD_DOWN) or ctrl:IsState(Controller.BODY_PRONE) then
 					cursorMovement = cursorMovement + Vector(0, 1);
 				end
 

Data/Base.rte/Devices/Tools/GrappleGun/Grapple.lua

@@ -275,7 +275,7 @@ function Update(self)
 				end
 
 				-- Hold crouch to control rope manually
-				if controller:IsState(Controller.BODY_CROUCH) then
+				if controller:IsState(Controller.BODY_PRONE) then
 					if self.climb == 1 or self.climb == 2 then
 						if self.climbTimer:IsPastSimMS(self.climbDelay) then
 							self.climbTimer:Reset();
@@ -433,10 +433,10 @@ function Update(self)
 		end
 
 		-- Double tapping crouch retrieves the hook
-		if controller and controller:IsState(Controller.BODY_CROUCH) then
+		if controller and controller:IsState(Controller.BODY_PRONE) then
 			self.pieSelection = 0;
 			if self.canTap == true then
-				controller:SetState(Controller.BODY_CROUCH, false);
+				controller:SetState(Controller.BODY_PRONE, false);
 				self.climb = 0;
 				if self.parentGun ~= nil and self.parentGun.ID ~= rte.NoMOID then
 					self.parentGun:RemoveNumberValue("GrappleMode");

Data/Base.rte/Devices/Tools/GrappleGun/GrappleGun.lua

@@ -37,9 +37,9 @@ function Update(self)
 				if self.Magazine.Scale == 1 then
 					self.StanceOffset = Vector(ToMOSprite(self:GetParent()):GetSpriteWidth(), 1);
 					self.SharpStanceOffset = Vector(ToMOSprite(self:GetParent()):GetSpriteWidth(), 1);
-					if controller and controller:IsState(Controller.BODY_CROUCH) then
+					if controller and controller:IsState(Controller.BODY_PRONE) then
 						if self.canTap then
-							controller:SetState(Controller.BODY_CROUCH, false);
+							controller:SetState(Controller.BODY_PRONE, false);
 							self.tapTimerJump:Reset();
 							self.didTap = true;
 							self.canTap = false;

Data/Base.rte/GUIs/SettingsGUI.ini

@@ -2462,6 +2462,66 @@ Anchor = Left, Top
 ToolTip = None
 Text = [InputKey]
 
+[LabelInputName29]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 355
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName29
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey29]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 355
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey29
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
+[LabelInputName30]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName30
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey30]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey30
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
 [CollectionBoxInputCapture]
 ControlType = COLLECTIONBOX
 Parent = root

Data/Base.rte/GUIs/SettingsPauseGUI.ini

@@ -2463,6 +2463,66 @@ Anchor = Left, Top
 ToolTip = None
 Text = [InputKey]
 
+[LabelInputName29]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 355
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName29
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey29]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 355
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey29
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
+[LabelInputName30]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName30
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey30]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey30
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
 [CollectionBoxInputCapture]
 ControlType = COLLECTIONBOX
 Parent = root

Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Automovers/Controller/Controller.lua

@@ -1658,7 +1658,7 @@ automoverActorFunctions.updateFrozenActor = function(self, actorData)
 			actor.Vel[axis] = gravityAdjustment[axis];
 			if IsAHuman(actor) then
 				ToAHuman(actor).ProneState = AHuman.NOTPRONE;
-				actor:GetController():SetState(Controller.BODY_CROUCH, false);
+				actor:GetController():SetState(Controller.BODY_PRONE, false);
 			end
 		end
 	end
@@ -1706,7 +1706,7 @@ automoverActorFunctions.updateMovingActor = function(self, actorData, anyCenteri
 					verticalRotationAdjustment = direction == Directions.Down and -actor.FlipFactor or 1;
 					ToAHuman(actor).ProneState = movementTable.aHumanProneState;
 				end
-				actorController:SetState(Controller.BODY_CROUCH, movementTable.aHumanCrouchState);
+				actorController:SetState(Controller.BODY_PRONE, movementTable.aHumanCrouchState);
 			end
 			if actor.RotAngle > rotAngleGoal + self.movementAcceleration then
 				actor.RotAngle = actor.RotAngle - (self.movementAcceleration * 0.25 * verticalRotationAdjustment);