Merge pull request #51 from cortex-command-community/pre6-bugs-and-tweaks

Bug fixes, tweaks for pre6

Author: Causeless

Data/Base.rte/Devices/Shared/Scripts/MuzzleSmoke.lua

@@ -10,7 +10,7 @@ function Create(self)
 
 	self.muzzleSmokeSize = self:NumberValueExists("MuzzleSmokeSize") and self:GetNumberValue("MuzzleSmokeSize") or self.muzzleSmokeSize;
 	if self.muzzleSmokeSize == nil then
-		self.muzzleSmokeSize = self.Mass;
+		self.muzzleSmokeSize = self.Mass/1.5;
 	end
 
 	self.muzzleSmokeVel = math.sqrt(self.muzzleSmokeSize) * 5;
@@ -21,13 +21,13 @@ function Create(self)
 	self.fireSmokeEffect.RadAngle = self.RotAngle;
 	self.fireSmokeEffect.Power = self.muzzleSmokeSize;
 	self.fireSmokeEffect.Spread = (self.ShakeRange + self.SharpShakeRange) * 0.5 + self.ParticleSpreadRange;
-	self.fireSmokeEffect.SmokeMult = 1;
+	self.fireSmokeEffect.SmokeMult = 0.5;
 	self.fireSmokeEffect.ExploMult = 1;
-	self.fireSmokeEffect.WidthSpread = 1;
-	self.fireSmokeEffect.VelocityMult = 1;
+	self.fireSmokeEffect.WidthSpread = 0;
+	self.fireSmokeEffect.VelocityMult = 0.5;
 	self.fireSmokeEffect.LingerMult = 0.45;
-	self.fireSmokeEffect.AirResistanceMult = 1.2;
-	self.fireSmokeEffect.GravMult = 0.5;
+	self.fireSmokeEffect.AirResistanceMult = 1;
+	self.fireSmokeEffect.GravMult = 1;
 
 	self.particleUtility = require("Scripts/Utility/ParticleUtility");	
 

Data/Base.rte/Scripts/Utility/ParticleUtility.lua

@@ -127,19 +127,15 @@ function ParticleUtility:CreateDirectionalSmokeEffect(positionOrFullTable, angOr
 		for _ = 0, math.floor((count / (math.random(2,4))) * smokeMult) do
 
 			-- Tiny smoke, high spread
-			local tinySmokeCount = math.random(math.max(0, math.floor(smokePower/25)), math.max(0, math.ceil(smokePower/12.5)));
+			local tinySmokeCount = math.random(math.max(0, math.floor(smokePower/12.5)), math.max(0, math.ceil(smokePower/6.25)));
 			for i = 1, tinySmokeCount do	
-				local countFactor = i/tinySmokeCount;
-				local randSpread = (math.random(-spread*500, spread*500)/1000) * countFactor;
-				local easeFactor = math.abs(randSpread/(spread/2))
-				factor = 1 - math.cos((easeFactor * math.pi) / 2);
-				randSpread = randSpread * easeFactor;
+				local randSpread = (math.random(-spread*500, spread*500)/1000)
 				local randVelocityMult = RangeRand(0.5, 1.5);
 
 				local particle = CreateMOSParticle("Tiny Smoke Ball 1", "Base.rte");
 				particle.Pos = position + Vector(0, RangeRand(-widthspread/2, widthspread/2)):DegRotate(angle);
 				particle.Vel = Vector(velocity.X, velocity.Y):DegRotate(randSpread) * randVelocityMult;
-				particle.Lifetime = particle.Lifetime * RangeRand(0.75, 1.25) * lingerMult;
+				particle.Lifetime = particle.Lifetime * RangeRand(0.75, 1.75) * lingerMult;
 				particle.AirThreshold = (particle.AirThreshold / airResistanceMult) * (lingerMult/airResistanceMult);
 				particle.AirResistance = math.min(62.5, particle.AirResistance * airResistanceMult);
 				particle.GlobalAccScalar = particle.GlobalAccScalar * gravMult;
@@ -214,7 +210,7 @@ function ParticleUtility:CreateDirectionalSmokeEffect(positionOrFullTable, angOr
 				randSpread = randSpread * easeFactor;
 				local randVelocityMult = RangeRand(0.5, 1.5);
 
-				local particle = CreateMOSParticle("Explosion Smoke Small", "Base.rte");
+				local particle = CreateMOSParticle("Side Thruster Blast Ball 1", "Base.rte");
 				particle.Pos = position + Vector(0, RangeRand(-widthspread/2, widthspread/2)):DegRotate(angle);
 				particle.Vel = Vector(velocity.X, velocity.Y):DegRotate(randSpread) * randVelocityMult;
 				particle.Lifetime = particle.Lifetime * RangeRand(0.4, 0.8) * (lingerMult);

Data/Browncoats.rte/Actors.ini

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

Data/Browncoats.rte/Devices/Weapons/Extinction/Extinction.ini

@@ -212,6 +212,7 @@ AddDevice = HDFirearm
 	Mass = 4.5
 	HitsMOs = 0
 	GetsHitByMOs = 1
+	ScriptPath = Base.rte/Devices/Shared/Scripts/MuzzleSmoke.lua
 	ScriptPath = Browncoats.rte/Devices/Weapons/Extinction/Extinction.lua
 	SpriteFile = ContentFile
 		FilePath = Browncoats.rte/Devices/Weapons/Extinction/Extinction.png

Data/Browncoats.rte/Devices/Weapons/Extinction/Extinction.lua

@@ -1,6 +1,7 @@
 function OnFire(self)
 
 	self.InheritedRotAngleTarget = self.recoilAngleSize * RangeRand(self.recoilAngleVariation, 1)
+	self.rotationSpeed = 0.4;
 
 end
 
@@ -60,8 +61,8 @@ function Create(self)
 
 	self.InheritedRotAngleTarget = 0;
 	self.InheritedRotAngleOffset = 0;
-	self.recoilAngleSize = 0.45;
-	self.recoilAngleVariation = 0.5;
+	self.recoilAngleSize = 0.5;
+	self.recoilAngleVariation = 0.8;
 	self.rotationSpeed = 0.1;
 
 	self.cockTimer = Timer();
@@ -102,7 +103,11 @@ function Update(self)
 			end
 		end
 
-		if self.otherHandGun or not self.parent.BGArm or not self.parent.FGArm then
+		local playerControlled = self.parent:IsPlayerControlled()
+		
+		self.RateOfFire = 300;
+		
+		if self.otherHandGun or not self.parent.BGArm or not self.parent.FGArm or not playerControlled then
 			self.FullAuto = false;
 			if self.fanFire then
 				--self.FullAuto = false;
@@ -114,6 +119,9 @@ function Update(self)
 				self.ShakeRange = self.origShakeRange;
 				self.SharpShakeRange = self.origSharpShakeRange;
 			end
+			if not playerControlled then
+				self.RateOfFire = 70;
+			end
 		else
 			self.FullAuto = true;
 			self.reloadDelay = 150;
@@ -177,6 +185,7 @@ function Update(self)
 				self.rotateAnim = true;
 				self.hammerDown = false;
 				self.InheritedRotAngleTarget = 0;
+				self.rotationSpeed = 0.1;
 			end
 		end
 

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