mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

access: tracker: increase range + fix empty list speech

pull/8474/head
mojsior 2 months ago
parent
cd4db81593
commit
9b75e9b333
2 changed files with 132 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 135
      Source/controls/tracker.cpp
  2. 32
      Translations/pl.po

135
Source/controls/tracker.cpp
Unescape View File

@ -66,8 +66,8 @@ int AutoWalkTrackerTargetId = -1;
/// Maximum Chebyshev distance (in tiles) at which the player is considered
/// close enough to interact with a tracker target.
constexpr int TrackerInteractDistanceTiles = 1;
constexpr int TrackerCycleDistanceTiles = 12;
constexpr int TrackerInteractDistanceTiles = 1;
constexpr int TrackerCycleDistanceTiles = 20;
int LockedTrackerItemId = -1;
int LockedTrackerChestId = -1;
@ -1302,8 +1302,8 @@ void SelectTrackerTargetCategoryRelative(int delta)
app_fatal("Invalid TrackerTargetCategory");
}
[[nodiscard]] std::string_view TrackerCategoryNoCandidatesFoundMessage(TrackerTargetCategory category)
{
[[nodiscard]] std::string_view TrackerCategoryNoCandidatesFoundMessage(TrackerTargetCategory category)
{
switch (category) {
case TrackerTargetCategory::Items:
return _("No items found.");
@ -1335,13 +1335,67 @@ void SelectTrackerTargetCategoryRelative(int delta)
return _("No quest locations found.");
case TrackerTargetCategory::Portals:
return _("No portals found.");
}
app_fatal("Invalid TrackerTargetCategory");
}
[[nodiscard]] std::string_view TrackerCategoryNoNextMessage(TrackerTargetCategory category)
{
switch (category) {
}
app_fatal("Invalid TrackerTargetCategory");
}
[[nodiscard]] constexpr bool TrackerCategorySelectionIsProximityLimited(TrackerTargetCategory category)
{
return IsAnyOf(category, TrackerTargetCategory::Items, TrackerTargetCategory::Chests, TrackerTargetCategory::Doors, TrackerTargetCategory::Shrines, TrackerTargetCategory::Objects,
TrackerTargetCategory::Breakables, TrackerTargetCategory::Monsters, TrackerTargetCategory::DeadBodies);
}
[[nodiscard]] bool TrackerCategoryHasAnyTargets(TrackerTargetCategory category, Point playerPosition)
{
switch (category) {
case TrackerTargetCategory::Items:
return FindNearestGroundItemId(playerPosition).has_value();
case TrackerTargetCategory::Chests:
return FindNearestUnopenedChestObjectId(playerPosition).has_value();
case TrackerTargetCategory::Doors:
return FindNearestDoorObjectId(playerPosition).has_value();
case TrackerTargetCategory::Shrines:
return FindNearestShrineObjectId(playerPosition).has_value();
case TrackerTargetCategory::Objects:
return FindNearestMiscInteractableObjectId(playerPosition).has_value();
case TrackerTargetCategory::Breakables:
return FindNearestBreakableObjectId(playerPosition).has_value();
case TrackerTargetCategory::Monsters:
return FindNearestMonsterId(playerPosition).has_value();
case TrackerTargetCategory::DeadBodies:
return FindNearestCorpseId(playerPosition).has_value();
default:
return false;
}
}
[[nodiscard]] std::string_view TrackerCategoryNoNearbyCandidatesFoundMessage(TrackerTargetCategory category)
{
switch (category) {
case TrackerTargetCategory::Items:
return _("No nearby items found.");
case TrackerTargetCategory::Chests:
return _("No nearby chests found.");
case TrackerTargetCategory::Doors:
return _("No nearby doors found.");
case TrackerTargetCategory::Shrines:
return _("No nearby shrines found.");
case TrackerTargetCategory::Objects:
return _("No nearby objects found.");
case TrackerTargetCategory::Breakables:
return _("No nearby breakables found.");
case TrackerTargetCategory::Monsters:
return _("No nearby monsters found.");
case TrackerTargetCategory::DeadBodies:
return _("No nearby dead bodies found.");
default:
return TrackerCategoryNoCandidatesFoundMessage(category);
}
}
[[nodiscard]] std::string_view TrackerCategoryNoNextMessage(TrackerTargetCategory category)
{
switch (category) {
case TrackerTargetCategory::Items:
return _("No next item.");
case TrackerTargetCategory::Chests:
@ -1441,12 +1495,15 @@ void SelectTrackerTargetRelative(int delta)
const Point playerPosition = MyPlayer->position.future;
AutoWalkTrackerTargetId = -1;
const std::vector<TrackerCandidate> candidates = CollectTrackerCandidatesForSelection(SelectedTrackerTargetCategory, playerPosition);
if (candidates.empty()) {
LockedTrackerTargetId(SelectedTrackerTargetCategory) = -1;
SpeakText(TrackerCategoryNoCandidatesFoundMessage(SelectedTrackerTargetCategory), true);
return;
}
const std::vector<TrackerCandidate> candidates = CollectTrackerCandidatesForSelection(SelectedTrackerTargetCategory, playerPosition);
if (candidates.empty()) {
LockedTrackerTargetId(SelectedTrackerTargetCategory) = -1;
if (TrackerCategorySelectionIsProximityLimited(SelectedTrackerTargetCategory) && TrackerCategoryHasAnyTargets(SelectedTrackerTargetCategory, playerPosition))
SpeakText(TrackerCategoryNoNearbyCandidatesFoundMessage(SelectedTrackerTargetCategory), true);
else
SpeakText(TrackerCategoryNoCandidatesFoundMessage(SelectedTrackerTargetCategory), true);
return;
}
int &lockedTargetId = LockedTrackerTargetId(SelectedTrackerTargetCategory);
if (candidates.size() == 1) {
@ -2809,15 +2866,19 @@ void TrackerPageUpKeyPressed()
const SDL_Keymod modState = SDL_GetModState();
const bool cycleCategory = (modState & SDL_KMOD_CTRL) != 0;
if (cycleCategory) {
SelectTrackerTargetCategoryRelative(-1);
if (MyPlayer != nullptr) {
const Point playerPosition = MyPlayer->position.future;
if (CollectTrackerCandidatesForSelection(SelectedTrackerTargetCategory, playerPosition).empty())
SpeakText(TrackerCategoryNoCandidatesFoundMessage(SelectedTrackerTargetCategory), true);
}
return;
}
if (cycleCategory) {
SelectTrackerTargetCategoryRelative(-1);
if (MyPlayer != nullptr) {
const Point playerPosition = MyPlayer->position.future;
if (CollectTrackerCandidatesForSelection(SelectedTrackerTargetCategory, playerPosition).empty()) {
if (TrackerCategorySelectionIsProximityLimited(SelectedTrackerTargetCategory) && TrackerCategoryHasAnyTargets(SelectedTrackerTargetCategory, playerPosition))
SpeakText(TrackerCategoryNoNearbyCandidatesFoundMessage(SelectedTrackerTargetCategory), true);
else
SpeakText(TrackerCategoryNoCandidatesFoundMessage(SelectedTrackerTargetCategory), true);
}
}
return;
}
SelectTrackerTargetRelative(-1);
}
@ -2827,15 +2888,19 @@ void TrackerPageDownKeyPressed()
const SDL_Keymod modState = SDL_GetModState();
const bool cycleCategory = (modState & SDL_KMOD_CTRL) != 0;
if (cycleCategory) {
SelectTrackerTargetCategoryRelative(+1);
if (MyPlayer != nullptr) {
const Point playerPosition = MyPlayer->position.future;
if (CollectTrackerCandidatesForSelection(SelectedTrackerTargetCategory, playerPosition).empty())
SpeakText(TrackerCategoryNoCandidatesFoundMessage(SelectedTrackerTargetCategory), true);
}
return;
}
if (cycleCategory) {
SelectTrackerTargetCategoryRelative(+1);
if (MyPlayer != nullptr) {
const Point playerPosition = MyPlayer->position.future;
if (CollectTrackerCandidatesForSelection(SelectedTrackerTargetCategory, playerPosition).empty()) {
if (TrackerCategorySelectionIsProximityLimited(SelectedTrackerTargetCategory) && TrackerCategoryHasAnyTargets(SelectedTrackerTargetCategory, playerPosition))
SpeakText(TrackerCategoryNoNearbyCandidatesFoundMessage(SelectedTrackerTargetCategory), true);
else
SpeakText(TrackerCategoryNoCandidatesFoundMessage(SelectedTrackerTargetCategory), true);
}
}
return;
}
SelectTrackerTargetRelative(+1);
}

32
Translations/pl.po
Unescape View File

@ -12306,34 +12306,66 @@ msgstr "martwe ciała"
msgid "No items found."
msgstr "Nie znaleziono żadnych przedmiotów."
#: Source/controls/tracker.cpp
msgid "No nearby items found."
msgstr "Nie znaleziono żadnych pobliskich przedmiotów."
#: Source/diablo.cpp
msgid "No chests found."
msgstr "Nie znaleziono żadnych skrzyń."
#: Source/controls/tracker.cpp
msgid "No nearby chests found."
msgstr "Nie znaleziono żadnych pobliskich skrzyń."
#: Source/diablo.cpp
msgid "No doors found."
msgstr "Nie znaleziono żadnych drzwi."
#: Source/controls/tracker.cpp
msgid "No nearby doors found."
msgstr "Nie znaleziono żadnych pobliskich drzwi."
#: Source/diablo.cpp
msgid "No shrines found."
msgstr "Nie znaleziono żadnych kapliczek."
#: Source/controls/tracker.cpp
msgid "No nearby shrines found."
msgstr "Nie znaleziono żadnych pobliskich kapliczek."
#: Source/diablo.cpp
msgid "No objects found."
msgstr "Nie znaleziono żadnych obiektów."
#: Source/controls/tracker.cpp
msgid "No nearby objects found."
msgstr "Nie znaleziono żadnych pobliskich obiektów."
#: Source/diablo.cpp
msgid "No breakables found."
msgstr "Nie znaleziono żadnych niszczalnych obiektów."
#: Source/controls/tracker.cpp
msgid "No nearby breakables found."
msgstr "Nie znaleziono żadnych pobliskich niszczalnych obiektów."
#: Source/diablo.cpp
msgid "No monsters found."
msgstr "Nie znaleziono żadnych potworów."
#: Source/controls/tracker.cpp
msgid "No nearby monsters found."
msgstr "Nie znaleziono żadnych pobliskich potworów."
#: Source/diablo.cpp
msgid "No dead bodies found."
msgstr "Nie znaleziono żadnych martwych ciał."
#: Source/controls/tracker.cpp
msgid "No nearby dead bodies found."
msgstr "Nie znaleziono żadnych pobliskich martwych ciał."
#: Source/diablo.cpp
msgid "Navigating to nearest item."
msgstr "Nawiguję do najbliższego przedmiotu."

Write Preview
Loading…
Cancel
Save