Merge branch 'development' into mopixelcolorchange

Author: comradeshook

CHANGELOG.md

@@ -60,7 +60,33 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	New `SoundContainer` INI and Lua (R/W) property `BusRouting`, which denotes which bus the SoundContainer routes to. Available busses: `SFX, UI, Music`. Defaults to `SFX`.  
 	`Enum` binding for `SoundContainer.BusRouting`: `SFX = 0, UI = 1, MUSIC = 2`.  
 	New `SoundContainer` INI and Lua (R/W) property `PanningStrengthMultiplier`, which will multiply the strength of 3D panning. This can be used to achieve for example a psuedo-Immobile effect where attenuation effects are still applied but the sound does not move from the center. Recommended to keep between 0.0 and 1.0.  
-	New `SoundContainer` INI and Lua (R/W) property `CustomPanValue`, which hard-overrides the panning of a sound. Clamped between -1 and 1 for left and right panning. 0 disables the override and will re-enable default behavior. This should probably only be used on Immobile sounds, but it can be used on any sound. No guarantees.
+	New `SoundContainer` INI and Lua (R/W) property `CustomPanValue`, which hard-overrides the panning of a sound. Clamped between -1 and 1 for left and right panning. 0 disables the override and will re-enable default behavior. This should probably only be used on Immobile sounds, but it can be used on any sound.
+	
+- Many new sounds added to the game.
+	Browncoats have gotten a full sound revamp for everything except their actors. Every item now has its own custom sounds.
+	Most base explosions and Riot Shield sounds have been redone.
+
+- New delivery system, Buy Doors:
+	Buy doors are customizable inert background objects that can take orders either via Lua messages or by using the pie menu near them.
+	Using them via the pie menu will order your current buy menu order. 
+	
+- Capturable Framework, which is a very customizable object that can be captured by teams and send out Lua messages as it does so. Should be extremely useful to make new forms of activities.
+
+- Item Dispenser object which dispenses items via the pie menu in a customizable way.
+
+- Timed capturing docks for rockets and dropships, which are nifty on their own but shine when used with the DockingHandler to have AI use them.
+
+- A whole suite of Lua frameworks for activities:
+	BuyDoorHandler, which has a few utility functions to use buy doors at the activity-level easier.
+	DeliveryCreationHandler, which standardizes creating squads of actors and their equipment.
+	DockingHandler, which handles craft docking using the new docks.
+	HUDHandler, which provides functions for displaying listed objectives, panning the camera, and other camera-related utilities.
+	SaveLoadHandler, which can serialize tables and also handle saving and loading tricky things like MOs.
+	TacticsHandler, which is a framework to add tasks and squads and have those squads go around doing tasks without further input.
+	
+- Two minor utility scripts:
+	MOUtility, which currently has functions to smartly set MOs to be unhittable or to freeze actor HP.
+	ParticleUtility, which currently has a directional smoke FX creation function.
 
 - Tracy profiler integration.  
 	You can now attach Tracy to builds of the game and see profiling information about various zones and how long they take.  
@@ -82,7 +108,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `HDFirearm` INI and Lua (R/W) property `ReloadEndOffset`, to define how many milliseconds prior to the reload being complete that the `ReloadEndSound` should play. Defaults to -1, which means the game will automatically calculate so that the middle of the sound is aligned with the reload completing.  
 
-- New `Actor` INI and Lua (R/W) property `PainThreshold`, which determines how much damage this actor must take in a frame to play their `PainSound`. This can be set to 0 to never manually play the sound. Defaults to 15.  
+- New `Actor` INI and Lua (R/W) property `PainThreshold`, which determines how much damage this actor must take in a frame to play their `PainSound`. This can be set to 0 to never play the sound. Defaults to 15.  
 
 - New `AHuman` INI and Lua (R/W) property `MaxWalkPathCrouchShift`, which determines how much the actor will automatically duck down to avoid low ceilings above them. This can be set to 0 to never duck. Defaults to 6.  
 
@@ -136,6 +162,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `MOPixel` Lua functions `GetColorIndex()` and `SetColorIndex(int newColorIndex)`, which allow you to get and set the index of the pixel's color.
 
+- Three new Browncoat items have been added: a shield with reactive explosive armor, a revolver, and a close-range incendiary battle rifle.
+
+- AI idle aim timer (the time the AI stops after aiming fully up or fully down in sentry mode) is now customizable using a custom number value for ACrabs. Use it to make your turrets less spastic.
+
 </details>
 
 <details><summary><b>Changed</b></summary>
@@ -182,6 +212,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - `SceneMan` Lua function `DislodgePixel()` and all of its derivatives now return `MOPixels` instead of `MovableObjects`.
 
+- MuzzleSmoke.lua now uses the new ParticleUtility directional smoke function for a more interesting effect.
+
 </details>
 
 <details><summary><b>Fixed</b></summary>
@@ -202,6 +234,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed a crash that could occur when scripted objects were deleted, particularly when switching scene.
 
+- Fixed underperforming fire weaponry. It wasn't sticking to Attachables and as such would only very rarely do damage-over-time.
+
+- Fixed dropships using absolute positions to calculate their delivery waypoint, resulting in them moving weirdly.
+
 </details>
 
 <details><summary><b>Removed</b></summary>

Data/Base.rte/AI/NativeDropShipAI.lua

@@ -113,16 +113,14 @@ function NativeDropShipAI:Update(Owner)
 			else
 				startingHeight = Owner.Pos.Y;
 			end
-			local WptL = SceneMan:MovePointToGround(Vector(-Owner.Radius, startingHeight), self.hoverAlt, 12);
-			local WptC = SceneMan:MovePointToGround(Vector(0, startingHeight), self.hoverAlt, 12);
-			local WptR = SceneMan:MovePointToGround(Vector(Owner.Radius, startingHeight), self.hoverAlt, 12);
+			local WptL = SceneMan:MovePointToGround(Vector(Owner.Pos.X - Owner.Radius, startingHeight), self.hoverAlt, 12);
+			local WptC = SceneMan:MovePointToGround(Vector(Owner.Pos.X, startingHeight), self.hoverAlt, 12);
+			local WptR = SceneMan:MovePointToGround(Vector(Owner.Pos.X + Owner.Radius, startingHeight), self.hoverAlt, 12);
 			self.Waypoint = Vector(Owner.Pos.X, math.min(WptL.Y, WptC.Y, WptR.Y));
 
 			self.DeliveryState = ACraft.FALL;
 		end
 	end
-	
-	-- print(Owner.AIMode);
 
 	if self.PlayerInterferedTimer:IsPastSimTimeLimit() then
 		self.StuckTimer:Reset();
@@ -152,9 +150,9 @@ function NativeDropShipAI:Update(Owner)
 					self.Waypoint.Y = -500;
 				else
 					local startingHeight = math.max(Owner.Radius * 1.25, Owner.Pos.Y);
-					local WptL = SceneMan:MovePointToGround(Vector(-Owner.Radius, startingHeight), self.hoverAlt, 12);
-					local WptC = SceneMan:MovePointToGround(Vector(0, startingHeight), self.hoverAlt, 12);
-					local WptR = SceneMan:MovePointToGround(Vector(Owner.Radius, startingHeight), self.hoverAlt, 12);
+					local WptL = SceneMan:MovePointToGround(Vector(Owner.Pos.X - Owner.Radius, startingHeight), self.hoverAlt, 12);
+					local WptC = SceneMan:MovePointToGround(Vector(Owner.Pos.X, startingHeight), self.hoverAlt, 12);
+					local WptR = SceneMan:MovePointToGround(Vector(Owner.Pos.X + Owner.Radius, startingHeight), self.hoverAlt, 12);
 					self.Waypoint = Vector(Owner.Pos.X, math.min(WptL.Y, WptC.Y, WptR.Y));
 				end
 			end
@@ -168,27 +166,9 @@ function NativeDropShipAI:Update(Owner)
 		if Owner.IsWaitingOnNewMovePath then
 			self.reachedWaypoint = false;
 			self.Waypoint = nil;
-			-- print("wasnotready");
 			return;
 		end
-	
-		-- print("ourpos")
-		-- print(Owner.Pos)
-		-- print("")
-		-- print("desiredpos")
-		-- print(self.Waypoint)
-		-- print("")
-		-- if Owner:GetWaypointListSize() > 0 then
-			-- print("nextWaypointPos")
-			-- for Wpt in Owner.SceneWaypoints do
-				-- print(Wpt)
-			-- end
-		-- else
-			-- print("nonewwaypoint")
-		-- end
-		-- print("")
-		-- print(self.reachedWaypoint)
-	
+
 		if self.Waypoint == nil or self.reachedWaypoint then
 			self.reachedWaypoint = false;
 			for Wpt in Owner.MovePath do
@@ -198,11 +178,9 @@ function NativeDropShipAI:Update(Owner)
 			local Dist = SceneMan:ShortestDistance(Owner.Pos, self.Waypoint, false);
 			if Dist.Magnitude < 20 then
 				if Owner:GetWaypointListSize() == 0 then
-					--print("sentry")
 					Owner.AIMode = Actor.AIMODE_SENTRY;
 					self.Waypoint = Owner.Pos;
 				else
-					--print("reached, cleared")
 					Owner:ClearMovePath();
 					Owner:UpdateMovePath();
 					self.reachedWaypoint = true;

Data/Base.rte/AI/RocketAI.lua

@@ -195,9 +195,6 @@ function ThreadedUpdateAI(self)
 	if self.DeliveryState ~= ACraft.UNLOAD then
 		dist = SceneMan:ShortestDistance(self.Pos+self.Vel, self.LZpos, false);
 		change = self.YposPID:Update(dist.Y, 0);
-		--print("NEW")
-		--print(dist)
-		--print(change)
 		if math.abs(self.RotAngle) < 0.9 then
 			if self.AIMode == Actor.AIMODE_GOTO then
 				if change < 0 then

Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/BuyDoor/BuyDoor.lua

@@ -1,21 +1,17 @@
 function OnMessage(self, message, context)
-	--print("message gotten?")
-	--if self:IsInventoryEmpty() then
-		if message == "BuyDoor_CustomTableOrder" then
-			self.Unusable = true;
-			local finalOrder = BuyDoorSetupOrder(self, context, true);
-			
-			--print("WE HAVE GOTTEN AN ORDER")
-			
-			if finalOrder then
-				self.orderTimer:Reset();
-				self.orderDelivering = true;
-			else
-				print("Buy Door was given a custom table order, but it had no items!");
-			end
+
+	if message == "BuyDoor_CustomTableOrder" then
+		self.Unusable = true;
+		local finalOrder = BuyDoorSetupOrder(self, context, true);
+		
+		if finalOrder then
+			self.orderTimer:Reset();
+			self.orderDelivering = true;
+		else
+			print("Buy Door was given a custom table order, but it had no items!");
 		end
-	--end
-	
+	end
+		
 	if message == "BuyDoor_ChangeCooldownTime" then
 		self.cooldownTime = context;
 		self:SetNumberValue("CooldownTime", context);
@@ -58,7 +54,6 @@ function BuyDoorSetupOrder(self, orderList, isCustomOrder, team)
 			local clonedItem = _G[typeCast](item):Clone();
 			if IsActor(clonedItem) and team then
 				clonedItem.Team = team;
-				--print(clonedItem)
 			end
 			if IsAHuman(item) then
 				lastActor = clonedItem;
@@ -105,7 +100,6 @@ function BuyDoorSetupOrder(self, orderList, isCustomOrder, team)
 	-- Finally, add the order to our inventory
 
 	for k, item in pairs(finalOrder) do
-		--print(item)
 		self:AddInventoryItem(item);
 	end
 
@@ -142,8 +136,6 @@ function Create(self)
 	if self.Frame == 0 then
 		self.Frame = 1;
 	end
-	
-	--print("buydoor" .. self.Frame)
 
 	self.isStayingOpen = false;
 	if self:GetNumberValue("isStayingOpen") == 1 then
@@ -215,7 +207,6 @@ function ThreadedUpdate(self)
 		-- Spawn the next object
 		if self.spawnTimer:IsPastSimMS(self.spawnDelay) then
 			self:RequestSyncedUpdate();
-			--print("GIVE ME SYNCED UPDATE NOW")
 		end
 	elseif self.isStayingOpen and not self.isClosing and self.stayOpenTimer:IsPastSimTimeLimit() then
 		self.SpriteAnimMode = MOSprite.ALWAYSPINGPONG;
@@ -230,7 +221,6 @@ function ThreadedUpdate(self)
 	if self.cooldownTimer:IsPastSimMS(self.cooldownTime) then
 		self.Unusable = false;
 		if self.orderDelivering then
-			--print("trying to deliver....")
 			self.Unusable = true;
 			if self.orderTimer:IsPastSimMS(self.orderDelay) then
 				self.SpriteAnimMode = MOSprite.ALWAYSPINGPONG;
@@ -269,7 +259,7 @@ function ThreadedUpdate(self)
 		PrimitiveMan:DrawTextPrimitive(self.console.Pos, self.Message, true, 1);
 	end
 
-	PrimitiveMan:DrawTextPrimitive(self.console.Pos + Vector(0, 20), "Team: " .. self.Team, true, 1);
+	--PrimitiveMan:DrawTextPrimitive(self.console.Pos + Vector(0, 20), "Team: " .. self.Team, true, 1);
 
 	if self.Unusable then
 		PrimitiveMan:DrawTextPrimitive(self.console.Pos + Vector(0, -20), "UNUSABLE", true, 1);
@@ -315,25 +305,13 @@ function SyncedUpdate(self)
 						if self:IsInventoryEmpty() and not self.Unusable then
 							-- Set up order here
 
-							-- We have to rebuild this table each time, because teams can change
-							
-							-- self.playerTeamTable = {};
-							-- for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
-								-- if self.Activity:PlayerActive(player) and self.Activity:PlayerHuman(player) then
-									-- self.playerTeamTable[self.Activity:GetTeamOfPlayer(player)] = player;
-								-- end
-							-- end
-							
 							local team = actor.Team;
 							local player = actor:GetController().Player;		
 							local buyGUI = self.Activity:GetBuyGUI(player);
 							local orderCost = buyGUI:GetTotalCartCost();
 
 							local funds = self.Activity:GetTeamFunds(team);
 
-							--print("cost: "..orderCost)
-							--print("funds: "..funds)
-							
 							if funds < orderCost then
 								self.Message = "Insufficient funds!"
 								self.messageTime = 4000;

Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/GenericCapturable/GenericCapturable.lua

@@ -40,11 +40,9 @@ function Create(self)
 
 	self.Activity = ToGameActivity(ActivityMan:GetActivity());
 	self.Scene = SceneMan.Scene;
-	--print(self:GetStringValue("SceneCaptureArea"))
 	if self:StringValueExists("SceneCaptureArea") then
 		if self.Scene:HasArea(self:GetStringValue("SceneCaptureArea")) then
 			self.captureArea = self.Scene:GetArea(self:GetStringValue("SceneCaptureArea"));
-			--print("foundarea")
 		end
 	end
 
@@ -190,20 +188,19 @@ function ThreadedUpdate(self)
 		end
 	end
 
-	PrimitiveMan:DrawTextPrimitive(self.Pos + Vector(0, -20), tostring("Team: " .. self.Team), true, 1);
-	PrimitiveMan:DrawTextPrimitive(self.Pos + Vector(0, -30), tostring("Capturing Team: " .. self.capturingTeam), true, 1);
-	PrimitiveMan:DrawTextPrimitive(self.Pos + Vector(0, -40), tostring("Dominant Team: " .. self.dominantTeam), true, 1);
+	--PrimitiveMan:DrawTextPrimitive(self.Pos + Vector(0, -20), tostring("Team: " .. self.Team), true, 1);
+	--PrimitiveMan:DrawTextPrimitive(self.Pos + Vector(0, -30), tostring("Capturing Team: " .. self.capturingTeam), true, 1);
+	--PrimitiveMan:DrawTextPrimitive(self.Pos + Vector(0, -40), tostring("Dominant Team: " .. self.dominantTeam), true, 1);
 
-	PrimitiveMan:DrawTextPrimitive(self.Pos, tostring(self.captureProgress * 100), true, 1);
+	--PrimitiveMan:DrawTextPrimitive(self.Pos, tostring(self.captureProgress * 100), true, 1);
 
-	if self.Deactivated then
-		PrimitiveMan:DrawTextPrimitive(self.Pos + Vector(0, -60), "DEACTIVATED"	, true, 1);	
-	end
+	-- if self.Deactivated then
+		-- PrimitiveMan:DrawTextPrimitive(self.Pos + Vector(0, -60), "DEACTIVATED"	, true, 1);	
+	-- end
 end
 
 function SyncedUpdate(self)
 	if self.shouldSendCaptureMessage then
-		print("shouldhavesentmessage: " .. self.messageOnCapture)
 		if self.useGlobalMessaging then
 			MovableMan:SendGlobalMessage(self.messageOnCapture, self.dominantTeam);
 		else

Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/ItemDispenser/ItemDispenser.lua

@@ -84,7 +84,7 @@ function ThreadedUpdate(self)
 		PrimitiveMan:DrawTextPrimitive(self.Pos, self.Message, true, 1);
 	end
 
-	PrimitiveMan:DrawTextPrimitive(self.Pos + Vector(0, 20), "Team: " .. self.Team, true, 1);
+	--PrimitiveMan:DrawTextPrimitive(self.Pos + Vector(0, 20), "Team: " .. self.Team, true, 1);
 
 end
 

Data/Base.rte/Scenes/Objects/Bunkers/Bunkers.ini

@@ -18,8 +18,8 @@ IncludeFile = Base.rte/Scenes/Objects/Bunkers/BunkerModules/Ancient/AncientModul
 // Systems
 
 IncludeFile = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Doors/Doors.ini
-IncludeFile = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/BlastDoors/BlastDoors.ini
-IncludeFile = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/VaultDoor/VaultDoors.ini
+//IncludeFile = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/BlastDoors/BlastDoors.ini
+//IncludeFile = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/VaultDoor/VaultDoors.ini
 IncludeFile = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Docks/Docks.ini
 IncludeFile = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Ladders/Ladders.ini
 IncludeFile = Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Automovers/Automovers.ini

Data/Base.rte/Scripts/Global/DebugFunctions.lua

@@ -32,6 +32,11 @@ function DebugFunctionsScript:UpdateScript()
 		-- Keypad 9 for HUD Toggle
 		if UInputMan:KeyPressed(Key.KP_9) then
 			self.HUDToggle = not self.HUDToggle and true or false;
+			if self.HUDToggle then
+				FrameMan:SetHudDisabled(true, 0);
+			else
+				FrameMan:SetHudDisabled(false, 0);
+			end
 		end
 
 		if self.HUDToggle then
@@ -108,6 +113,9 @@ function DebugFunctionsScript:UpdateScript()
 			for actor in MovableMan.Actors do
 				if actor:IsPlayerControlled() then
 					MovableMan:ChangeActorTeam(actor, teamNum)
+					if not IsACraft(actor) then
+						actor.AIMode = Actor.AIMODE_SENTRY;
+					end
 					if IsACRocket(actor) or IsACDropShip(ToActor(actor)) then
 						for item in actor.Inventory do
 							if (IsAHuman(item) or IsACrab(item)) then

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

@@ -23,8 +23,8 @@ function Create(self)
 	self.reloadDelay = 200;
 	self.origReloadTime = 900;
 
-	self.origStanceOffset = self.StanceOffset;
-	self.origSharpStanceOffset = self.SharpStanceOffset;
+	self.origStanceOffset = Vector(math.abs(self.StanceOffset.X), self.StanceOffset.Y);
+	self.origSharpStanceOffset = Vector(self.SharpStanceOffset.X, self.SharpStanceOffset.Y);
 
 	self.origShakeRange = self.ShakeRange;
 	self.origSharpShakeRange = self.SharpShakeRange;
@@ -347,5 +347,5 @@ function Update(self)
 	if self.InheritedRotAngleTarget > 0 then
 		self.InheritedRotAngleTarget = math.max(self.InheritedRotAngleTarget - TimerMan.DeltaTimeSecs, 0);
 	end
-
+	
 end