[Rebalance] Modify Repeat Action behavior (PVP)

Source/cursor.cpp

@@ -15,10 +15,10 @@
 #include <SDL3/SDL_rect.h>
 #include <SDL3/SDL_surface.h>
 #else
 #include <SDL.h>
 #endif
 
 #include <fmt/format.h>
 
 #include "DiabloUI/diabloui.h"
 #include "control.h"
@@ -30,7 +30,7 @@
 #include "engine/point.hpp"
 #include "engine/points_in_rectangle_range.hpp"
 #include "engine/render/clx_render.hpp"
 #include "engine/render/primitive_render.hpp"
 #include "engine/trn.hpp"
 #include "headless_mode.hpp"
 #include "hwcursor.hpp"
@@ -42,43 +42,43 @@
 #include "qol/stash.h"
 #include "towners.h"
 #include "track.h"
 #include "utils/attributes.h"
 #include "utils/is_of.hpp"
 #include "utils/language.h"
 #include "utils/palette_blending.hpp"
 #include "utils/sdl_bilinear_scale.hpp"
 #include "utils/surface_to_clx.hpp"
 #include "utils/utf8.hpp"
 
 #ifdef UNPACKED_MPQS
 #include "engine/load_clx.hpp"
 #else
 #include "engine/load_cel.hpp"
 #include "engine/load_file.hpp"
 #include "utils/parse_int.hpp"
 #endif
 
 namespace devilution {
 namespace {
 /** Cursor images CEL */
 OptionalOwnedClxSpriteList pCursCels;
 OptionalOwnedClxSpriteList pCursCels2;
 
 OptionalOwnedClxSpriteList *HalfSizeItemSprites;
 OptionalOwnedClxSpriteList *HalfSizeItemSpritesRed;
 
 bool IsValidMonsterForSelection(const Monster &monster)
 {
 	if (monster.hasNoLife())
 		return false;
 	if ((monster.flags & MFLAG_HIDDEN) != 0)
 		return false;
 	if (monster.isPlayerMinion())
 		return false;
 	return true;
 }
 
 bool TrySelectMonster(bool flipflag, Point tile, tl::function_ref<bool(const Monster &)> isValidMonster)
 {
 	auto checkPosition = [&](SelectionRegion selectionRegion, Displacement displacement) {
 		const Point posToCheck = tile + displacement;
@@ -412,6 +412,14 @@
 	return result;
 }
 #endif
+/**
+ * @brief Checks if the tile under the cursor is within the specified radius of the target position
+ */
+bool IsWithinTileRadius(Point cursor, Point target, int radius)
+{
+	return std::abs(cursor.x - target.x) <= radius
+	    && std::abs(cursor.y - target.y) <= radius;
+}
 
 } // namespace
 
@@ -779,16 +787,39 @@
  */
 bool CheckMouseHold(const Point currentTile)
 {
-	if ((sgbMouseDown != CLICK_NONE || ControllerActionHeld != GameActionType_NONE) && IsNoneOf(LastPlayerAction, PlayerActionType::None, PlayerActionType::Attack, PlayerActionType::Spell)) {
-		InvalidateTargets();
+	const bool holdActive = (sgbMouseDown != CLICK_NONE || ControllerActionHeld != GameActionType_NONE)
+	    && IsNoneOf(LastPlayerAction, PlayerActionType::None, PlayerActionType::Attack, PlayerActionType::Spell);
+
+	if (!holdActive) {
+		return false;
+	}
 
-		if (pcursmonst == -1 && ObjectUnderCursor == nullptr && pcursitem == -1 && pcursinvitem == -1 && pcursstashitem == StashStruct::EmptyCell && PlayerUnderCursor == nullptr) {
-			cursPosition = currentTile;
-			DisplayTriggerInfo();
+	if (sgbMouseDown != CLICK_NONE) {
+		if (pcursmonst != -1) {
+			const Monster &monster = Monsters[pcursmonst];
+			if (!IsWithinTileRadius(currentTile, monster.position.tile, 1)) {
+				pcursmonst = -1;
+			}
+		}
+
+		if (PlayerUnderCursor != nullptr) {
+			const Player &player = *PlayerUnderCursor;
+			if (!IsWithinTileRadius(currentTile, player.position.tile, 1)) {
+				PlayerUnderCursor = nullptr;
+			}
 		}
-		return true;
 	}
-	return false;
+
+	InvalidateTargets();
+
+	if (pcursmonst == -1 && ObjectUnderCursor == nullptr && pcursitem == -1
+	    && pcursinvitem == -1 && pcursstashitem == StashStruct::EmptyCell
+	    && PlayerUnderCursor == nullptr) {
+		cursPosition = currentTile;
+		DisplayTriggerInfo();
+	}
+
+	return true;
 }
 
 void ResetCursorInfo()

docs/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Features
+
+#### Gameplay
+
+- Improved balance for mouse and keyboard by requiring repeating actions to have the mouse near the target
+
 ## DevilutionX 1.5.2
 
 ### Bug Fixes