Merge pull request #33 from cortex-command-community/4zK-content

4zk's content update #2: Base.rte v0.1.1

Author: garethyr

Base.rte/AI/CrabBehaviors.lua

@@ -2,9 +2,10 @@
 CrabBehaviors = {}
 
 function CrabBehaviors.LookForTargets(AI, Owner)
-	local viewAngDeg = RangeRand(35, 85)
+	local viewAngDeg = RangeRand(35, 85) * Owner.Perceptiveness
 	if AI.deviceState == AHuman.AIMING then
-		viewAngDeg = 20
+		AI.Ctrl:SetState(Controller.AIM_SHARP, true)
+		viewAngDeg = 20 * Owner.Perceptiveness
 	end
 
 	local HitPoint

Base.rte/AI/HumanAI.lua

@@ -1,10 +1,10 @@
 dofile("Base.rte/Constants.lua")
 require("AI/NativeHumanAI")
-require("AI/HumanFunctions");
+require("AI/HumanFunctions")
 
 function Create(self)
 	self.AI = NativeHumanAI:Create(self);
-	-- You can turn features on and off here
+	--You can turn features on and off here
 	self.armSway = true;
 	self.automaticEquip = true;
 	self.alternativeGib = true;
@@ -21,10 +21,10 @@ function Update(self)
 		HumanFunctions.DoAutomaticEquip(self);
 	end
 	if self.armSway then
-		HumanFunctions.DoArmSway(self, 10);	-- Argument: shove strength
+		HumanFunctions.DoArmSway(self, (self.Health / self.MaxHealth));	--Argument: shove strength
 	end
 	if self.visibleInventory then
-		HumanFunctions.DoVisibleInventory(self, false);	--  Argument: whether to show all items
+		HumanFunctions.DoVisibleInventory(self, false);	--Argument: whether to show all items
 	end
 end
 function UpdateAI(self)

Base.rte/AI/HumanBehaviors.lua

@@ -36,10 +36,10 @@ end
 
 -- spot targets by casting a ray in a random direction
 function HumanBehaviors.LookForTargets(AI, Owner, Skill)
-	local viewAngDeg = RangeRand(50, 120) * (0.5 + Skill / 200)
+	local viewAngDeg = RangeRand(50, 120) * Owner.Perceptiveness * (0.5 + Skill / 200)
 	if AI.deviceState == AHuman.AIMING then
 		AI.Ctrl:SetState(Controller.AIM_SHARP, true)	-- reinforce sharp aim controller state to enable SharpLength in LookForMOs
-		viewAngDeg = 15 + (Skill / 10)
+		viewAngDeg = 15 * Owner.Perceptiveness + (Skill / 10)
 	end
 
 	local FoundMO = Owner:LookForMOs(viewAngDeg, rte.grassID, false)
@@ -500,6 +500,13 @@ function HumanBehaviors.Sentry(AI, Owner, Abort)
 				elseif AI.SentryFacing and Owner.HFlipped ~= AI.SentryFacing then
 					Owner.HFlipped = AI.SentryFacing	-- turn to the direction we have been order to guard
 					break	-- restart this behavior
+				elseif math.random() < Owner.Perceptiveness then
+				
+					-- turn around occasionally if there is open space behind our back
+					local backAreaRay = Vector(-math.random(FrameMan.PlayerScreenWidth/4, FrameMan.PlayerScreenWidth/2) * Owner.FlipFactor, 0):DegRotate(math.random(-25, 25) * Owner.Perceptiveness)
+					if not SceneMan:CastStrengthRay(Owner.EyePos, backAreaRay, 10, Vector(), 10, rte.grassID, SceneMan.SceneWrapsX) then
+						Owner.HFlipped = Owner.FlipFactor == 1 and true or false
+					end
 				end
 			end
 		end

Base.rte/AI/HumanFunctions.lua

@@ -1,17 +1,17 @@
 HumanFunctions = {};
 
 function HumanFunctions.DoAlternativeGib(actor)
-	-- Detach limbs instead of regular gibbing
+	--Detach limbs instead of regular gibbing
 	if not actor.detachLimit then
 		actor.detachLimit = actor.GibWoundLimit;
 		actor.GibWoundLimit = actor.GibWoundLimit * 1.5;
 	end
 	if actor.WoundCount > actor.detachLimit then
 		actor.detachLimit = actor.WoundCount + 1;
-		local parts = {actor.BGArm, actor.BGLeg, actor.FGArm, actor.FGLeg, actor.Head};	-- Piority order
+		local parts = {actor.BGArm, actor.BGLeg, actor.FGArm, actor.FGLeg, actor.Head};	--Piority order
 		local mostWounds = -1;
 		local detachLimb;
-		-- Pick the limb with most wounds and detach it
+		--Pick the limb with most wounds and detach it
 		for i = 1, #parts do
 			local limb = parts[i];
 			if limb and limb.WoundCount > mostWounds then
@@ -26,87 +26,101 @@ function HumanFunctions.DoAlternativeGib(actor)
 end
 
 function HumanFunctions.DoAutomaticEquip(actor)
-	-- Equip a weapon automatically if the one held by a player is destroyed
+	--Equip a weapon automatically if the one held by a player is destroyed
 	if actor:IsPlayerControlled() and actor.EquippedItem == nil and actor.InventorySize > 0 and not actor.controller:IsState(Controller.WEAPON_FIRE) then
 		actor:EquipFirearm(true);
 	end
 end
 
 function HumanFunctions.DoArmSway(actor, pushStrength)
-	-- Control arm movements
-	if not actor.lastHandPos then
-		actor.lastAngle = actor:GetAimAngle(false);
+	--Control arm movements
+	local aimAngle = actor:GetAimAngle(false);
+	if not actor.lastHandPos then	--Initialize
+		actor.lastAngle = aimAngle;
 		actor.lastHandPos = {actor.Pos, actor.Pos};
 	end
 	if actor.controller:IsMouseControlled() then
-		-- Flail around if moving mouse too fast
+		--Flail around if moving mouse too fast
 		local mouseVec = Vector(actor.controller.MouseMovement.X, actor.controller.MouseMovement.Y):SetMagnitude(math.sqrt(actor.controller.MouseMovement.Magnitude));
-		local ang = actor.lastAngle - actor:GetAimAngle(false);
+		local ang = actor.lastAngle - aimAngle;
 
 		actor.AngularVel = actor.AngularVel - (2 * ang * actor.FlipFactor + mouseVec.Y * actor.FlipFactor /10) /math.sqrt(math.abs(actor.AngularVel) + 1);
 
-		actor.lastAngle = actor:GetAimAngle(false);
+		actor.lastAngle = aimAngle;
 	end
-	-- Shove when unarmed
+	--Shove when unarmed
 	if actor.controller:IsState(Controller.WEAPON_FIRE) and (actor.FGArm or actor.BGArm) and not (actor.EquippedItem or actor.EquippedBGItem) and actor.Status == Actor.STABLE then
-		actor.AngularVel = actor.AngularVel /(actor.shoved and 1.5 or 3) + (actor:GetAimAngle(false) - actor.RotAngle * actor.FlipFactor - 1.57) * (actor.shoved and 0.5 or 3) * actor.FlipFactor /(1 + math.abs(actor.RotAngle));
+		actor.AngularVel = actor.AngularVel /(actor.shoved and 1.3 or 3) + (aimAngle - actor.RotAngle * actor.FlipFactor - 1.57) * (actor.shoved and 0.3 or 3) * actor.FlipFactor /(1 + math.abs(actor.RotAngle));
 		if not actor.shoved then
-			actor.Vel = actor.Vel + Vector(3 /(1 + actor.Vel.Magnitude), 0):RadRotate(actor:GetAimAngle(true)) * math.abs(math.cos(actor:GetAimAngle(true)));
+			actor.Vel = actor.Vel + Vector(2 /(1 + actor.Vel.Magnitude), 0):RadRotate(actor:GetAimAngle(true)) * math.abs(math.cos(actor:GetAimAngle(true)));
 			actor.shoved = true;
 		end
 	else
 		actor.shoved = false;
 	end
-	local arms = {{actor.FGArm, actor.FGLeg, actor.BGLeg}, {actor.BGArm, actor.BGLeg, actor.FGLeg}};
-	for i = 1, #arms do
-		local arm = arms[i][1];
+	local armPairs = {{actor.FGArm, actor.FGLeg, actor.BGLeg}, {actor.BGArm, actor.BGLeg, actor.FGLeg}};
+	for i = 1, #armPairs do
+		local arm = armPairs[i][1];
 		if arm then
-			local arm = ToArm(arms[i][1]);
+			arm = ToArm(arm);
+			
 			local armLength = ToMOSprite(arm):GetSpriteWidth();
 			local rotAng = actor.RotAngle - (1.57 * actor.FlipFactor);
-			local legMain = arms[i][2];
-			local legAlt = arms[i][3];
+			local legMain = armPairs[i][2];
+			local legAlt = armPairs[i][3];
 
 			if actor.controller:IsState(Controller.MOVE_LEFT) or actor.controller:IsState(Controller.MOVE_RIGHT) then
-				if legAlt then
-					rotAng = legAlt.RotAngle;
-				elseif legMain then
-					rotAng = -legMain.RotAngle + math.pi;
-				end
+				rotAng = (legAlt and legAlt.RotAngle) or (legMain and (-legMain.RotAngle + math.pi) or rotAng);
 			elseif legMain then
 				rotAng = legMain.RotAngle;
 			end
-			-- Flail arms in tandem with leg movement
-			ToArm(arm).IdleOffset = Vector(0, armLength * 0.7):RadRotate(rotAng * actor.FlipFactor + 1.5 + (i /5));
-			
+			--Flail arms in tandem with leg movement or raise them them up for a push if aiming
+			if actor.controller:IsState(Controller.AIM_SHARP) then
+				arm.IdleOffset = Vector(0, 1):RadRotate(aimAngle);
+			else
+				arm.IdleOffset = Vector(0, (armLength + arm.SpriteOffset.X) * 1.1):RadRotate(rotAng * actor.FlipFactor + 1.5 + (i /5));
+			end
 			if actor.shoved or (actor.EquippedItem and IsTDExplosive(actor.EquippedItem) and actor.controller:IsState(Controller.WEAPON_FIRE)) then
-				arm.IdleOffset = Vector(armLength, 0):RadRotate(actor:GetAimAngle(false));
-				local dist = SceneMan:ShortestDistance(actor.lastHandPos[i], arm.HandPos, SceneMan.SceneWrapsX);
-		
-				local dots = math.sqrt(arm.Radius) * (arm.Frame /arm.FrameCount);
-				
+				arm.IdleOffset = Vector(armLength + (pushStrength * armLength), 0):RadRotate(aimAngle);
+				local handVector = SceneMan:ShortestDistance(actor.lastHandPos[i], arm.HandPos, SceneMan.SceneWrapsX);
+				--Diminish hand relocation vector to potentially prevent post-superhuman pushing powers
+				handVector:SetMagnitude(handVector.Magnitude / (1 + handVector.Magnitude / 100));
+				--Emphasize the first frames that signify contracted arm = highest potential energy
+				local dots = math.sqrt(arm.Radius) / (1 + arm.Frame /arm.FrameCount);
+				local armStrength = (arm.Mass + arm.Material.StructuralIntegrity) * pushStrength;
 				for i = 1, dots do
 					local part = CreateMOPixel("Smack Particle Light");
 					part.Pos = arm.HandPos;
-					part.Vel = (actor.Vel + dist):SetMagnitude(math.sqrt(dist.Magnitude * pushStrength + math.abs(actor.AngularVel) * actor.Vel.Magnitude)):RadRotate(0.8 /dots * i) + Vector(0, -0.5);
-					part.Mass = (arm.Mass + arm.Material.StructuralIntegrity) * pushStrength;	part.Sharpness = math.random() * 0.1;
+					part.Vel = Vector(handVector.X, handVector.Y):RadRotate(RangeRand(-0.1, 0.1)) * pushStrength + Vector(0, -0.5);
+					part.Mass = armStrength;	part.Sharpness = math.random() * 0.1;
 					part.Team = actor.Team;	part.IgnoresTeamHits = true;
 					MovableMan:AddParticle(part);
 				end
+				--Apply some additional forces if the travel vector of the moving hand is half an arms length
+				if handVector.Magnitude > (armLength /2) then
+					local moCheck = SceneMan:GetMOIDPixel(arm.HandPos.X, arm.HandPos.Y)
+					if moCheck ~= rte.NoMOID then
+						local mo = MovableMan:GetMOFromID(MovableMan:GetMOFromID(moCheck).RootID);
+						if mo and mo.Team ~= actor.Team and IsActor(mo) and actor.Mass > (mo.Mass / 2) then
+							mo:AddForce(handVector * (actor.Mass / 2), Vector());
+							ToActor(mo).Status = Actor.UNSTABLE;
+						end
+					end
+				end
 			end
 			actor.lastHandPos[i] = arm.HandPos;
 		end
 	end
 end
 
 function HumanFunctions.DoVisibleInventory(actor, showAll)
-	-- Visualize inventory with primitive bitmaps
+	--Visualize inventory with primitive bitmaps
 	if actor.Status < Actor.DYING and not actor:IsInventoryEmpty() then
 		local heldCount, thrownCount, largestItem = 0, 0, 0;
 		for i = 1, actor.InventorySize do
 			local item = actor:Inventory();
 			if item then
-				local fixNum = actor.HFlipped and -1 or 0;	-- Fix offsets slightly when facing left
+				local fixNum = actor.HFlipped and -1 or 0;	--Fix offsets slightly when facing left
 				if item.ClassName == "TDExplosive" then
 					thrownCount = thrownCount + 1;
 				elseif item.ClassName == "HDFirearm" or item.ClassName == "HeldDevice" then
@@ -119,16 +133,13 @@ function HumanFunctions.DoVisibleInventory(actor, showAll)
 
 						fixNum = fixNum + item.Radius * 0.2 + math.sqrt(heldCount);
 
-						-- Bigger actors carry weapons higher up, smaller weapons are carried lower down
+						--Bigger actors carry weapons higher up, smaller weapons are carried lower down
 						local drawPos = actor.Pos + Vector((-actorSize - fixNum) * actor.FlipFactor, -actorSize - itemSize + 1 + isFirearm * 3):RadRotate(actor.RotAngle);
 
 						local itemCount = math.sqrt(math.abs(actor.InventorySize - thrownCount));
-						
-						-- Display tall objects upright
-						local tallAng = 1.57;
-						if ToMOSprite(item):GetSpriteWidth() < ToMOSprite(item):GetSpriteHeight() then
-							tallAng = 0;
-						end
+						--Display tall objects upright
+						local tallAng = ToMOSprite(item):GetSpriteWidth() > ToMOSprite(item):GetSpriteHeight() and 1.57 or 0;
+
 						local tilt = 0.3;
 						local rotAng = actor.RotAngle + tallAng + (heldCount * tilt - itemCount * tilt + isFirearm /itemSize) /itemCount * actor.FlipFactor;
 

Base.rte/AI/NativeDropShipAI.lua

@@ -16,11 +16,16 @@ function NativeDropShipAI:Create(Owner)
 
 	Members.LastAIMode = Actor.AIMODE_NONE
 
+	local item = Owner:Inventory();
+	if item and IsTDExplosive(item) then
+		Members.AIMode = Actor.AIMODE_BOMB;
+	end
+	
 	-- The drop ship tries to hover this many pixels above the ground
 	if Members.AIMode == Actor.AIMODE_BRAINHUNT then
 		Members.hoverAlt = Owner.Radius * 1.7
 	elseif Members.AIMode == Actor.AIMODE_BOMB then
-		Members.hoverAlt = Owner.Radius * 7
+		Members.hoverAlt = Owner.Radius * 6
 	else
 		Members.hoverAlt = Owner.Radius * 2	
 	end