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

4zK's content update #5: Finishing up for Prerelease 3
cortex-command-community · Dec 24, 2020 · d1203a1 · d1203a1
2 parents 16782b7 + 94864de
commit d1203a1
Show file tree

Hide file tree

Showing 133 changed files with 189 additions and 1,234 deletions.
diff --git a/Base.rte/Activities/OneManArmy.lua b/Base.rte/Activities/OneManArmy.lua
@@ -295,9 +295,9 @@ function OneManArmy:UpdateActivity()
 				--Get any Actor from the CPU's native tech
 				local passenger = nil;
 				if math.random() >= self:GetCrabToHumanSpawnRatio(PresetMan:GetModuleID(self.CPUTechName)) then
-					passenger = RandomAHuman("Any", self.CPUTechName);
+					passenger = RandomAHuman("Actors - Light", self.CPUTechName);
 				else
-					passenger = RandomACrab("Any", self.CPUTechName);
+					passenger = RandomACrab("Actors - Mecha", self.CPUTechName);
 				end
 				--Equip it with tools and guns if it's a humanoid
 				if IsAHuman(passenger) then

diff --git a/Base.rte/Activities/OneManArmyDiggers.lua b/Base.rte/Activities/OneManArmyDiggers.lua
@@ -251,7 +251,7 @@ function OneManArmy:UpdateActivity()
 			-- Set the ship up with a cargo of a few armed and equipped actors
 			for i = 1, actorsInCargo do
 				-- Get any Actor from the CPU's native tech
-				local passenger = RandomAHuman("Any", self.CPUTechName);
+				local passenger = RandomAHuman("Actors - " .. (self.Difficulty > 75 and "Heavy" or "Light"), self.CPUTechName);
 				passenger:AddInventoryItem(CreateHDFirearm("Light Digger", "Base.rte"));
 
 				-- Set AI mode and team so it knows who and what to fight for!

diff --git a/Base.rte/Actors/Brains/Brainbot/Brainbot.ini b/Base.rte/Actors/Brains/Brainbot/Brainbot.ini
@@ -349,7 +349,6 @@ AddActor = Arm
 		X = -3
 		Y = -1
 	DrawAfterParent = 1
-	HeldDevice = None
 	Hand = ContentFile
 		FilePath = Base.rte/Actors/Brains/Brainbot/HandFG.png
 	MaxLength = 13
@@ -569,7 +568,6 @@ AddActor = AHuman
 	AddToGroup = Actors
 	AddToGroup = Brains
 	GoldValue = 100
-	Buyable = 1
 	Mass = 30
 	HitsMOs = 1
 	GetsHitByMOs = 1
@@ -606,11 +604,9 @@ AddActor = AHuman
 			FilePath = Base.rte/Actors/Brains/Case/Sounds/EnergyExplosion.flac
 	DeviceSwitchSound = SoundContainer
 		CopyOf = Device Switch
-	Status = 0
+	Team = 0
 	Health = 100
 	ImpulseDamageThreshold = 2800
-	Team = 0
-	AimAngle = 0
 	AimDistance = 30
 	Perceptiveness = 1
 	CharHeight = 100

diff --git a/Base.rte/Actors/Brains/Case/BrainCase.ini b/Base.rte/Actors/Brains/Case/BrainCase.ini
@@ -13,7 +13,7 @@ AddEffect = MOSRotating
 	SpriteOffset = Vector
 		X = -3
 		Y = -4
-	AngularVel = 60
+	AngularVel = 6
 	AtomGroup = AtomGroup
 		AutoGenerate = 1
 		Material = Material
@@ -34,7 +34,7 @@ AddEffect = MOSRotating
 	SpriteOffset = Vector
 		X = -3
 		Y = -3
-	AngularVel = 60
+	AngularVel = 6
 	AtomGroup = AtomGroup
 		AutoGenerate = 1
 		Material = Material
@@ -54,7 +54,6 @@ AddActor = Actor
 	AddToGroup = Brains
 	PinStrength = 500
 	Mass = 43.54
-	RestThreshold = 0
 	HitsMOs = 0
 	GetsHitByMOs = 1
 	SpriteFile = ContentFile
@@ -93,16 +92,11 @@ AddActor = Actor
 	GibSound = SoundContainer
 		AddSound = ContentFile
 			FilePath = Base.rte/Actors/Brains/Case/Sounds/BrainPop.flac
-	Status = 0
-	Health = 100
 	Team = 0
-	AimAngle = 0
+	Health = 100
 	AimDistance = 0
 	Perceptiveness = 0.17
 	CharHeight = 50
-	HolsterOffset = Vector
-		X = -0
-		Y = -0
 	GibImpulseLimit = 25
 	GibWoundLimit = 15
 	AddGib = Gib