Merge branch 'cortex-command-community:development' into separate-thread-module-loading

Author: getcetc

.vscode/launch.json

@@ -20,13 +20,28 @@
       }
     },
     {
-      "name": "meson Debug (Release)",
+      "name": "meson Configure Final & Launch",
       "type": "cppdbg",
       "osx": {
         "MIMode": "lldb"
       },
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
+      "cwd": "${workspaceFolder}",
+      "preLaunchTask": "meson Build Release",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "unix"
+      }
+    },
+    {
+      "name": "meson Configure Debug (Release) & Launch",
+      "type": "cppdbg",
+      "osx": {
+        "MIMode": "lldb"
+      },
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Release)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -35,13 +50,13 @@
       }
     },
     {
-      "name": "meson Debug (Minimal)",
+      "name": "meson Configure Debug (Minimal) & Launch",
       "type": "cppdbg",
       "osx": {
         "MIMode": "lldb"
       },
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Minimal)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -50,13 +65,13 @@
       }
     },
     {
-      "name": "meson Debug (Full)",
+      "name": "meson Configure Debug (Full) & Launch",
       "type": "cppdbg",
       "osx": {
         "MIMode": "lldb"
       },
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Full)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -116,17 +131,29 @@
       "request": "launch",
       "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
       "cwd": "${workspaceFolder}",
+      "preLaunchTask": "Meson: Build all targets",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "windows"
+      }
+    },
+    {
+      "name": "meson Configure Final & Launch [Windows]",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
+      "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Release",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
       "presentation": {
         "group": "windows"
       }
     },
     {
-      "name": "meson Debug (Release) [Windows]",
+      "name": "meson Configure Debug (Release) & Launch [Windows]",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.release.exe",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Release)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -135,10 +162,10 @@
       }
     },
     {
-      "name": "meson Debug (Minimal) [Windows]",
+      "name": "meson Configure Debug (Minimal) & Launch [Windows]",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.minimal.exe",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Minimal)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -147,10 +174,10 @@
       }
     },
     {
-      "name": "meson Debug (Full) [Windows]",
+      "name": "meson Configure Debug (Full) & Launch [Windows]",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.full.exe",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Full)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",

Data/Base.rte/Activities/BunkerBreach.lua

@@ -142,16 +142,16 @@ function BunkerBreach:SetupDefenderActors()
 	local crabToHumanSpawnRatio = self:GetCrabToHumanSpawnRatio(techID);
 
 	local loadoutNames = {"Light", "Heavy", "Sniper", "Engineer", "Mecha", "Turret"};
-	
+
 	local hasSpawnAreas = false;
 	for _, loadoutName in pairs(loadoutNames) do
 		if SceneMan.Scene:HasArea(loadoutName .. " Defenders") then
 			hasSpawnAreas = true;
 		end
 	end
-	
+
 	for actor in MovableMan.AddedActors do
-		if not actor:IsInGroup("Brains") and not actor:IsInGroup("Bunker Systems") then
+		if not actor:IsInGroup("Brains") and not actor:IsInGroup("Bunker Systems") and not IsADoor(actor) then
 			if hasSpawnAreas then
 				actor.ToDelete = true;
 			elseif actor.Team ~= self.defenderTeam then
@@ -162,7 +162,7 @@ function BunkerBreach:SetupDefenderActors()
 			actor.Team = self.defenderTeam;
 		end
 	end
-	
+
 	if hasSpawnAreas then
 		for _, loadoutName in pairs({"Light", "Heavy", "Sniper", "Engineer", "Mecha", "Turret"}) do
 			if SceneMan.Scene:HasArea(loadoutName .. " Defenders") then
@@ -261,7 +261,7 @@ function BunkerBreach:StartActivity(isNewGame)
 			FrameMan:ClearScreenText(self:ScreenOfPlayer(player));
 		end
 	end
-	
+
 	MusicMan:PlayDynamicSong("Generic Battle Music");
 
 	if isNewGame then
@@ -675,7 +675,7 @@ function BunkerBreach:CreateInternalReinforcements(loadout, numberOfReinforcemen
 					numberOfInternalReinforcementsToCreateAtPosition = 3;
 				end
 			end
-			
+
 			for i = 1, numberOfInternalReinforcementsToCreateAtPosition do
 				local internalReinforcement;
 				if loadout then

Data/Base.rte/Craft/Shared/AttachableTurret.lua

@@ -56,7 +56,7 @@ function Update(self)
 				PrimitiveMan:DrawCirclePrimitive(self.Team, aimPos, (self.searchRange * 0.5), 13);
 			end
 			local aimTarget = MovableMan:GetClosestEnemyActor(self.Team, aimPos, (self.searchRange * 0.5), Vector());
-			if aimTarget and aimTarget.Status < Actor.INACTIVE then
+			if aimTarget and aimTarget.Status < Actor.INACTIVE and aimTarget.GetsHitByMOs then
 				--Debug: visualize search trace
 				if self.showAim then
 					PrimitiveMan:DrawLinePrimitive(self.Team, aimPos, aimTarget.Pos, 13);
@@ -89,7 +89,7 @@ function Update(self)
 			end
 
 			local color = 13;	--Debug trace color: red
-			if target and IsActor(target) and ToActor(target).Status < Actor.INACTIVE then
+			if target and IsActor(target) and ToActor(target).Status < Actor.INACTIVE and target.GetsHitByMOs then
 				self:EnableEmission(true);
 				self:TriggerBurst();
 				self.fireTimer:Reset();
@@ -106,7 +106,7 @@ function Update(self)
 			end
 		end
 	end
-	
+
 	if self.fireTimer:IsPastSimTimeLimit() then
 		self:EnableEmission(false);
 	end

Data/Base.rte/GUIs/Title/Intro/PreTitle.png

@@ -1,14 +1,14 @@
 function Create(self)
 	self.fireVel = 17;
 	self.spread = math.rad(self.ShakeRange);
-	
+
 	self.searchRange = 100 + FrameMan.PlayerScreenWidth * 0.3;
 	self.searchTimer = Timer();
 	self.searchTimer:SetSimTimeLimitMS(250);
 	self.lockThreshold = 2;
-	
+
 	self.targets = {};
-	
+
 	self.targetLockSound = CreateSoundContainer("Mine Activate", "Base.rte");
 end
 
@@ -45,16 +45,16 @@ function ThreadedUpdate(self)
 			end
 			if self.Magazine.RoundCount > 0 then
 				if controller:IsState(Controller.AIM_SHARP) then
-					
+
 					if self.searchTimer:IsPastSimTimeLimit() then
 						self.searchTimer:Reset();
-						
+
 						local searchPos = parent.ViewPoint;
 						local lastTargetCount = #self.targets;
 						self.targets = {};
 
 						for actor in MovableMan.Actors do
-							if #self.targets < self.RoundInMagCapacity and actor.Team ~= self.Team then
+							if #self.targets < self.RoundInMagCapacity and actor.Team ~= self.Team and actor.GetsHitByMOs then
 
 								if (SceneMan:ShortestDistance(searchPos, actor.Pos, SceneMan.SceneWrapsX).Magnitude - actor.Radius) < self.searchRange
 								and (actor.Vel.Magnitude + math.abs(actor.AngularVel) + 1)/math.sqrt(actor.Radius) < self.lockThreshold
@@ -99,7 +99,7 @@ function ThreadedUpdate(self)
 				if target.actor and target.actor.ID ~= rte.NoMOID then
 					local screen = ActivityMan:GetActivity():ScreenOfPlayer(ToActor(parent):GetController().Player);
 					PrimitiveMan:DrawBoxPrimitive(screen, target.actor.Pos + target.topLeft, target.actor.Pos + target.bottomRight, 149);
-					
+
 					if self.RoundInMagCount == 0 then
 						target.topLeft = target.topLeft * 0.9;
 						target.bottomRight = target.bottomRight * 0.9;

Data/Base.rte/GUIs/Title/Moon.png

@@ -43,7 +43,7 @@ function ThreadedUpdate(self)
 					local moCheck = SceneMan:GetMOIDPixel(hitPos.X, hitPos.Y);
 					if moCheck ~= rte.NoMOID then
 						local mo = ToMOSRotating(MovableMan:GetMOFromID(MovableMan:GetMOFromID(moCheck).RootID));
-						if mo and mo.ClassName ~= "ADoor" and mo.Team ~= parent.Team then
+						if mo and mo.ClassName ~= "ADoor" and mo.Team ~= parent.Team and mo.GetsHitByMOs then
 							local movement = (mo.Vel.Magnitude + math.abs(mo.AngularVel) + 0.1) * math.sqrt(mo.Radius);
 							if movement > self.lockThreshold then
 

Data/Base.rte/GUIs/Title/Planet.png

@@ -21,7 +21,7 @@ function Create(self)
 			local moCheck = SceneMan:GetMOIDPixel(checkPos.X, checkPos.Y);
 			if moCheck ~= rte.NoMOID then
 				local actor = MovableMan:GetMOFromID(MovableMan:GetMOFromID(moCheck).RootID);
-				if actor and actor.Team ~= self.Team then
+				if actor and actor.Team ~= self.Team and actor.GetsHitByMOs then
 					self.target = actor;
 					break;
 				end
@@ -66,7 +66,7 @@ function Update(self)
 			self.seekerTimer:Reset();
 			self.seekerDelay = 1000 - math.random(1000);
 			for actor in MovableMan.Actors do
-				if actor.Team ~= self.Team then
+				if actor.Team ~= self.Team and actor.GetsHitByMOs then
 					self.potentialtargetdist = SceneMan:ShortestDistance(self.Pos, actor.Pos, SceneMan.SceneWrapsX);
 					if (self.lastdist == nil or (self.lastdist ~= nil and self.potentialtargetdist:MagnitudeIsLessThan(self.lastdist))) and not self.potentialtargetdist:MagnitudeIsGreaterThan(500) and SceneMan:CastStrengthRay(self.Pos, self.potentialtargetdist:SetMagnitude(self.potentialtargetdist.Magnitude - actor.Radius), 0, Vector(), 5, rte.airID, SceneMan.SceneWrapsX) == false then
 						self.lastdist = self.potentialtargetdist.Magnitude;
@@ -81,7 +81,7 @@ function Update(self)
 	if self.lifeTimer:IsPastSimMS(8000) then
 		self:GibThis();
 	end
-	
+
 	--TODO: Add wounds through Lua like the other disintegrator weapons
 	if SceneMan:GetTerrMatter(self.Pos.X, self.Pos.Y) == rte.airID then
 		local moCheck = SceneMan:GetMOIDPixel(self.Pos.X, self.Pos.Y);

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

@@ -278,29 +278,26 @@ float AEmitter::EstimateImpulse(bool burst) {
 			if (emission->PushesEmitter()) {
 				// TODO: we're not checking emission start/stop times here, so this will always calculate the impulse as if the emission was active.
 				// There's not really an easy way to do this, since the emission rate is not necessarily constant over time.
+				float emissionsPerFrame = (emission->GetRate() / 60.0f) * g_TimerMan.GetDeltaTimeSecs();
+				float scale = 1.0F;
 
-				// TODO: burst emissions shouldn't be affected by delta time, but they were.
-				// However our values were tuned for 60hz, so hack in constant 60Hz deltatime in milliseconds.
-				float deltaTimeSecs = burst ? 1.0f / 60.0f : g_TimerMan.GetDeltaTimeSecs();
+				// Get all the particles emitted this frame
+				emissionsPerFrame *= emission->GetParticleCount();
 
-				float emissions = (emission->GetRate() / 60.0f) * deltaTimeSecs;
-				float scale = 1.0F;
+				// When bursting, add on all the bursted emissions
+				// We also use m_BurstScale on ALL emissions, not just the extra bursted ones
+				// This is a bit funky but consistent with the code that applies the impulse
 				if (burst) {
-					emissions *= emission->GetBurstSize();
+					emissionsPerFrame += emission->GetBurstSize();
 					scale = m_BurstScale;
 				}
 
-				if (emissions > 0) {
-				    int extraEmissions = emission->GetParticleCount() - 1;
-				    emissions += extraEmissions;
-			    }
-
 				float velMin = emission->GetMinVelocity() * scale;
-			    float velRange = (emission->GetMaxVelocity() - emission->GetMinVelocity()) * scale * 0.5f;
-			    float spread = (std::max(static_cast<float>(c_PI) - (emission->GetSpread() * scale), 0.0F) / c_PI); // A large spread will cause the forces to cancel eachother out
+				float velRange = (emission->GetMaxVelocity() - emission->GetMinVelocity()) * scale * 0.5f;
+				float spread = (std::max(static_cast<float>(c_PI) - (emission->GetSpread() * scale), 0.0F) / c_PI); // A large spread will cause the forces to cancel eachother out
 
 				// Add to accumulative recoil impulse generated, F = m * a.
-				impulse += (velMin + velRange) * spread * emission->m_pEmission->GetMass() * emissions;
+				impulse += (velMin + velRange) * spread * emission->m_pEmission->GetMass() * emissionsPerFrame;
 			}
 		}
 
@@ -458,17 +455,18 @@ void AEmitter::Update() {
 				} else {
 					emission->m_Accumulator = 0;
 				}
+
 				float scale = 1.0F;
 				// Add extra emissions if bursting.
 				if (m_BurstTriggered) {
 					emissionCount += emission->GetBurstSize();
 					scale = m_BurstScale;
 				}
+				
+				// We don't consider extra particles for our emission count, so add prior to multiply
 				emissionCountTotal += emissionCount;
-				if (emissionCount > 0) {
-					int extraEmissions = emission->GetParticleCount() - 1;
-					emissionCount += extraEmissions;
-				}
+				emissionCount *= emission->GetParticleCount();
+
 				pParticle = 0;
 				emitVel.Reset();
 				parentVel = pRootParent->GetVel() * emission->InheritsVelocity();