Merge pull request #109 from cortex-command-community/4zk-content

4zK's big-fuckall:tm: data PR b4 pre4

Author: garethyr

Base.rte/AI/CrabBehaviors.lua

@@ -44,7 +44,7 @@ function CrabBehaviors.LookForTargets(AI, Owner)
 					FoundMO = ToACRocket(FoundMO)
 				elseif FoundMO.ClassName == "ACDropShip" then
 					FoundMO = ToACDropShip(FoundMO)
-				elseif FoundMO.ClassName == "ADoor" and HumanBehaviors.GetProjectileData(Owner).pen * 0.9 > ToADoor(FoundMO).Door.Material.StructuralIntegrity then
+				elseif FoundMO.ClassName == "ADoor" and FoundMO.Team ~= Activity.NOTEAM and Owner.AIMode ~= Actor.AIMODE_SENTRY and ToADoor(FoundMO).Door and ToADoor(FoundMO).Door:IsAttached() and HumanBehaviors.GetProjectileData(Owner).pen * 0.9 > ToADoor(FoundMO).Door.Material.StructuralIntegrity then
 					FoundMO = ToADoor(FoundMO)
 				elseif FoundMO.ClassName == "Actor" then
 					FoundMO = ToActor(FoundMO)

Base.rte/AI/HumanAI.lua

@@ -6,13 +6,16 @@ function Create(self)
 	self.AI = NativeHumanAI:Create(self);
 	--You can turn features on and off here
 	self.armSway = true;
-	self.automaticEquip = true;
 	self.alternativeGib = true;
-	self.visibleInventory = true;
+	self.visibleInventory = false;
 end
 function Update(self)
 	self.controller = self:GetController();
-	
+	--Order the AI of this actor to stop running around if selected by player
+	if self.AI.scatter and self:IsPlayerControlled() then
+		self.AIMode = Actor.AIMODE_SENTRY;
+		self.AI.scatter = false;
+	end
 	if self.alternativeGib then
 		HumanFunctions.DoAlternativeGib(self);
 	end

Base.rte/AI/HumanBehaviors.lua

@@ -205,9 +205,7 @@ function HumanBehaviors.ProcessAlarmEvent(AI, Owner)
 					if ID ~= rte.NoMOID then
 						local FoundMO = MovableMan:GetMOFromID(ID)
 						if FoundMO then
-							if ID ~= FoundMO.RootID then
-								FoundMO = MovableMan:GetMOFromID(FoundMO.RootID)
-							end
+							FoundMO = FoundMO:GetRootParent()
 
 							if not FoundMO.EquippedItem or not FoundMO.EquippedItem:HasObjectInGroup("Weapons - Explosive") then
 								FoundMO = nil	-- don't shoot at without weapons or actors using tools
@@ -2326,7 +2324,7 @@ function HumanBehaviors.ShootTarget(AI, Owner, Abort)
 						aimTarget = Dist.AbsRadAngle
 						AI.canHitTarget = true
 						if Owner.InventorySize > 0 then	-- we have more things in the inventory
-							if range < 60 and Owner:HasObjectInGroup("Tools - Diggers") then
+							if range < 60 and (Owner:HasObjectInGroup("Tools - Diggers") or Owner:HasObjectInGroup("Weapons - Melee")) then
 								AI:CreateHtHBehavior(Owner)
 								break
 							elseif Owner:EquipLoadedFirearmInGroup("Any", "Weapons - Explosive", true) then
@@ -2768,7 +2766,7 @@ function HumanBehaviors.ThrowTarget(AI, Owner, Abort)
 								local maxAim = aim
 
 								-- try again with an average throw vel
-								aim = HumanBehaviors.GetGrenadeAngle(AimPoint, Vector(), Grenade.MuzzlePos, (maxThrowVel + minThrowVel)/2)
+								aim = HumanBehaviors.GetGrenadeAngle(AimPoint, Vector(), Grenade.MuzzlePos, (maxThrowVel + minThrowVel) * 0.5)
 								if aim then
 									aimTime = Owner.ThrowPrepTime * RangeRand(0.45, 0.55)
 								else

Base.rte/AI/HumanFunctions.lua

@@ -56,29 +56,10 @@ function HumanFunctions.DoAlternativeGib(actor)
 		end
 	end
 end
-	
-function HumanFunctions.DoAutomaticEquip(actor)
-	--Equip a weapon automatically if the one held by a player is destroyed (To-do: move this to cpp?)
-	if actor.EquippedItem == nil and not actor.controller:IsState(Controller.WEAPON_FIRE) and (actor:IsPlayerControlled() or actor:UnequipBGArm()) then
-		actor:EquipFirearm(true);
-	end
-end
 
 function HumanFunctions.DoArmSway(actor, pushStrength)
 	local aimAngle = actor:GetAimAngle(false);
-	if actor.weight then
-		actor:RemoveAttachable(actor.weight);
-		actor.weight = nil;
-	end
 	if actor.Status == Actor.STABLE and actor.lastHandPos then
-		--Unequip weapons by pressing both weapon switch keys at once
-		if actor.controller:IsState(Controller.WEAPON_CHANGE_NEXT) and actor.controller:IsState(Controller.WEAPON_CHANGE_PREV) then
-			local item = CreateHeldDevice("Null Item");
-			actor:AddInventoryItem(item);
-			actor:EquipNamedDevice("Null Item", true);
-			item.ToDelete = true;
-		end
-		--Control arm movements
 		--Flail around if aiming around too fast
 		local angleMovement = actor.lastAngle - aimAngle;
 		actor.AngularVel = actor.AngularVel - (2 * angleMovement * actor.FlipFactor)/(math.abs(actor.AngularVel) * 0.1 + 1);
@@ -99,7 +80,7 @@ function HumanFunctions.DoArmSway(actor, pushStrength)
 			if arm then
 				arm = ToArm(arm);
 
-				local armLength = ToMOSprite(arm):GetSpriteWidth();
+				local armLength = arm.MaxLength;
 				local rotAng = actor.RotAngle - (1.57 * actor.FlipFactor);
 				local legMain = armPairs[i][2];
 				local legAlt = armPairs[i][3];
@@ -113,7 +94,7 @@ function HumanFunctions.DoArmSway(actor, pushStrength)
 				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 * 0.2));
+					arm.IdleOffset = Vector(0, armLength * 0.7):RadRotate(rotAng * actor.FlipFactor + 1.5 + (i * 0.2));
 				end
 				if actor.shoved or (actor.EquippedItem and IsTDExplosive(actor.EquippedItem) and actor.controller:IsState(Controller.WEAPON_FIRE)) then
 					arm.IdleOffset = Vector(armLength + (pushStrength * armLength), 0):RadRotate(aimAngle);
@@ -138,11 +119,10 @@ function HumanFunctions.DoArmSway(actor, pushStrength)
 					if actor.Mass > mo.Mass then
 						ToActor(mo).Status = Actor.UNSTABLE;
 						--Simulate target actor weight with an attachable
-						if not actor.weight then
-							actor.weight = CreateAttachable("Null Attachable");
-							actor.weight.Mass = mo.Mass;
-							actor:AddAttachable(actor.weight);
-						end
+						local weight = CreateAttachable("Null Attachable");
+						weight.Mass = mo.Mass;
+						weight.Lifetime = 1;
+						actor:AddAttachable(weight);
 						local shoveVel = shove.Vector/rte.PxTravelledPerFrame;
 						mo.Vel = mo.Vel * 0.5 + shoveVel:SetMagnitude(math.min(shoveVel.Magnitude, math.sqrt(actor.IndividualDiameter))) - SceneMan.GlobalAcc * GetMPP() * rte.PxTravelledPerFrame;
 						mo.AngularVel = (aimAngle - actor.lastAngle) * actor.FlipFactor * math.pi;
@@ -194,4 +174,31 @@ function HumanFunctions.DoVisibleInventory(actor, showAll)
 			end
 		end
 	end
+end
+--Lunge forward, preferably as result of some dedicated input. Returns horizontal direction of lunge. (TODO: move this into another table?)
+function HumanFunctions.Lunge(actor, power)
+	local flip = 0;
+	if actor.Status == Actor.STABLE then
+		flip = actor.FlipFactor;
+		if actor.controller:IsState(Controller.MOVE_RIGHT) then
+			flip = 1;
+		elseif actor.controller:IsState(Controller.MOVE_LEFT) then
+			flip = -1;
+		end
+		--Different factors that affect the lunge
+		local angVel = math.abs(actor.AngularVel * 0.1) + 1;
+		local vel = (actor.Vel.Magnitude + angVel)^2 * 0.0005 + 1;
+		local mass = math.abs(actor.Mass * 0.005) + 1;
+		local aimAng = actor:GetAimAngle(false);
+		local vertical = math.abs(math.cos(aimAng))/vel;
+		local strength = power * math.min(actor.Health/actor.MaxHealth, 1);
+		
+		local jumpVec =	Vector((power + strength/vel) * flip, -(power * 0.5 + (strength * 0.3)) * vertical):RadRotate(aimAng * actor.FlipFactor);
+		
+		actor.Vel = actor.Vel + jumpVec/mass;
+		actor.AngularVel = actor.AngularVel - (1/angVel * vertical) * flip * math.cos(actor.RotAngle);
+		actor.Status = Actor.UNSTABLE;
+		actor.tapTimer:Reset();
+	end
+	return flip;
 end

Base.rte/AI/NativeHumanAI.lua

@@ -18,7 +18,6 @@ function NativeHumanAI:Create(Owner)
 
 	Members.squadShoot = false
 	Members.useMedikit = false
-	Members.scatter = false
 
 	-- timers
 	Members.AirTimer = Timer()
@@ -251,6 +250,7 @@ function NativeHumanAI:Update(Owner)
 	-- look for targets
 	local FoundMO, HitPoint = self.SpotTargets(self, Owner, self.skill)	
 	if FoundMO then
+		--TODO: decide whether to attack based on the material strength of found MO
 		if self.Target and MovableMan:ValidMO(self.Target) and FoundMO.ID == self.Target.ID then	-- found the same target
 			self.OldTargetPos = Vector(self.Target.Pos.X, self.Target.Pos.Y)
 			self.TargetOffset = SceneMan:ShortestDistance(self.Target.Pos, HitPoint, false)
@@ -278,8 +278,7 @@ function NativeHumanAI:Update(Owner)
 					FoundMO = ToACRocket(FoundMO)
 				elseif FoundMO.ClassName == "ACDropShip" then
 					FoundMO = ToACDropShip(FoundMO)
-				elseif FoundMO.ClassName == "ADoor" and Owner.AIMode ~= Actor.AIMODE_SENTRY and ToADoor(FoundMO).Door and ToADoor(FoundMO).Door:IsAttached()
-				and (Owner:EquipNamedDevice("Heavy Digger", true) or (Owner.FirearmIsReady and HumanBehaviors.GetProjectileData(Owner).pen * 0.9 > ToADoor(FoundMO).Door.Material.StructuralIntegrity)) then
+				elseif FoundMO.ClassName == "ADoor" and FoundMO.Team ~= Activity.NOTEAM and Owner.AIMode ~= Actor.AIMODE_SENTRY and ToADoor(FoundMO).Door and ToADoor(FoundMO).Door:IsAttached() then
 					FoundMO = ToADoor(FoundMO)
 				elseif FoundMO.ClassName == "Actor" then
 					FoundMO = ToActor(FoundMO)
@@ -324,7 +323,8 @@ function NativeHumanAI:Update(Owner)
 			end
 		end
 	end
-
+	
+	self.squadShoot = false
 	if Owner.MOMoveTarget then
 		-- make the last waypoint marker stick to the MO we are following
 		if MovableMan:ValidMO(Owner.MOMoveTarget) then
@@ -558,7 +558,7 @@ function NativeHumanAI:Update(Owner)
 					self.useMedikit = Owner:EquipNamedDevice("Medikit", true)
 				else
 					self.useMedikit = false
-					if self.scatter ~= true and Owner.AIMode == Actor.AIMODE_SENTRY then
+					if not self.scatter and Owner.AIMode == Actor.AIMODE_SENTRY then
 						Owner.AIMode = Actor.AIMODE_PATROL
 						self.scatter = true
 					end
@@ -567,6 +567,9 @@ function NativeHumanAI:Update(Owner)
 				if self.useMedikit == true then	
 					self.useMedikit = false
 					Owner:EquipFirearm(true)
+					if self.scatter and Owner.Health == Owner.MaxHealth then
+						self.scatter = false
+					end
 				end
 				if self.AlarmTimer:IsPastSimTimeLimit() and HumanBehaviors.ProcessAlarmEvent(self, Owner) then
 					self.AlarmTimer:Reset()
@@ -727,9 +730,17 @@ function NativeHumanAI:CreateAttackBehavior(Owner)
 
 	local dist = SceneMan:ShortestDistance(Owner.Pos, self.Target.Pos, false).Magnitude
 
-	if self.Target and IsADoor(self.Target) and Owner:EquipNamedDevice("Heavy Digger", true) then
-		self.NextBehavior = coroutine.create(HumanBehaviors.AttackTarget)
-		self.NextBehaviorName = "AttackTarget"
+	if IsADoor(self.Target) then 
+		if Owner:EquipNamedDevice("Heavy Digger", true) then
+			self.NextBehavior = coroutine.create(HumanBehaviors.AttackTarget)
+			self.NextBehaviorName = "AttackTarget"
+		elseif Owner:EquipNamedDevice("Timed Explosive", true) then
+			self.NextBehavior = coroutine.create(HumanBehaviors.ThrowTarget)
+			self.NextBehaviorName = "ThrowTarget"
+		elseif Owner.FirearmIsReady and HumanBehaviors.GetProjectileData(Owner).pen * 0.9 > (self.Target.Door or self.Target).Material.StructuralIntegrity then
+			self.NextBehavior = coroutine.create(HumanBehaviors.ShootTarget)
+			self.NextBehaviorName = "ShootTarget"
+		end
 	-- favor grenades as the initiator to a sneak attack
 	elseif Owner.AIMode ~= Actor.AIMODE_SQUAD and Owner.AIMode ~= Actor.AIMODE_SENTRY and self.Target.HFlipped == Owner.HFlipped and Owner:EquipDeviceInGroup("Bombs - Grenades", true)
 	and dist > 100 and dist < ToThrownDevice(Owner.EquippedItem).MaxThrowVel * GetPPM() and (self.Target.Pos.Y + 20) > Owner.Pos.Y then
@@ -758,10 +769,7 @@ function NativeHumanAI:CreateAttackBehavior(Owner)
 
 			return
 		else -- there are probably no weapons around here (in the vicinity of an area adjacent to a location)
-			if self.Target and MovableMan:ValidMO(self.Target) and 
-				not (self.isPlayerOwned and Owner.AIMode == Actor.AIMODE_SENTRY) and
-				(self.Target.ClassName == "AHuman" or self.Target.ClassName == "ACrab")
-			then
+			if not (self.isPlayerOwned and Owner.AIMode == Actor.AIMODE_SENTRY) and (self.Target.ClassName == "AHuman" or self.Target.ClassName == "ACrab") then
 				self.NextBehavior = coroutine.create(HumanBehaviors.AttackTarget)
 				self.NextBehaviorName = "AttackTarget"
 			else
@@ -782,7 +790,7 @@ end
 
 -- force the use of a digger when attacking
 function NativeHumanAI:CreateHtHBehavior(Owner)					-- has to be digger, not just "tool"
-	if Owner.AIMode ~= Actor.AIMODE_SQUAD and self.Target and Owner:HasObjectInGroup("Tools - Diggers") then	--Owner:EquipDiggingTool(true) then
+	if Owner.AIMode ~= Actor.AIMODE_SQUAD and self.Target and (Owner:HasObjectInGroup("Tools - Diggers") or Owner:HasObjectInGroup("Weapons - Melee")) then
 		self.NextBehavior = coroutine.create(HumanBehaviors.AttackTarget)
 		self.NextBehaviorName = "AttackTarget"
 		self.NextCleanup = function(AI)

Base.rte/AI/RocketAI.lua

@@ -138,6 +138,7 @@ function UpdateAI(self)
 		end
 
 		if self.AIMode == Actor.AIMODE_DELIVER and self:IsInventoryEmpty() then
+			self.AIMode = Actor.AIMODE_RETURN;
 			self.DeliveryState = ACraft.LAUNCH;	-- Don't descend if we have nothing to deliver
 			self.LZpos.Y = -10000;	-- Go to orbit
 		else
@@ -155,6 +156,7 @@ function UpdateAI(self)
 	elseif self.DeliveryState == ACraft.UNLOAD then
 		if self:IsInventoryEmpty() and self.AIMode ~= Actor.AIMODE_STAY then	-- Return to orbit if empty
 			if self.DoorTimer:IsPastSimMS(750) then	-- Pause before returning to orbit
+				self.AIMode = Actor.AIMODE_RETURN;
 				self.DeliveryState = ACraft.LAUNCH;
 				self.LZpos.Y = -10000;	-- Go to orbit
 				if self.HatchState == ACraft.OPEN then

Base.rte/Activities.ini

@@ -112,10 +112,9 @@ AddActivity = GAScripted
 	ScriptFile = Base.rte/Activities/BunkerBreach.lua
 	InCampaignStage = 1
 	LuaClassName = BunkerBreach
-	CPUTeam = 1
-	Team1Name = Players
-	Team2Name = AI
-	MinTeamsRequired = 1
+	Team1Name = Attackers
+	Team2Name = Defenders
+	MinTeamsRequired = 2
 	DefaultGoldCake = 6000
 	DefaultGoldEasy = 5000
 	DefaultGoldMedium = 4000
@@ -126,28 +125,6 @@ AddActivity = GAScripted
 	DeployUnitsSwitchEnabled = 0
 
 
-AddActivity = GAScripted
-	PresetName = Siege
-	SceneName = Zekarra Mining Outpost
-	Description = Defend a bunker attacked by an AI controlled faction, alone or with your friends.
-	ScriptFile = Base.rte/Activities/Siege.lua
-	InCampaignStage = 1
-	LuaClassName = Siege
-	CPUTeam = 0
-	Team1Name = AI
-	Team2Name = Players
-	MinTeamsRequired = 1
-	DefaultGoldCake = 2500
-	DefaultGoldEasy = 1000
-	DefaultGoldMedium = 500
-	DefaultGoldHard = 0
-	DefaultGoldNuts = 0
-	DefaultDeployUnits = 1
-	DeployUnitsSwitchEnabled = 0
-	DefaultFogOfWar = 0
-	FogOfWarSwitchEnabled = 0
-
-
 AddActivity = GAScripted
 	PresetName = Keepie Uppie
 	Description = Keep your rocket alive until time is up!

Base.rte/Activities/BrainVsBrain.lua

@@ -569,11 +569,7 @@ function BrainvsBrain:CreateHeavyDrop(xPosLZ)
 
 				Craft:AddInventoryItem(Passenger)
 
-				local inventoryMass = 0;
-				for item in Craft.Inventory do
-					inventoryMass = inventoryMass + item.Mass;
-				end				-- Stop adding actors when exceeding the weight limit
-				if inventoryMass > craftMaxMass then 
+				if Craft.InventoryMass > craftMaxMass then 
 					break
 				end
 			end
@@ -633,11 +629,7 @@ function BrainvsBrain:CreateMediumDrop(xPosLZ)
 
 				Craft:AddInventoryItem(Passenger)
 
-				local inventoryMass = 0;
-				for item in Craft.Inventory do
-					inventoryMass = inventoryMass + item.Mass;
-				end				-- Stop adding actors when exceeding the weight limit
-				if inventoryMass > craftMaxMass then 
+				if Craft.InventoryMass > craftMaxMass then 
 					break
 				end
 			end
@@ -695,11 +687,7 @@ function BrainvsBrain:CreateLightDrop(xPosLZ)
 
 				Craft:AddInventoryItem(Passenger)
 
-				local inventoryMass = 0;
-				for item in Craft.Inventory do
-					inventoryMass = inventoryMass + item.Mass;
-				end				-- Stop adding actors when exceeding the weight limit
-				if inventoryMass > craftMaxMass then 
+				if Craft.InventoryMass > craftMaxMass then 
 					break
 				end
 			end
@@ -757,11 +745,7 @@ function BrainvsBrain:CreateScoutDrop(xPosLZ)
 
 				Craft:AddInventoryItem(Passenger)
 
-				local inventoryMass = 0;
-				for item in Craft.Inventory do
-					inventoryMass = inventoryMass + item.Mass;
-				end				-- Stop adding actors when exceeding the weight limit
-				if inventoryMass > craftMaxMass then 
+				if Craft.InventoryMass > craftMaxMass then 
 					break
 				end
 			end
@@ -795,11 +779,7 @@ function BrainvsBrain:CreateBombDrop(bombPosX)
 		for _ = 1, math.random(3, 6) do
 			Craft:AddInventoryItem(RandomTDExplosive("Bombs - Payloads", self.CPUTechID))
 
-			local inventoryMass = 0;
-			for item in Craft.Inventory do
-				inventoryMass = inventoryMass + item.Mass;
-			end				-- Stop adding actors when exceeding the weight limit
-			if inventoryMass > craftMaxMass then 
+			if Craft.InventoryMass > craftMaxMass then 
 				break
 			end
 		end