Merge pull request #106 from MageKing17/bugfix/constructor-instant-cancel

Fix Constructor instantly cancelling the build cursor sometimes.

Author: Causeless

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+<details><summary><b>Fixed</b></summary>
+
+- Fixed Constructor auto-cancelling build mode if you actively selected the "Order Construction" pie menu option.
+
+</details>
+
 ## [Release v6.2.0] - 2024/02/19
 
 <details><summary><b>Added</b></summary>

Data/Base.rte/Devices/Tools/Constructor/Constructor.lua

@@ -87,6 +87,8 @@ function Create(self)
 	self.maxFillDistance = 6; -- block distance
 	self.tunnelFillDelay = 30000 + 30000 * (1 - ActivityMan:GetActivity().Difficulty/GameActivity.MAXDIFFICULTY);
 
+	self.menu_ignore = false; -- ignore the pie menu button until it's released
+
 	-- don't change these
 	self.toAutoBuild = false;
 	self.operatedByAI = false;
@@ -191,6 +193,12 @@ function Update(self)
 		local playerControlled = actor:IsPlayerControlled();
 		local screen = ActivityMan:GetActivity():ScreenOfPlayer(ctrl.Player);
 
+		if playerControlled and self.menu_ignore then
+			if not ctrl:IsState(Controller.PIE_MENU_ACTIVE) then
+				self.menu_ignore = false
+			end
+		end
+
 		if self.Magazine then
 			self.Magazine.RoundCount = math.max(self.resource, 1);
 
@@ -394,6 +402,10 @@ function Update(self)
 			-- constructor build cursor
 			if playerControlled then
 				self.cursor = Vector(self.MuzzlePos.X, self.MuzzlePos.Y);
+				-- If the player actively selected this, ignore the pie menu.
+				if ctrl:IsState(Controller.PIE_MENU_ACTIVE) then
+					self.menu_ignore = true;
+				end
 			end
 		end
 		local displayColorBlue = 5;
@@ -476,7 +488,7 @@ function Update(self)
 				self.cursor.Y = actor.ViewPoint.Y + self.maxCursorDist.Y * (dist.Y < 0 and -1 or 1);
 			end
 
-			if ctrl:IsState(Controller.PIE_MENU_ACTIVE) or ctrl:IsState(Controller.ACTOR_NEXT_PREP) or ctrl:IsState(Controller.ACTOR_PREV_PREP) then
+			if (not self.menu_ignore and ctrl:IsState(Controller.PIE_MENU_ACTIVE)) or ctrl:IsState(Controller.ACTOR_NEXT_PREP) or ctrl:IsState(Controller.ACTOR_PREV_PREP) then
 				self.cursor = nil;
 			elseif playerControlled then
 				-- add blocks to the build queue if the cursor is firing