Merge branch 'development' into 4zK-factions

Author: Gacyr

.gitignore

@@ -1,3 +1,6 @@
+# Linker output
+*.ilk
+
 # Compiled Lua sources
 luac.out
 
@@ -60,4 +63,5 @@ LogPublish.txt
 LogLoading.txt
 LogConsole.txt
 Console.dump.log
-Console.input.log
+Console.input.log
+Base.rte/LoadoutsP1.ini

Base.rte/AI/HumanFunctions.lua

@@ -27,7 +27,7 @@ end
 
 function HumanFunctions.DoAutomaticEquip(actor)
 	-- Equip a weapon automatically if the one held by a player is destroyed
-	if actor:IsPlayerControlled() and actor.EquippedItem == nil and actor.InventorySize > 0 then
+	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

Base.rte/Craft/Shared/MGTurret.lua

@@ -11,20 +11,21 @@ function Create(self)
 end
 function Update(self)
 	local parent = self:GetParent();
-	if parent and IsActor(parent) then
-	
-		local parent = ToActor(parent);
-		local controller = parent:GetController();
-		
-		if controller:IsState(Controller.MOVE_RIGHT) then
-			self.rotation = self.rotation + self.turnSpeed;
-		end
-		if controller:IsState(Controller.MOVE_LEFT) then
-			self.rotation = self.rotation - self.turnSpeed;
-		end
-		-- Spread / tighten aim when moving up / down
-		if controller:IsState(Controller.MOVE_DOWN) then
-			self.verticalFactor = self.verticalFactor - self.turnSpeed;
+	if parent then
+		if IsActor(parent) then
+			parent = ToActor(parent);
+			local controller = parent:GetController();
+				
+			if controller:IsState(Controller.MOVE_RIGHT) then
+				self.rotation = self.rotation + self.turnSpeed;
+			end
+			if controller:IsState(Controller.MOVE_LEFT) then
+				self.rotation = self.rotation - self.turnSpeed;
+			end
+			-- Spread / tighten aim when moving up / down
+			if controller:IsState(Controller.MOVE_DOWN) then
+				self.verticalFactor = self.verticalFactor - self.turnSpeed;
+			end
 		end
 		if math.abs(self.rotation) > 0.001 then
 			self.rotation = self.rotation / (1 + self.turnSpeed * 2);
@@ -36,9 +37,9 @@ function Update(self)
 		else
 			self.verticalFactor = 0;
 		end
-		-- Aim directly away from parent ship
+		-- Aim directly away from parent
 		local posTrace = SceneMan:ShortestDistance(parent.Pos, self.Pos, SceneMan.SceneWrapsX):SetMagnitude(self.searchRange / 2);
-		self.RotAngle = (1.57 * self.verticalFactor + posTrace.AbsRadAngle) / (1 + self.verticalFactor) - self.rotation;
+		self.RotAngle = (1.57 * self.verticalFactor + posTrace.AbsRadAngle + (parent.HFlipped and math.pi or 0)) / (1 + self.verticalFactor) - self.rotation;
 		if self.areaMode then	-- Area Mode
 			local aimPos = self.Pos + Vector((self.searchRange / 2), 0):RadRotate(self.RotAngle);
 			-- Debug: visualize aim area

Base.rte/Devices.ini

@@ -37,7 +37,6 @@ IncludeFile = Base.rte/Devices/Tools/ConcreteSprayer/ConcreteSprayer.ini
 IncludeFile = Base.rte/Devices/Tools/Repeller/Repeller.ini
 IncludeFile = Base.rte/Devices/Tools/GrappleGun/GrappleGun.ini
 IncludeFile = Base.rte/Devices/Tools/Constructor/Constructor.ini
-IncludeFile = Base.rte/Devices/Tools/Medikit/Medikit.ini
 
 
 // Shields
@@ -47,4 +46,5 @@ IncludeFile = Base.rte/Devices/Shields/RiotShield/RiotShield.ini
 
 // Special
 
+IncludeFile = Base.rte/Devices/Special/Medikit/Medikit.ini
 IncludeFile = Base.rte/Devices/Artifacts/Artifacts.ini

Base.rte/Devices/Explosives/AntiPersonnelMine/AntiPersonnelMine.ini

@@ -125,6 +125,8 @@ AddEffect = MOSRotating
 			Path = Base.rte/Sounds/Explosions/Explode1.wav
 		AddSample = ContentFile
 			Path = Base.rte/Sounds/Explosions/Explode2.wav
+		AddSample = ContentFile
+			Path = Base.rte/Sounds/Explosions/Explode3.wav
 	AddGib = Gib
 		GibParticle = MOPixel
 			CopyOf = Glow Explosion Huge

Base.rte/Devices/Explosives/BlueBomb/BlueBomb.ini

@@ -48,6 +48,8 @@ AddDevice = TDExplosive
 			Path = Base.rte/Sounds/Explosions/Explode1.wav
 		AddSample = ContentFile
 			Path = Base.rte/Sounds/Explosions/Explode2.wav
+		AddSample = ContentFile
+			Path = Base.rte/Sounds/Explosions/Explode3.wav
 	StanceOffset = Vector
 		X = 8
 		Y = 5

Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosive.ini

@@ -167,6 +167,8 @@ AddMOSRotating = MOSRotating
 			FilePath = Base.rte/Sounds/Explosions/Explode1.wav
 		AddSample = ContentFile
 			FilePath = Base.rte/Sounds/Explosions/Explode2.wav
+		AddSample = ContentFile
+			FilePath = Base.rte/Sounds/Explosions/Explode3.wav
 	AddGib = Gib
 		GibParticle = MOPixel
 			CopyOf = Glow Explosion Huge

Base.rte/Devices/Explosives/StandardBomb/StandardBomb.ini

@@ -44,6 +44,8 @@ AddDevice = TDExplosive
 			Path = Base.rte/Sounds/Explosions/Explode1.wav
 		AddSample = ContentFile
 			Path = Base.rte/Sounds/Explosions/Explode2.wav
+		AddSample = ContentFile
+			Path = Base.rte/Sounds/Explosions/Explode3.wav
 	StanceOffset = Vector
 		X = -12
 		Y = -5

Base.rte/Devices/Shared/Scripts/BurstFire.lua

@@ -6,7 +6,7 @@ function Update(self)
 	if self.Magazine then
 		if self.coolDownTimer then
 			local parent = self:GetRootParent();
-			if self.coolDownTimer:IsPastSimMS(self.coolDownDelay) and (parent and IsActor(parent)) and (not self:IsActivated() or not ToActor(parent):IsPlayerControlled()) then
+			if self.coolDownTimer:IsPastSimMS(self.coolDownDelay) and parent and IsActor(parent) and not (self:IsActivated() and ToActor(parent):IsPlayerControlled()) then
 				self.coolDownTimer, self.shotCounter = nil;
 			else
 				self:Deactivate();

Base.rte/Devices/Tools/Medikit/Medikit.ini renamed to Base.rte/Devices/Special/Medikit/Medikit.ini

@@ -41,9 +41,9 @@ AddDevice = HDFirearm
 	Mass = 2.0
 	HitsMOs = 0
 	GetsHitByMOs = 1
-	ScriptPath = Base.rte/Devices/Tools/Medikit/Medikit.lua
+	ScriptPath = Base.rte/Devices/Special/Medikit/Medikit.lua
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Devices/Tools/Medikit/MedikitB.bmp
+		FilePath = Base.rte/Devices/Special/Medikit/MedikitB.bmp
 	FrameCount = 1
 	SpriteOffset = Vector
 		X = -6