Ronin touch-ups; Commander can now perform somersaults

Author: fourZK

Ronin.rte/Actors/Brains/Commander/Head002.bmp

@@ -30,7 +30,9 @@ AddActor = AHuman
 	PresetName = Ronin Commander
 	AddToGroup = Actors
 	AddToGroup = Brains
-	Description = Established Ronin Commander unit. Capable of remote-controlling units like any other commanding Brain. Double-tap Crouch to lunge out!
+	Description = MultiLineText
+		AddLine = Established Ronin Commander unit. Capable of remote-controlling units like any other commanding Brain.
+		AddLine = Press Jump and then Crouch to perform a somersault, or double-tap Crouch to lunge out!
 	Mass = 50
 	GoldValue = 125
 	Sharpness = 1
@@ -109,6 +111,7 @@ AddActor = AHuman
 		PresetName = Ronin Commander Arm FG A
 		SpriteFile = ContentFile
 			FilePath = Ronin.rte/Actors/Brains/Commander/ArmFGA.bmp
+		JointStrength = 300
 		ParentOffset = Vector
 			X = -1
 			Y = -5
@@ -117,6 +120,7 @@ AddActor = AHuman
 		PresetName = Ronin Commander Arm BG A
 		SpriteFile = ContentFile
 			FilePath = Ronin.rte/Actors/Brains/Commander/ArmBGA.bmp
+		JointStrength = 300
 		ParentOffset = Vector
 			X = 4
 			Y = -7
@@ -133,6 +137,7 @@ AddActor = AHuman
 			ParentOffset = Vector
 				X = -11
 				Y = -10
+		JointStrength = 400
 		ParentOffset = Vector
 			X = 1
 			Y = 1
@@ -149,6 +154,7 @@ AddActor = AHuman
 			ParentOffset = Vector
 				X = -11
 				Y = -10
+		JointStrength = 400
 		ParentOffset = Vector
 			X = 4
 			Y = 1

Ronin.rte/Actors/Brains/Commander/Head005.bmp

@@ -2,6 +2,7 @@ function Create(self)
 	self.updateTimer = Timer();
 
 	self.lungeTapDelay = 200;
+	self.frontFlip = {input = {Controller.BODY_JUMP, Controller.BODY_CROUCH}, inputCounter  = 0};
 	self.lungePower = 6;
 	self.tapTimer = Timer();
 
@@ -28,40 +29,70 @@ function Update(self)
 		end
 	end
 	self.Frame = (self.face == 2 and self.Vel.Y > (SceneMan.GlobalAcc.Y * 0.15)) and 3 or self.face;
+	local crouching = self.controller:IsState(Controller.BODY_CROUCH);
 
 	if self:IsPlayerControlled() and self.Status < Actor.DYING and self.FGLeg and self.BGLeg then
-		if self.Status == Actor.UNSTABLE and not self.tapTimer:IsPastSimMS(500) then
-			self.AngularVel = self.AngularVel/(1 + self.Health * 0.001);
-		elseif self.controller:IsState(Controller.BODY_CROUCH) then
-			if self.keyHeld == false then
-				if not self.tapTimer:IsPastSimMS(self.lungeTapDelay) and SceneMan.Scene.GlobalAcc.Magnitude > 10 then
-					local flip = self.FlipFactor;
-					if self.controller:IsState(Controller.MOVE_RIGHT) then
-						flip = 1;
-					elseif self.controller:IsState(Controller.MOVE_LEFT) then
-						flip = -1;
+		if self.Status == Actor.UNSTABLE then
+			if not crouching then
+				local motion = self.Vel.Magnitude * 0.5 + math.abs(self.AngularVel);
+				if self.AngularVel ~= 0 then
+					self.AngularVel = self.AngularVel * (1 - 0.1/motion);
+				end
+				if self.tapTimer:IsPastSimMS(500) and math.cos(self.RotAngle) > 0.9 and motion < 20  then
+					self.tapTimer:Reset();
+					self.Status = Actor.STABLE;
+					self.AngularVel = self.AngularVel * 0.5;
+				end
+			end
+		else
+			--Track the key combo input (jump -> crouch) to trigger frontflip
+			if self.controller:IsState(self.frontFlip.input[self.frontFlip.inputCounter + 1]) then
+				if (self.frontFlip.inputCounter == 0 or not self.tapTimer:IsPastSimMS(self.lungeTapDelay)) then
+					self.frontFlip.inputCounter = self.frontFlip.inputCounter + 1;
+					if self.frontFlip.inputCounter == #self.frontFlip.input then
+						Lunge(self, 8);
+						self.frontFlip.inputCounter = 0;
+						--AudioMan:PlaySound("Ronin.rte/Actors/Brains/Commander/Sounds/Jump.wav", self.Pos);
 					end
-					--Different factors that affect the lunge
-					local vel = (self.Vel.Magnitude^2) * 0.0005 + 1;
-					local ang = math.abs(self.AngularVel * 0.05) + 1;
-					local mass = math.abs(self.Mass * 0.005) + 1;
-					local aimAng = self:GetAimAngle(false);
-					local vertical = math.abs(math.cos(aimAng))/vel;
-					local strength = (self.lungePower/self.MaxHealth) * math.min(self.Health, self.MaxHealth);
-					
-					local jumpVec =	Vector((self.lungePower + strength/vel) * flip, -(self.lungePower * 0.5 + (strength * 0.3)) * vertical):RadRotate(aimAng * self.FlipFactor);
-					
-					self.Vel = self.Vel + jumpVec/mass;
-					self.AngularVel = self.AngularVel - 4/ang * flip * vertical;
-					self.Status = Actor.UNSTABLE;
 					self.tapTimer:Reset();
 				else
-					self.tapTimer:Reset();
-				end	
+					self.frontFlip.inputCounter = 0;
+				end
+			elseif crouching then
+				if not self.keyHeld then
+					if not self.tapTimer:IsPastSimMS(self.lungeTapDelay) and SceneMan.Scene.GlobalAcc.Magnitude > 10 then
+						Lunge(self, 0);
+					else
+						self.tapTimer:Reset();
+					end	
+				end
+				self.keyHeld = true;
+			else
+				self.keyHeld = false;
 			end
-			self.keyHeld = true;
-		else
-			self.keyHeld = false;
 		end
 	end
+end
+
+function Lunge(self, spin)
+	local flip = self.FlipFactor;
+	if self.controller:IsState(Controller.MOVE_RIGHT) then
+		flip = 1;
+	elseif self.controller:IsState(Controller.MOVE_LEFT) then
+		flip = -1;
+	end
+	--Different factors that affect the lunge
+	local vel = (self.Vel.Magnitude^2) * 0.0005 + 1;
+	local ang = math.abs(self.AngularVel * 0.05) + 1;
+	local mass = math.abs(self.Mass * 0.005) + 1;
+	local aimAng = self:GetAimAngle(false);
+	local vertical = math.abs(math.cos(aimAng))/vel;
+	local strength = (self.lungePower/self.MaxHealth) * math.min(self.Health, self.MaxHealth);
+	
+	local jumpVec =	Vector((self.lungePower + strength/vel) * flip, -(self.lungePower * 0.5 + (strength * 0.3)) * vertical):RadRotate(aimAng * self.FlipFactor);
+	
+	self.Vel = self.Vel + jumpVec/mass;
+	self.AngularVel = self.AngularVel - (2/ang * vertical + spin) * flip;
+	self.Status = Actor.UNSTABLE;
+	self.tapTimer:Reset();
 end