Merge branch 'development' into acdropship-classname-comparisons

Author: Bit-Crust

CHANGELOG.md

@@ -187,6 +187,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed several issues with the way pie menus and aiming interacts between players, such as opening the pie menu always resetting the M&KB player's aim and pie selection, as well as another issue where the pie menu would fail to appear entirely for some players.
 
+- Fixed issue where scripts applied to `MovableObject`s could become disordered in certain circumstances.
+
 </details>
 
 <details><summary><b>Removed</b></summary>

Data/Base.rte/AI/SharedBehaviors.lua

@@ -259,7 +259,7 @@ function SharedBehaviors.Patrol(AI, Owner, Abort)
 
 	if Dist:MagnitudeIsGreaterThan(20) then
 		Owner:ClearAIWaypoints();
-		Owner:AddAISceneWaypoint(Free);	
+		Owner:AddAISceneWaypoint(Free);
 		Owner:UpdateMovePath();
 
 		-- wait until movepath is updated
@@ -434,7 +434,7 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 	local obstacleState = Actor.PROCEEDING;
 	local Obst = {R_LOW = 1, R_FRONT = 2, R_HIGH = 3, R_UP = 5, L_UP = 6, L_HIGH = 8, L_FRONT = 9, L_LOW = 10};
 	local Facings = {{aim=0, facing=0}, {aim=1.4, facing=1.4}, {aim=1.4, facing=math.pi-1.4}, {aim=0, facing=math.pi}};
-	
+
 	local NeedsNewPath, Waypoint, HasMovePath, Dist, CurrDist;
 	NeedsNewPath = true;
 
@@ -518,7 +518,7 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 		end
 
 		AverageVel = SharedBehaviors.UpdateAverageVel(Owner, AverageVel);
-		
+
 		local stuckThreshold = 2.5; -- pixels per second of movement we need to be considered not stuck
 
 		-- Cap AverageVel, so if we have a spike in velocity it doesn't take too long to come back down
@@ -1089,7 +1089,7 @@ function SharedBehaviors.GetProjectileData(Owner)
 		PrjDat.vqu = PrjDat.vsq^2; -- muzzle velocity quad
 		PrjDat.drg = 1 - Projectile.AirResistance * TimerMan.DeltaTimeSecs; -- AirResistance is stored as the ini-value times 60
 		PrjDat.thr = math.min(Projectile.AirThreshold, PrjDat.vel);
-		PrjDat.pen = (Projectile.Mass * Projectile.Sharpness * PrjDat.vel) * PrjDat.drg;
+		PrjDat.pen = Weapon:GetAIPenetration() * PrjDat.drg;
 
 		PrjDat.blast = Weapon:GetAIBlastRadius();
 		if PrjDat.blast > 0 or Weapon:IsInGroup("Weapons - Explosive") then

Data/Base.rte/Actors/Mecha/AADrone/Drone.ini

@@ -85,8 +85,21 @@ AddDevice = HDFirearm
 	Flash = Attachable
 		CopyOf = Muzzle Flash SMG
 	FireSound = SoundContainer
-		AddSound = ContentFile
-			FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Fire1.flac
+		AttenuationStartDistance = 165
+		SoundSelectionCycleMode = All
+		AddSoundSet = SoundSet		
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot1.flac
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot2.flac
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot3.flac
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot4.flac
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot5.flac
+			AddSound = ContentFile
+				FilePath = Ronin.rte/Devices/Weapons/AK47/Sounds/Shot6.flac
 	EmptySound = SoundContainer
 		AddSound = ContentFile
 			FilePath = Base.rte/Sounds/Devices/EmptyClick1.flac

Data/Base.rte/Scenes/Objects/Bunkers/BunkerModules/TunnelABG.png

@@ -11,11 +11,11 @@ IncludeFile = Browncoats.rte/Actors/Shared.ini
 
 IncludeFile = Browncoats.rte/Actors/Infantry/BrowncoatLight/BrowncoatLight.ini
 IncludeFile = Browncoats.rte/Actors/Infantry/BrowncoatHeavy/BrowncoatHeavy.ini
-IncludeFile = Browncoats.rte/Actors/Infantry/BrowncoatBoss/BrowncoatBoss.ini
+//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