feat: extend stop tas tool functionality

Krzyhau · Krzyhau · commit 4f5b3162b682 · 2025-12-17T14:24:44.000+01:00
diff --git a/src/Features/Tas/TasTool.cpp b/src/Features/Tas/TasTool.cpp
@@ -35,9 +35,10 @@ std::vector<std::string> TasTool::priorityList = {
 	"decel",
 };
 
-TasTool::TasTool(const char *name, TasToolProcessingType processingType, int slot)
+TasTool::TasTool(const char *name, TasToolProcessingType processingType, TasToolBulkType bulkType, int slot)
 	: name(name)
 	, processingType(processingType)
+	, bulkType(bulkType)
 	, slot(slot) {
 	this->GetList(slot).push_back(this);
 
diff --git a/src/Features/Tas/TasTool.hpp b/src/Features/Tas/TasTool.hpp
@@ -30,21 +30,34 @@ enum TasToolProcessingType {
 	POST_PROCESSING,
 };
 
+enum TasToolBulkType {
+	NONE = 0,
+	MOVEMENT = 1 << 1,
+	VIEWANGLES = 1 << 2,
+	BUTTONS = 1 << 3,
+	COMMANDS = 1 << 4,
+	META = 1 << 5,
+
+	ALL_TYPES_MASK = MOVEMENT | VIEWANGLES | BUTTONS | COMMANDS | META,
+};
+
 class TasTool {
 protected:
 	const char *name;
 	TasToolProcessingType processingType;
+	TasToolBulkType bulkType;
 	std::shared_ptr<TasToolParams> paramsPtr = nullptr;
 	bool updated = false;
 	int slot;
 
 public:
-	TasTool(const char *name, TasToolProcessingType processingType, int slot);
+	TasTool(const char *name, TasToolProcessingType processingType, TasToolBulkType bulkType, int slot);
 	~TasTool();
 
 	const char *GetName() const { return name; }
 	inline int GetSlot() const { return slot; }
 	bool CanProcess(TasToolProcessingType type) const { return this->processingType == type; }
+	TasToolBulkType GetBulkType() const { return this->bulkType; }
 
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>) = 0;
 	virtual void Apply(TasFramebulk &fb, const TasPlayerInfo &pInfo) = 0;
@@ -64,8 +77,8 @@ class TasToolWithParams : public TasTool {
 	Params params;
 
 public:
-	TasToolWithParams(const char *name, TasToolProcessingType processingType, int slot)
-		: TasTool(name, processingType, slot) {};
+	TasToolWithParams(const char *name, TasToolProcessingType processingType, TasToolBulkType bulkType, int slot)
+		: TasTool(name, processingType, bulkType, slot) {};
 
 	virtual void Reset() {
 		this->paramsPtr = std::make_shared<Params>();
diff --git a/src/Features/Tas/TasTools/AbsoluteMoveTool.hpp b/src/Features/Tas/TasTools/AbsoluteMoveTool.hpp
@@ -20,7 +20,7 @@ class AbsoluteMoveTool : public TasToolWithParams<AbsoluteMoveToolParams> {
 private:
 	AbsoluteMoveToolParams amParams;
 public:
-	AbsoluteMoveTool(int slot) : TasToolWithParams("absmov", POST_PROCESSING, slot) {};
+	AbsoluteMoveTool(int slot) : TasToolWithParams("absmov", POST_PROCESSING, MOVEMENT, slot) {};
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
 	virtual void Apply(TasFramebulk &fb, const TasPlayerInfo &pInfo);
 };
diff --git a/src/Features/Tas/TasTools/AutoAimTool.hpp b/src/Features/Tas/TasTools/AutoAimTool.hpp
@@ -34,7 +34,7 @@ class AutoAimTool : public TasToolWithParams<AutoAimParams> {
 	int elapsedTicks;
 public:
 	AutoAimTool(int slot)
-		: TasToolWithParams("autoaim", POST_PROCESSING, slot)
+		: TasToolWithParams("autoaim", POST_PROCESSING, VIEWANGLES, slot)
 		, elapsedTicks(0) {}
 
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
diff --git a/src/Features/Tas/TasTools/CheckTool.hpp b/src/Features/Tas/TasTools/CheckTool.hpp
@@ -31,7 +31,7 @@ struct CheckToolParams : public TasToolParams {
 class CheckTool : public TasToolWithParams<CheckToolParams> {
 public:
 	CheckTool(int slot)
-		: TasToolWithParams("check", POST_PROCESSING, slot)
+		: TasToolWithParams("check", POST_PROCESSING, META, slot)
 	{}
 
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
diff --git a/src/Features/Tas/TasTools/CommandTool.hpp b/src/Features/Tas/TasTools/CommandTool.hpp
@@ -16,7 +16,7 @@ struct CommandToolParams : public TasToolParams {
 class CommandTool : public TasToolWithParams<CommandToolParams> {
 public:
 	CommandTool(int slot)
-		: TasToolWithParams("cmd", PRE_PROCESSING, slot) {
+		: TasToolWithParams("cmd", PRE_PROCESSING, COMMANDS, slot) {
 	}
 
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
diff --git a/src/Features/Tas/TasTools/DecelTool.hpp b/src/Features/Tas/TasTools/DecelTool.hpp
@@ -17,7 +17,7 @@ struct DecelParams : public TasToolParams {
 class DecelTool : public TasToolWithParams<DecelParams> {
 public:
 	DecelTool(int slot)
-		: TasToolWithParams("decel", POST_PROCESSING, slot) {}
+		: TasToolWithParams("decel", POST_PROCESSING, MOVEMENT, slot) {}
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
 	virtual void Apply(TasFramebulk &fb, const TasPlayerInfo &pInfo);
 };
diff --git a/src/Features/Tas/TasTools/DuckTool.hpp b/src/Features/Tas/TasTools/DuckTool.hpp
@@ -16,7 +16,7 @@ struct DuckToolParams : public TasToolParams {
 class DuckTool : public TasToolWithParams<DuckToolParams> {
 public:
 	DuckTool(int slot)
-		: TasToolWithParams("duck", PRE_PROCESSING, slot) {
+		: TasToolWithParams("duck", PRE_PROCESSING, BUTTONS, slot) {
 	}
 
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
diff --git a/src/Features/Tas/TasTools/JumpTool.hpp b/src/Features/Tas/TasTools/JumpTool.hpp
@@ -16,7 +16,7 @@ struct JumpToolsParams : public TasToolParams {
 class JumpTool : public TasToolWithParams<JumpToolsParams> {
 public:
 	JumpTool(int slot, bool automatic)
-		: TasToolWithParams(automatic ? "autojump" : "jump", POST_PROCESSING, slot) 
+		: TasToolWithParams(automatic ? "autojump" : "jump", POST_PROCESSING, BUTTONS, slot) 
 		, automatic(automatic) {
 	}
 
diff --git a/src/Features/Tas/TasTools/LookTool.hpp b/src/Features/Tas/TasTools/LookTool.hpp
@@ -23,7 +23,7 @@ class LookTool : public TasToolWithParams<LookToolParams> {
 	int remainingTime;
 public:
 	LookTool(int slot)
-		: TasToolWithParams("look", PRE_PROCESSING, slot) {};
+		: TasToolWithParams("look", PRE_PROCESSING, VIEWANGLES, slot) {};
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
 	virtual void Apply(TasFramebulk &fb, const TasPlayerInfo &pInfo);
 };
diff --git a/src/Features/Tas/TasTools/MoveTool.hpp b/src/Features/Tas/TasTools/MoveTool.hpp
@@ -19,7 +19,7 @@ struct MoveToolParams : public TasToolParams {
 class MoveTool : public TasToolWithParams<MoveToolParams> {
 public:
 	MoveTool(int slot)
-		: TasToolWithParams("move", PRE_PROCESSING, slot) {};
+		: TasToolWithParams("move", PRE_PROCESSING, MOVEMENT, slot) {};
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
 	virtual void Apply(TasFramebulk &fb, const TasPlayerInfo &pInfo);
 };
diff --git a/src/Features/Tas/TasTools/SetAngleTool.hpp b/src/Features/Tas/TasTools/SetAngleTool.hpp
@@ -29,7 +29,7 @@ class SetAngleTool : public TasToolWithParams<SetAngleParams> {
 	int elapsedTicks;
 public:
 	SetAngleTool(int slot)
-		: TasToolWithParams("setang", POST_PROCESSING, slot)
+		: TasToolWithParams("setang", POST_PROCESSING, VIEWANGLES, slot)
 		, elapsedTicks(0) {}
 
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
diff --git a/src/Features/Tas/TasTools/ShootTool.hpp b/src/Features/Tas/TasTools/ShootTool.hpp
@@ -22,7 +22,7 @@ struct ShootToolParams : public TasToolParams {
 class ShootTool : public TasToolWithParams<ShootToolParams> {
 public:
 	ShootTool(int slot)
-		: TasToolWithParams("shoot", PRE_PROCESSING, slot) {}
+		: TasToolWithParams("shoot", PRE_PROCESSING, BUTTONS, slot) {}
 
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
 	virtual void Apply(TasFramebulk &bulk, const TasPlayerInfo &pInfo);
diff --git a/src/Features/Tas/TasTools/StopTool.cpp b/src/Features/Tas/TasTools/StopTool.cpp
@@ -11,6 +11,10 @@ void StopTool::Apply(TasFramebulk &bulk, const TasPlayerInfo &pInfo) {
 	if (params.enabled) {
 		for (TasTool *tool : TasTool::GetList(pInfo.slot)) {
 
+			if ((tool->GetBulkType() & params.typesToDisableMask) == 0) {
+				continue;
+			}
+
 			bool toolJustRequested = false;
 			for (auto toolCmd : bulk.toolCmds) {
 				if (tool == toolCmd.tool) {
@@ -28,8 +32,27 @@ void StopTool::Apply(TasFramebulk &bulk, const TasPlayerInfo &pInfo) {
 }
 
 std::shared_ptr<TasToolParams> StopTool::ParseParams(std::vector<std::string> vp) {
-	if (vp.size() > 0)
-		throw TasParserArgumentCountException(this, vp.size());
+	uint32_t typesToDisableMask = TasToolBulkType::NONE;
+
+	if (vp.size() == 0) {
+		typesToDisableMask = TasToolBulkType::ALL_TYPES_MASK;
+	}
+
+	for (const auto &arg : vp) {
+		if (arg == "movement" || arg == "moving" || arg == "move") {
+			typesToDisableMask |= TasToolBulkType::MOVEMENT;
+		} else if (arg == "viewangles" || arg == "angles" || arg == "ang" || arg == "looking" || arg == "look") {
+			typesToDisableMask |= TasToolBulkType::VIEWANGLES;
+		} else if (arg == "buttons" || arg == "inputs" || arg == "pressing" || arg == "press") {
+			typesToDisableMask |= TasToolBulkType::BUTTONS;
+		} else if (arg == "commands" || arg == "cmd") {
+			typesToDisableMask |= TasToolBulkType::COMMANDS;
+		} else if (arg == "all" || arg == "everything") {
+			typesToDisableMask = TasToolBulkType::ALL_TYPES_MASK;
+		} else {
+			throw TasParserArgumentException(this, arg);
+		}
+	}
 
-	return std::make_shared<StopToolParams>(true);
+	return std::make_shared<StopToolParams>(true, typesToDisableMask);
 }
diff --git a/src/Features/Tas/TasTools/StopTool.hpp b/src/Features/Tas/TasTools/StopTool.hpp
@@ -2,18 +2,21 @@
 #include "../TasTool.hpp"
 
 struct StopToolParams : public TasToolParams {
+	uint32_t typesToDisableMask;
+
 	StopToolParams()
 		: TasToolParams() {
 	}
-	StopToolParams(bool enabled)
-		: TasToolParams(enabled) {
+	StopToolParams(bool enabled, uint32_t typesToDisableMask)
+		: TasToolParams(enabled)
+		, typesToDisableMask(typesToDisableMask) {
 	}
 };
 
 class StopTool : public TasToolWithParams<StopToolParams> {
 public:
 	StopTool(int slot)
-		: TasToolWithParams("stop", POST_PROCESSING, slot) {
+		: TasToolWithParams("stop", POST_PROCESSING, META, slot) {
 	}
 
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
diff --git a/src/Features/Tas/TasTools/StrafeTool.hpp b/src/Features/Tas/TasTools/StrafeTool.hpp
@@ -76,7 +76,7 @@ class AutoStrafeTool : public TasToolWithParams<AutoStrafeParams> {
 	int lastTurnDir = 0;
 public:
 	AutoStrafeTool(int slot)
-		: TasToolWithParams("strafe", POST_PROCESSING, slot) {};
+		: TasToolWithParams("strafe", POST_PROCESSING, MOVEMENT, slot) {};
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
 	virtual void Apply(TasFramebulk &fb, const TasPlayerInfo &pInfo);
 
diff --git a/src/Features/Tas/TasTools/UseTool.hpp b/src/Features/Tas/TasTools/UseTool.hpp
@@ -16,7 +16,7 @@ struct UseToolParams : public TasToolParams {
 class UseTool : public TasToolWithParams<UseToolParams> {
 public:
 	UseTool(int slot)
-		: TasToolWithParams("use", PRE_PROCESSING, slot) {}
+		: TasToolWithParams("use", PRE_PROCESSING, BUTTONS, slot) {}
 
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);
 	virtual void Apply(TasFramebulk &bulk, const TasPlayerInfo &pInfo);
diff --git a/src/Features/Tas/TasTools/ZoomTool.hpp b/src/Features/Tas/TasTools/ZoomTool.hpp
@@ -22,7 +22,7 @@ struct ZoomToolParams : public TasToolParams {
 class ZoomTool : public TasToolWithParams<ZoomToolParams> {
 public:
 	ZoomTool(int slot)
-		: TasToolWithParams("zoom", PRE_PROCESSING, slot) {
+		: TasToolWithParams("zoom", PRE_PROCESSING, BUTTONS, slot) {
 	}
 
 	virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ struct CommandToolParams : public TasToolParams {`
`16`	`16`	`class CommandTool : public TasToolWithParams<CommandToolParams> {`
`17`	`17`	`public:`
`18`	`18`	`CommandTool(int slot)`
`19`		`- : TasToolWithParams("cmd", PRE_PROCESSING, slot) {`
	`19`	`+ : TasToolWithParams("cmd", PRE_PROCESSING, COMMANDS, slot) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ struct DuckToolParams : public TasToolParams {`
`16`	`16`	`class DuckTool : public TasToolWithParams<DuckToolParams> {`
`17`	`17`	`public:`
`18`	`18`	`DuckTool(int slot)`
`19`		`- : TasToolWithParams("duck", PRE_PROCESSING, slot) {`
	`19`	`+ : TasToolWithParams("duck", PRE_PROCESSING, BUTTONS, slot) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`virtual std::shared_ptr<TasToolParams> ParseParams(std::vector<std::string>);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ struct JumpToolsParams : public TasToolParams {`
`16`	`16`	`class JumpTool : public TasToolWithParams<JumpToolsParams> {`
`17`	`17`	`public:`
`18`	`18`	`JumpTool(int slot, bool automatic)`
`19`		`- : TasToolWithParams(automatic ? "autojump" : "jump", POST_PROCESSING, slot)`
	`19`	`+ : TasToolWithParams(automatic ? "autojump" : "jump", POST_PROCESSING, BUTTONS, slot)`
`20`	`20`	`, automatic(automatic) {`
`21`	`21`	`}`
`22`	`22`