Merge branch 'development'

Author: garethyr

.github/CODEOWNERS

@@ -6,17 +6,17 @@
 * @administrators
 
 #Lua Owners
-*.lua @scripters
+*.lua @lua-script-managers
 
 #INI Owners
-*.ini @ini-coders
+*.ini @ini-code-managers
 
 #Sprite Owners
-*.bmp @spriters
-*.png @spriters
+*.bmp @sprite-managers
+*.png @sprite-managers
 
 #Audio Owners
-*.wav @audio-makers
-*.ogg @audio-makers
-*.flac @audio-makers
-*.mp3 @audio-makers
+*.wav @audio-managers
+*.ogg @audio-managers
+*.flac @audio-managers
+*.mp3 @audio-managers

.gitignore

@@ -45,17 +45,16 @@ luac.out
 # Manifest files
 *.manifest
 
+**/desktop.ini
+
 .vs/
 _Screenshots/
 Base.rte/Settings.ini
 Benchmark.rte/
 Scenes.rte/
 Metagames.rte/
-DedicatedServer.bat
 DedicatedServerDebug.bat
 
-Cortex Command Experimental Multiplayer Operations Guide.docx
-
 allegro.log
 abortscreen.bmp
 
@@ -66,4 +65,4 @@ LogLoadingWarning.txt
 LogConsole.txt
 Console.dump.log
 Console.input.log
-Base.rte/LoadoutsP1.ini
+Base.rte/LoadoutsP1.ini

Base.rte/AI.ini

@@ -17,66 +17,19 @@ AddActor = AHuman
 	Health = 100
 	AimDistance = 0
 	Perceptiveness = 0
-	CharHeight = 0
 	HUDVisible = 0
 	Head = Attachable
-		PresetName = Null Head
-		Mass = 0
-		HitsMOs = 0
-		GetsHitByMOs = 0
-		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.png
-		AtomGroup = AtomGroup
-			CopyOf = Null AtomGroup
-	FGArm = Arm
-		PresetName = Null Arm FG
-		Mass = 0
-		HitsMOs = 0
-		GetsHitByMOs = 0
-		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.png
-		AtomGroup = AtomGroup
-			CopyOf = Null AtomGroup
-		Hand = ContentFile
-			FilePath = Base.rte/Null.png
-		MaxLength = 0
-	BGArm = Arm
-		PresetName = Null Arm BG
-		Mass = 0
-		HitsMOs = 0
-		GetsHitByMOs = 0
-		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.png
-		AtomGroup = AtomGroup
-			CopyOf = Null AtomGroup
-		Hand = ContentFile
-			FilePath = Base.rte/Null.png
-		MaxLength = 0
+		CopyOf = Null Attachable
 	FGLeg = Leg
-		PresetName = Null Leg FG
-		Mass = 0
-		HitsMOs = 0
-		GetsHitByMOs = 0
-		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.png
-		AtomGroup = AtomGroup
-			CopyOf = Null AtomGroup
+		CopyOf = Null Leg
 	BGLeg = Leg
-		PresetName = Null Leg BG
-		Mass = 0
-		HitsMOs = 0
-		GetsHitByMOs = 0
-		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.png
-		AtomGroup = AtomGroup
-			CopyOf = Null AtomGroup
+		CopyOf = Null Leg
 	HandGroup = AtomGroup
-		PresetName = NullGroup
-		AutoGenerate = 1
+		CopyOf = Null AtomGroup
 	FGFootGroup = AtomGroup
-		CopyOf = NullGroup
+		CopyOf = Null AtomGroup
 	BGFootGroup = AtomGroup
-		CopyOf = NullGroup
+		CopyOf = Null AtomGroup
 
 
 AddDevice = TDExplosive
@@ -97,34 +50,12 @@ AddDevice = TDExplosive
 
 
 AddDevice = TDExplosive
+	CopyOf = Alert Device 1
 	PresetName = Alert Device 2
-	Mass = 0
-	RestThreshold = -500
-	AirResistance = 1
-	GlobalAccScalar = 0
-	HitsMOs = 0
-	GetsHitByMOs = 0
-	SpriteFile = ContentFile
-		FilePath = Base.rte/Null.png
-	Buyable = 0
-	AtomGroup = AtomGroup
-		CopyOf = Null AtomGroup
 	TriggerDelay = 450
-	ActivatesWhenReleased = 1
 
 
 AddDevice = TDExplosive
+	CopyOf = Alert Device 1
 	PresetName = Alert Device 3
-	Mass = 0
-	RestThreshold = -500
-	AirResistance = 1
-	GlobalAccScalar = 0
-	HitsMOs = 0
-	GetsHitByMOs = 0
-	SpriteFile = ContentFile
-		FilePath = Base.rte/Null.png
-	Buyable = 0
-	AtomGroup = AtomGroup
-		CopyOf = Null AtomGroup
-	TriggerDelay = 600
-	ActivatesWhenReleased = 1
+	TriggerDelay = 600

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)
@@ -79,7 +79,7 @@ function CrabBehaviors.LookForTargets(AI, Owner)
 		if AI.ReloadTimer:IsPastSimMS(8000) then	-- check if we need to reload
 			AI.ReloadTimer:Reset()
 			if Owner.FirearmNeedsReload then
-				Owner:ReloadFirearm()
+				Owner:ReloadFirearms()
 			end
 		end
 	end
@@ -89,8 +89,9 @@ end
 function CrabBehaviors.Sentry(AI, Owner, Abort)
 	local sweepUp = true
 	local sweepDone = false
-	local maxAng = Owner.AimRange
-	local minAng = -maxAng
+	-- to-do: refer to upper/lower limits!
+	local maxAng = Owner.AimRange--Owner.AimRangeUpperLimit
+	local minAng = -maxAng--Owner.AimRangeLowerLimit
 	local aim
 
 	if AI.OldTargetPos then	-- try to reacquire an old target
@@ -535,7 +536,7 @@ function CrabBehaviors.ShootTarget(AI, Owner, Abort)
 
 			ShootTimer:Reset()
 			if Owner.FirearmIsEmpty then
-				Owner:ReloadFirearm()
+				Owner:ReloadFirearms()
 				aimError = RangeRand(-0.14, 0.14) * AI.aimSkill
 				aimTime = RangeRand(220, 330) * AI.aimSpeed + 50
 				if Owner.FirearmActivationDelay > 0 then
@@ -680,7 +681,7 @@ function CrabBehaviors.ShootArea(AI, Owner, Abort)
 			AI.fire = false
 
 			if Owner.FirearmIsEmpty then
-				Owner:ReloadFirearm()
+				Owner:ReloadFirearms()
 			end
 
 			break -- stop this behavior when the mag is empty

Base.rte/AI/DropShipAI.lua

@@ -9,14 +9,4 @@ end
 
 function UpdateAI(self)
 	self.AI:Update(self)
-end
-
-function Update(self)
-	--Re-orient the craft at 180 degrees to help rotational AI
-	if self.RotAngle > math.pi then
-		self.RotAngle = self.RotAngle - (math.pi * 2);
-	end
-	if self.RotAngle < -math.pi then
-		self.RotAngle = self.RotAngle + (math.pi * 2);
-	end
 end

Base.rte/AI/HumanAI.lua

@@ -1,30 +1,8 @@
 dofile("Base.rte/Constants.lua")
 require("AI/NativeHumanAI")
-require("AI/HumanFunctions")
 
 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;
-end
-function Update(self)
-	self.controller = self:GetController();
-	
-	if self.alternativeGib then
-		HumanFunctions.DoAlternativeGib(self);
-	end
-	if self.automaticEquip then
-		HumanFunctions.DoAutomaticEquip(self);
-	end
-	if self.armSway then
-		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
-	end
 end
 function UpdateAI(self)
 	self.AI:Update(self);