re-enable turrets, tiny tweaks

Author: pawnishoovy

Data/Browncoats.rte/Actors.ini

@@ -17,5 +17,5 @@ IncludeFile = Browncoats.rte/Actors/Infantry/BrowncoatBoss/BrowncoatBoss.ini
 ///////////////////////////////////////////////////////////////////////
 // Turrets
 
-//IncludeFile = Browncoats.rte/Actors/Turrets/Hearthkeeper/Hearthkeeper.ini
-//IncludeFile = Browncoats.rte/Actors/Turrets/Thunderer/Thunderer.ini
+IncludeFile = Browncoats.rte/Actors/Turrets/Hearthkeeper/Hearthkeeper.ini
+IncludeFile = Browncoats.rte/Actors/Turrets/Thunderer/Thunderer.ini

Data/Browncoats.rte/Actors/Turrets/Thunderer/Thunderer.ini

@@ -493,6 +493,7 @@ AddActor = ACrab
 	Health = 100
 	Mechanical = 1
 	ImpulseDamageThreshold = 10000
+	AimRange = 0.80
 	AimDistance = 30
 	Perceptiveness = 0.75
 	CharHeight = 40

Data/Browncoats.rte/Actors/Turrets/Thunderer/ThundererBase.lua

@@ -1,10 +1,4 @@
 function Create(self)
-	if self:GetNumberValue("KeepUnflipped") == -1 then
-		self.keepFlipped = true;
-	else
-		self.keepFlipped = false;
-	end
-	
 	-- saving and loading can mess this up, so handle it:
 
 	self.pinPos = Vector(self.Pos.X, self.Pos.Y);
@@ -18,6 +12,18 @@ function Create(self)
 	end
 
 	self.AIMode = Actor.AIMODE_SENTRY;
+	
+	if self:GetNumberValue("KeepUnflipped") == -1 then
+		self.keepFlipped = true;
+	else
+		self.keepFlipped = false;
+	end
+	
+	if self.Turret then
+		if self.Turret.MountedDevice then
+			self.Turret.MountedDevice:SendMessage("SetKeepUnflipped", self:GetNumberValue("KeepUnflipped"));
+		end
+	end
 end
 
 function Update(self)

Data/Browncoats.rte/Actors/Turrets/Thunderer/ThundererGun.lua

@@ -1,5 +1,8 @@
--- This script incorporates Filipawn Industries code and the vanilla burstfire script together
--- There is likely better ways of doing a lot of this, potentially even standardizing it so it can be easily used more widely
+function OnMessage(self, message, context)
+	if message == "SetKeepUnflipped" then
+		self.keepFlipped = context == -1 and true or false;
+	end
+end
 
 function OnFire(self)
 	CameraMan:AddScreenShake(7, self.Pos);
@@ -58,10 +61,14 @@ function Create(self)
 	self.rotationSpeed = 0.10;
 	self.smoothedRotAngle = self.RotAngle;
 	self.InheritedRotAngleTarget = 0;
+	
+	self.keepFlipped = false;
 end
 
 function Update(self)
 	--self.servoLoopSound.Pos = self.Pos;
+	
+	self.HFlipped = self.keepFlipped;
 
 	self.parent = IsActor(self:GetRootParent()) and ToActor(self:GetRootParent()) or nil;
 
@@ -102,7 +109,7 @@ function Update(self)
 		local frameNum = math.floor(4 * progress);
 		self.Frame = self.currentBaseFrame + frameNum;
 
-		local barrel = self.currentBarrel == 0 and self.topBarrel or self.bottomBarrel;
+		local barrel = self.currentBarrel == 0 and self.bottomBarrel or self.topBarrel;
 		local jointOffsetX = 10 * math.sin(progress * math.pi);
 		barrel.JointOffset = Vector(jointOffsetX, 0);
 

Data/Coalition.rte/Actors.ini

@@ -23,5 +23,5 @@ IncludeFile = Coalition.rte/Actors/Mecha/BlastRunner/BlastRunner.ini
 
 // Turrets
 
-//IncludeFile = Coalition.rte/Actors/Turrets/BunkerCannon/BunkerCannon.ini
+IncludeFile = Coalition.rte/Actors/Turrets/BunkerCannon/BunkerCannon.ini
 IncludeFile = Coalition.rte/Actors/Turrets/GatlingTurret/GatlingTurret.ini

Data/Coalition.rte/Actors/Turrets/BunkerCannon/BunkerCannon.ini

@@ -463,7 +463,6 @@ AddActor = Turret
 	Mass = 1
 	HitsMOs = 1
 	GetsHitByMOs = 1
-	ScriptPath = Coalition.rte/Actors/Turrets/BunkerCannon/BunkerCannonTurret.lua
 	SpriteFile = ContentFile
 		FilePath = Coalition.rte/Actors/Turrets/BunkerCannon/CoalitionBunkerCannonBraceCirclepieceB.png
 	FrameCount = 1
@@ -774,6 +773,8 @@ AddActor = ACrab
 //	GibSound = SoundContainer
 //		AddSound = ContentFile
 //			FilePath = Base.rte/Cool explosion sound here
+	AddCustomValue = NumberValue
+		KeepUnflipped = 1
 
 
 AddTerrainObject = TerrainObject
@@ -809,8 +810,6 @@ AddDevice = HDFirearm
 	PresetName = Coalition Bunker Cannon Gun Left
 	SpriteFile = ContentFile
 		FilePath = Coalition.rte/Actors/Turrets/BunkerCannon/CoalitionBunkerCannonGunA.png
-	AddCustomValue = NumberValue
-		KeepUnflipped = -1
 
 
 ///////////////////////////////////////////////////////////////////////

Data/Coalition.rte/Actors/Turrets/BunkerCannon/BunkerCannonBrace.lua

@@ -1,10 +1,4 @@
 function Create(self)
-	if self:GetNumberValue("KeepUnflipped") == -1 then
-		self.keepFlipped = true;
-	else
-		self.keepFlipped = false;
-	end
-	
 	-- saving and loading can mess this up, so handle it:
 
 	self.pinPos = Vector(self.Pos.X, self.Pos.Y);
@@ -18,6 +12,18 @@ function Create(self)
 	end
 
 	self.AIMode = Actor.AIMODE_SENTRY;
+	
+	if self:GetNumberValue("KeepUnflipped") == -1 then
+		self.keepFlipped = true;
+	else
+		self.keepFlipped = false;
+	end
+	
+	if self.Turret then
+		if self.Turret.MountedDevice then
+			self.Turret.MountedDevice:SendMessage("SetKeepUnflipped", self:GetNumberValue("KeepUnflipped"));
+		end
+	end
 end
 
 function Update(self)

Data/Coalition.rte/Actors/Turrets/BunkerCannon/BunkerCannonGun.lua

@@ -1,7 +1,11 @@
 -- This script incorporates Filipawn Industries code and the vanilla burstfire script together
 -- There is likely better ways of doing a lot of this, potentially even standardizing it so it can be easily used more widely
 
--- Last worked on 29/08/2023
+function OnMessage(self, message, context)
+	if message == "SetKeepUnflipped" then
+		self.keepFlipped = context == -1 and true or false;
+	end
+end
 
 function OnFire(self)
 
@@ -18,7 +22,6 @@ function OnReload(self)
 end
 
 function Create(self)
-
 	self.servoLoopSound = CreateSoundContainer("Coalition Bunker Cannon Servo Loop", "Coalition.rte");
 	self.servoLoopSound.Volume = 0;
 	self.servoLoopSound.Pitch = 1;
@@ -46,15 +49,9 @@ function Create(self)
 	self.InheritedRotAngleTarget = 0;
 
 	self.shotsPerBurst = self:NumberValueExists("ShotsPerBurst") and self:GetNumberValue("ShotsPerBurst") or 3;
-	self.coolDownDelay = 500;	
+	self.coolDownDelay = 500;
 
-	if self:NumberValueExists("KeepUnflipped") then
-		self.keepFlipped = true;
-	else
-		self.keepFlipped = false;
-	end
-	
-
+	self.keepFlipped = false;
 end
 
 function Update(self)