Big cleanup pass for new multithreading semantics

Causeless · Causeless · commit 8b9d8a9b1d21 · 2023-11-22T22:40:49.000Z
diff --git a/Data/Base.rte/AI/CrabAI.lua b/Data/Base.rte/AI/CrabAI.lua
@@ -1,12 +1,10 @@
---[[MULTITHREAD]]--
-
 require("AI/NativeCrabAI");
 
 function Create(self)
 	self.AI = NativeCrabAI:Create(self);
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end
 
diff --git a/Data/Base.rte/AI/DropShipAI.lua b/Data/Base.rte/AI/DropShipAI.lua
@@ -1,11 +1,9 @@
---[[MULTITHREAD]]--
-
 require("AI/NativeDropShipAI");
 
 function Create(self)
 	self.AI = NativeDropShipAI:Create(self);
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end
diff --git a/Data/Base.rte/AI/HumanAI.lua b/Data/Base.rte/AI/HumanAI.lua
@@ -1,11 +1,9 @@
---[[MULTITHREAD]]--
-
 require("AI/NativeHumanAI");
 
 function Create(self)
 	self.AI = NativeHumanAI:Create(self);
 end
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end
 function Destroy(self)
diff --git a/Data/Base.rte/AI/RocketAI.lua b/Data/Base.rte/AI/RocketAI.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 require("AI/PID");
 
 function Create(self)
@@ -59,7 +57,7 @@ function Create(self)
 	---------------- AI variables end ----------------
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.Ctrl = self:GetController();
 
 	if self.PlayerInterferedTimer:IsPastSimTimeLimit() then
diff --git a/Data/Base.rte/AI/TurretAI.lua b/Data/Base.rte/AI/TurretAI.lua
@@ -1,12 +1,10 @@
---[[MULTITHREAD]]--
-
 require("AI/NativeTurretAI");
 
 function Create(self)
 	self.AI = NativeTurretAI:Create(self);
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end
 
diff --git a/Data/Base.rte/Devices/Shared/Scripts/BurstFire.lua b/Data/Base.rte/Devices/Shared/Scripts/BurstFire.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.shotsPerBurst = self:NumberValueExists("ShotsPerBurst") and self:GetNumberValue("ShotsPerBurst") or 3;
 	self.coolDownDelay = (60000/self.RateOfFire) + 100;
diff --git a/Data/Base.rte/Devices/Shared/Scripts/RecoilTilt.lua b/Data/Base.rte/Devices/Shared/Scripts/RecoilTilt.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.InheritedRotAngleOffset = 0;
 	self.recoilAngleSize = self:NumberValueExists("RecoilAngleSize") and math.rad(self:GetNumberValue("RecoilAngleSize")) or 0.5/math.sqrt(self.Radius);
diff --git a/Data/Base.rte/Devices/Shared/Scripts/ShotgunReload.lua b/Data/Base.rte/Devices/Shared/Scripts/ShotgunReload.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.reloadTimer = Timer();
 	self.loadedShell = false;
diff --git a/Data/Base.rte/Devices/Shared/Scripts/TrajectoryGuide.lua b/Data/Base.rte/Devices/Shared/Scripts/TrajectoryGuide.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.laserTimer = Timer();
 	self.laserTimer:SetSimTimeLimitMS(10);
diff --git a/Data/Base.rte/Devices/Weapons/Shotgun/Shotgun.lua b/Data/Base.rte/Devices/Weapons/Shotgun/Shotgun.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.pullTimer = Timer();
 	self.loaded = false;
diff --git a/Data/Base.rte/Effects/Pyro/Flame/Flame.lua b/Data/Base.rte/Effects/Pyro/Flame/Flame.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.ageRatio = 1;
 	--A separate delay for lifetime control is used to preserve animation speed
diff --git a/Data/Base.rte/Effects/Pyro/Flame/GroundFlame.lua b/Data/Base.rte/Effects/Pyro/Flame/GroundFlame.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.shortFlame = CreatePEmitter("Flame Hurt Short Float", "Base.rte");
 	
diff --git a/Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/BuyDoor/BuyDoor.lua b/Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/BuyDoor/BuyDoor.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function OnMessage(self, message, orderList)
 	--print("message gotten?")
 	--if self:IsInventoryEmpty() then
diff --git a/Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/ItemDispenser/ItemDispenser.lua b/Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/ItemDispenser/ItemDispenser.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function OnMessage(self, message)
 
 	if message == self.deactivationMessage or message == "DEACTIVATEALLITEMDISPENSERS" then
diff --git a/Data/Browncoats.rte/Actors/Infantry/BrowncoatBoss/BrowncoatBoss.lua b/Data/Browncoats.rte/Actors/Infantry/BrowncoatBoss/BrowncoatBoss.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 require("Actors/Infantry/BrowncoatBoss/BrowncoatBossFunctions");
 dofile("Base.rte/Constants.lua")
 
diff --git a/Data/Browncoats.rte/Actors/Infantry/BrowncoatBoss/BrowncoatBossFunctions.lua b/Data/Browncoats.rte/Actors/Infantry/BrowncoatBoss/BrowncoatBossFunctions.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 dofile("Base.rte/Constants.lua")
 
 BrowncoatBossFunctions = {};
diff --git a/Data/Browncoats.rte/Devices/Tools/Blowtorch/Blowtorch.lua b/Data/Browncoats.rte/Devices/Tools/Blowtorch/Blowtorch.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.startSound = CreateSoundContainer("Ignite DG-1000", "Browncoats.rte");
 	self.endSound = CreateSoundContainer("Loop End DG-1000", "Browncoats.rte");
diff --git a/Data/Browncoats.rte/Devices/Weapons/Heatlance/Heatlance.lua b/Data/Browncoats.rte/Devices/Weapons/Heatlance/Heatlance.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 
 	self.igniteSound = CreateSoundContainer("Ignite FT-200", "Browncoat.rte");
diff --git a/Data/Browncoats.rte/Devices/Weapons/Jackhammer/Jackhammer.lua b/Data/Browncoats.rte/Devices/Weapons/Jackhammer/Jackhammer.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 -- This script incorporates Filipawn Industries code
 -- There are likely better ways of doing a lot of this, potentially even standardizing it so it can be easily used more widely
 
diff --git a/Data/Browncoats.rte/Scenes/Objects/BunkerSystems/RefineryAmbienceController/RefineryAmbienceController.lua b/Data/Browncoats.rte/Scenes/Objects/BunkerSystems/RefineryAmbienceController/RefineryAmbienceController.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 
 	self.Activity = ActivityMan:GetActivity();
diff --git a/Data/Coalition.rte/Devices/Weapons/GatlingGun/GatlingGun.lua b/Data/Coalition.rte/Devices/Weapons/GatlingGun/GatlingGun.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.origActivationDelay = self.ActivationDelay;
 	self.spinDownTimer = Timer();
diff --git a/Data/Coalition.rte/Devices/Weapons/MissileLauncher/MissileLauncher.lua b/Data/Coalition.rte/Devices/Weapons/MissileLauncher/MissileLauncher.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.fireVel = 50;
 	self.checkTimer = Timer();
diff --git a/Data/Dummy.rte/Devices/Weapons/Lancer/Lancer.lua b/Data/Dummy.rte/Devices/Weapons/Lancer/Lancer.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.chargeTimer = Timer();
 	self.chargeCounter = 10;
diff --git a/Data/Dummy.rte/Devices/Weapons/Repeater/Repeater.lua b/Data/Dummy.rte/Devices/Weapons/Repeater/Repeater.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.muzzleTable = {self.MuzzleOffset + Vector(0, -1), self.MuzzleOffset + Vector(0, 2)};
 	self.muzzleSelect = 0;
diff --git a/Data/Imperatus.rte/Actors/Shared/Robot.lua b/Data/Imperatus.rte/Actors/Shared/Robot.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.walkSpeed = self:GetLimbPathSpeed(1);
 end
diff --git a/Data/Ronin.rte/Actors/Infantry/RoninLight/Hair.lua b/Data/Ronin.rte/Actors/Infantry/RoninLight/Hair.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function ThreadedUpdate(self)
 	local gravity = (self.Vel + self.PrevVel)/2 - SceneMan.GlobalAcc * rte.PxTravelledPerFrame;
 	self.RotAngle = gravity.AbsRadAngle;
diff --git a/Data/Ronin.rte/Actors/Shared/RoninSoldier.lua b/Data/Ronin.rte/Actors/Shared/RoninSoldier.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 require("Loadouts");
 
 function Create(self)
diff --git a/Data/Ronin.rte/Devices/Weapons/DesertEagle/DesertEagle.lua b/Data/Ronin.rte/Devices/Weapons/DesertEagle/DesertEagle.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	--Suffer from fire rate loss when firing rapidly
 	self.fireRatePenaltyPerShot = 75;
diff --git a/Data/Techion.rte/Actors/Infantry/SilverMan/Regeneration.lua b/Data/Techion.rte/Actors/Infantry/SilverMan/Regeneration.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.healAmount = 1;
 	self.regenDelay = 750;
diff --git a/Data/Techion.rte/Devices/Weapons/LaserRifle/LaserRifle.lua b/Data/Techion.rte/Devices/Weapons/LaserRifle/LaserRifle.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.range = math.sqrt(FrameMan.PlayerScreenWidth^2 + FrameMan.PlayerScreenHeight^2)/2;
 	self.penetrationStrength = 170;
diff --git a/Data/Techion.rte/Devices/Weapons/NanoRifle/NanoRifleSight.lua b/Data/Techion.rte/Devices/Weapons/NanoRifle/NanoRifleSight.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.laserTimer = Timer();
 	self.laserCheckDelay = 30;
diff --git a/Data/Uzira.rte/Actors/Shared/Climb.lua b/Data/Uzira.rte/Actors/Shared/Climb.lua
@@ -1,5 +1,3 @@
---[[MULTITHREAD]]--
-
 function Create(self)
 	self.width = self:GetSpriteWidth();
 	self.grabbedMO = nil;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`---[[MULTITHREAD]]--`
`2`		`-`
`3`	`1`	`function Create(self)`
`4`	`2`	`self.shotsPerBurst = self:NumberValueExists("ShotsPerBurst") and self:GetNumberValue("ShotsPerBurst") or 3;`
`5`	`3`	`self.coolDownDelay = (60000/self.RateOfFire) + 100;`