Merge pull request #155 from cortex-command-community/browncoat-mission

Browncoat Mission Progress

Author: Causeless

CHANGELOG.md

@@ -50,6 +50,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `AEmitter` and `PEmitter` INI and Lua (R/W) property `PlayBurstSound` which denotes whether the BurstSound should play when appropriate. This should not be confused for a trigger - it's just a enable/disable toggle to avoid having to remove and add BurstSound altogether.
 
+- New `MOSprite` INI and Lua (R/W) integer property `ForcedHFlip` which forces a certain flippedness and disallows anything else from ever changing it without clearing the forced value first. 0 is forced not flipped, 1 forced flipped, and -1 is no force.
+
+- New hotkey bindings.
+	On Mouse+KB PC the defaults are: Weapon Primary Hotkey on V, Weapon Auxiliary Hotkey on H, Actor Primary Hotkey on X, Actor Auxiliary Hotkey on O.
+	Added new `Controller` states `WEAPON_PRIMARY_HOTKEYSTART`, `WEAPON_AUXILIARY_HOTKEYSTART`, `ACTOR_PRIMARY_HOTKEYSTART`, `ACTOR_AUXILIARY_HOTKEYSTART`, `WEAPON_PRIMARY_HOTKEY`, `WEAPON_AUXILIARY_HOTKEY`, `ACTOR_PRIMARY_HOTKEY`, `ACTOR_AUXILIARY_HOTKEY`
+
+- New hotkey system for `Actor` and `HeldDevice`.
+	Pressing a certain new hotkey will mark it as activated on `Actor` and `HeldDevice`, letting scripts make use of the new bindings easily.
+	`Enum` binding for `HeldDevice.HeldDeviceHotkeyType`: `PRIMARY = 0, AUXILIARY = 1, HELDDEVICEHOTKEYTYPECOUNT = 2`.  
+	`Enum` binding for `Actor.ActorHotkeyType`: `PRIMARY = 0, AUXILIARY = 1, ACTORHOTKEYTYPECOUNT = 2`. 
+	Both `Actor` and `HeldDevice` have the following functions:
+	`HotkeyActionIsActivated(hotkeyType)` returns whether a certain hotkey action is being activated or not.
+	`ActivateHotkeyAction(hotkeyType)` activates a certain hotkey action.
+	`DeactivateHotkeyAction(hotkeyType)` deactivates a certain hotkey action.
+
 - New `GAScripted` Lua script method `IsCompatibleScene(scene)` to allow Activities to generically decide which Scenes are eligible by returning a boolean value.
 	New `GAScripted` INI enumerating property `AddRequiredArea`, replacing Lua file scanning, to allow Activities to explicitly state which areas are strictly required.
 	As before, these work in tandem. Both the required areas, if defined, and script conditional method, if defined, must pass for the scene to qualify.
@@ -65,7 +80,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Improved navigation, making running and fast walkpaths much more consistent.
 
 - Increased fog-of-war resolution in all vanilla activities, and conquest, from 20x20 to 4x4.
-	The Ronin Scrambler, the basic scanner, and `SceneMan:CastUnseenRay` have been changed to accomodate fog-of-war resolutions as fine as 1x1 and as course as 20x20.
+	The Ronin Scrambler, the basic scanner, and `SceneMan:CastUnseenRay` have been changed to accomodate fog-of-war resolutions as fine as 1x1 and as coarse as 20x20.
 	The fog-of-war revealing code is now multithreaded to increase performance.
 
 - All vanilla scenario activities have had their settings polished, respecting settings which make sense and disabling settings which don't.
@@ -112,6 +127,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed an issue where an `Actor`'s MovementState wasn't correctly accessible from script.
 
+- Fixed mounted HeldDevices not respecting InheritedRotAngleOffset.
+
 - Fixed an issue where internal Lua functions OriginalDoFile, OriginalLoadFile, and OriginalRequire were polluting the global namespace. They have now been made inaccessible.
 
 </details>

Data/Base.rte/Activities/Utility/DeliveryCreationHandler.lua

@@ -1026,6 +1026,23 @@ function DeliveryCreationHandler:CreateEliteSquad(team, squadCountOrTypeTable, s
 
 end
 
+function DeliveryCreationHandler:CreateCraft(team, forceRocketUsage)
+
+	local craftGroup = "Craft - Dropships";
+	if forceRocketUsage then
+		craftGroup = "Craft - Rockets";
+	end
+	presetName, createFunc, techName = self:SelectPresetByGroupPair(team, craftGroup, craftGroup, craftGroup, craftGroup);
+	
+	local craft = _G[createFunc](presetName, techName);
+	craft.Team = team;
+	--print(craft)
+	
+	local goldCost = ToSceneObject(craft):GetTotalValue(self.teamTechIDTable[team], 1);
+	
+	return craft, goldCost
+end
+
 function DeliveryCreationHandler:CreateSquadWithCraft(team, forceRocketUsage, squadCountOrTypeTable, squadType)
 
 	local craftGroup = "Craft - Dropships";

Data/Base.rte/Activities/Utility/DockingHandler.lua

@@ -232,8 +232,9 @@ function DockingHandler:SpawnUndersideDockingCraft(craft, specificDock)
 			SceneMan:ForceBounds(pos);				
 			craft:AddAISceneWaypoint(pos);
 			craft:AddAISceneWaypoint(dockTable.dockPosition);
-			local direction = dockToDockAt % 2 == 0 and 1 or -1;	
-			craft:AddAISceneWaypoint(dockTable.dockPosition + Vector(275 * direction, 0))
+			local direction = dockToDockAt % 2 == 0 and 1 or -1;
+			print("direction: " .. direction);
+			craft:AddAISceneWaypoint(dockTable.dockPosition + Vector(-275 * direction, 0))
 
 			dockTable.activeCraft = craft;
 			dockTable.dockingStage = 1;
@@ -341,7 +342,7 @@ function DockingHandler:UpdateUndersideDockingCraft()
 							craft:AddAISceneWaypoint(pos);
 							craft:AddAISceneWaypoint(dockTable.dockPosition);
 							local direction = i % 2 == 0 and 1 or -1;	
-							craft:AddAISceneWaypoint(dockTable.dockPosition + Vector(275 * direction, 0))
+							craft:AddAISceneWaypoint(dockTable.dockPosition + Vector(-275 * direction, 0))
 
 							dockTable.activeCraft = craft;
 							dockTable.dockingStage = 1;
@@ -443,7 +444,7 @@ function DockingHandler:UpdateUndersideDockingCraft()
 
 					--print(SceneMan:ShortestDistance(craft.Pos, dockTable.dockPosition + Vector(200 * direction, 0), true))
 
-					local distFromDockArea = SceneMan:ShortestDistance(craft.Pos, dockTable.dockPosition + Vector(275 * direction, 0), true).Magnitude
+					local distFromDockArea = SceneMan:ShortestDistance(craft.Pos, dockTable.dockPosition + Vector(-275 * direction, 0), true).Magnitude
 					--print(distFromDockArea)
 					if distFromDockArea < 20 then
 						craft:OpenHatch();

Data/Base.rte/Activities/Utility/SaveLoadHandler.lua

@@ -66,7 +66,7 @@ function SaveLoadHandler:SerializeTable(val, name, skipnewlines, depth)
 		if type(name) == "number" then
 			tmp = tmp .. "[" .. name .. "]" .. " = "
 		else
-			tmp = tmp .. name .. " = "
+			tmp = tmp .. "['" .. name .. "']" .. " = "
 		end
 	end
 
@@ -92,6 +92,8 @@ function SaveLoadHandler:SerializeTable(val, name, skipnewlines, depth)
 		print("ERROR: SaveLoadHandler tried to save a function. This cannot currently be done and the table will not be as expected when loaded.");
 	elseif val.Magnitude then -- ghetto vector check
 		tmp = tmp .. string.format("%q", "Vector(" .. val.X .. "," .. val.Y .. ")")
+	elseif val.Area then -- ghetto box check
+		tmp = tmp .. string.format("%q", "Box(" .. val.Corner.X .. "," .. val.Corner.Y .. "," .. val.Corner.X + val.Width .. "," .. val.Corner.Y + val.Height .. ")")
 	elseif val.PresetName and IsMOSRotating(val) then -- IsMOSRotating freaks out if we give it something that isn't a preset at all... ghetto here too
 		val:SetNumberValue("saveLoadHandlerUniqueID", val.UniqueID);
 		tmp = tmp .. string.format("%q", "SAVELOADHANDLERUNIQUEID_" .. tostring(val.UniqueID))
@@ -243,6 +245,18 @@ function SaveLoadHandler:ParseTableForVectors(tab)
 
 end
 
+function SaveLoadHandler:ParseTableForBoxes(tab)
+	for k, v in pairs(tab) do
+		if type(v) == "string" and string.find(v, "Box%(") then
+			local vector = loadstring("return " .. v)();
+			tab[k] = vector;	
+		elseif type(v) == "table" then
+			self:ParseTableForBoxes(v);
+		end
+	end
+		
+end
+
 function SaveLoadHandler:ParseTableForAreas(tab)
 	for k, v in pairs(tab) do
 		if type(v) == "string" and string.find(v, "SAVELOADHANDLERAREA_") then
@@ -289,6 +303,10 @@ function SaveLoadHandler:DeserializeTable(serializedTable, name)
 		print("INFO: SaveLoadHandler is parsing this table for Vectors: " .. name);
 	end
 	self:ParseTableForVectors(tab);
+	if name and SaveLoadHandler.verboseLogging then
+		print("INFO: SaveLoadHandler is parsing this table for Boxes: " .. name);
+	end
+	self:ParseTableForBoxes(tab);
 	if name and SaveLoadHandler.verboseLogging then
 		print("INFO: SaveLoadHandler is parsing this table for Areas: " .. name);
 	end

Data/Base.rte/GUIs/SettingsGUI.ini

@@ -2522,6 +2522,126 @@ Anchor = Left, Top
 ToolTip = None
 Text = [InputKey]
 
+[LabelInputName31]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName31
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey31]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey31
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
+[LabelInputName32]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName32
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey32]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey32
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
+[LabelInputName33]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName33
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey33]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey33
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
+[LabelInputName34]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName34
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey34]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey34
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
 [CollectionBoxInputCapture]
 ControlType = COLLECTIONBOX
 Parent = root

Data/Base.rte/GUIs/SettingsPauseGUI.ini

@@ -2523,6 +2523,126 @@ Anchor = Left, Top
 ToolTip = None
 Text = [InputKey]
 
+[LabelInputName31]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName31
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey31]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey31
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
+[LabelInputName32]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName32
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey32]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey32
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
+[LabelInputName33]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName33
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey33]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey33
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
+[LabelInputName34]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName34
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey34]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey34
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
 [CollectionBoxInputCapture]
 ControlType = COLLECTIONBOX
 Parent = root