veitR/mod-playerbots
1
0
Fork 0
mirror of https://github.com/liyunfan1223/mod-playerbots.git synced 2026-02-21 02:20:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: veitR:c3eecc0d7cb3eda170713ba51aa6408a17864fc5
Branches Tags
veitR:master
veitR:test-staging
veitR:hermensbas-patch-2
veitR:hermensbas-patch-4
veitR:hermensbas-patch-3
veitR:test/buid
veitR:hermensbas-patch-1
veitR:force_build_learn_new_action
veitR:fix/copy
veitR:test-prod-setup
veitR:master_v16
veitR:nl-saw-patch-aoi
veitR:feature/crash_fix_cast_invalid_target
veitR:feature/core_update_10_2025
veitR:added-shaman-default-combat-strategies-names
veitR:project_transfer
veitR:revert-1499-login-range
veitR:opcode-crash
veitR:xprate-not-in-group-with-real-player
veitR:revert-1363-trade-window-fix
veitR:directory_refactor
veitR:data-folder-loc-change-db-update
veitR:playerbots.conf.dist-comment-added
veitR:ForgeOfSoulsTriggers.cpp-added-null-check
...
compare: veitR:a19604024eaa424fdddaac9f3ae2a60b67047d05
Branches Tags
veitR:test-staging
veitR:master
veitR:hermensbas-patch-2
veitR:hermensbas-patch-4
veitR:hermensbas-patch-3
veitR:test/buid
veitR:hermensbas-patch-1
veitR:force_build_learn_new_action
veitR:fix/copy
veitR:test-prod-setup
veitR:master_v16
veitR:nl-saw-patch-aoi
veitR:feature/crash_fix_cast_invalid_target
veitR:feature/core_update_10_2025
veitR:added-shaman-default-combat-strategies-names
veitR:project_transfer
veitR:revert-1499-login-range
veitR:opcode-crash
veitR:xprate-not-in-group-with-real-player
veitR:revert-1363-trade-window-fix
veitR:directory_refactor
veitR:data-folder-loc-change-db-update
veitR:playerbots.conf.dist-comment-added
veitR:ForgeOfSoulsTriggers.cpp-added-null-check

10 Commits
c3eecc0d7c ... a19604024e

Author SHA1 Message Date
kadeshar
a19604024e
Merge pull request #1662 from gacuna89/patch-2 
Fix: Prevent bots from eating and drinking while mounted
 2025-09-29 21:46:07 +02:00
bash
972e2604ce
Update NonCombatActions.cpp 
This is better, even though aura check is tiny more expensive then most. Placing them into isUseful() is kinda confusing.
 2025-09-29 00:14:28 +02:00
bash
aaa9e1a42c
Placed cheap checks in isPossible() more expensive in isUseful() 
combat en mounted are both HasUnitFlag checks, which are cheap calls to make.
 2025-09-29 00:06:56 +02:00
bash
df77668b4b
Review 2025-09-28 20:37:01 +02:00
bash
ec4ab34f94
Update NonCombatActions.cpp 
Expensive checks last.
 2025-09-27 23:31:16 +02:00
bash
62e2ca247a
formatting 2025-09-27 23:28:48 +02:00
bash
d9b57fcfd4
Updated the locations of the checks, also added the checks as additional gatekeeper of the execute. 2025-09-27 23:26:29 +02:00
bash
e042e3b12b
Added shapeshift 2025-09-27 22:55:52 +02:00
bash
3228667121
Merge branch 'master' into patch-2 2025-09-27 22:40:39 +02:00
Gonzalo
f26c4e99f6
Fix: Prevent bots from eating and drinking while mounted 
This change modifies the `DrinkAction::Execute()` and `EatAction::Execute()` functions in `src/strategy/actions/NonCombatActions.cpp`.

Previously, playerbots could attempt to eat food or drink water while mounted, which is not possible in the game and creates unrealistic behavior.

This fix adds mount state checks to both actions:
1. `DrinkAction::Execute()` now checks `bot->IsMounted()` and returns false if mounted
2. `EatAction::Execute()` now checks `bot->IsMounted()` and returns false if mounted

This prevents bots from attempting to consume food or drinks while mounted, improving bot behavior realism and preventing unnecessary action attempts that would fail anyway.
 2025-09-25 18:26:28 -03:00
1 changed files with 18 additions and 14 deletions
Show Stats Expand all files Collapse all files

32
src/strategy/actions/NonCombatActions.cpp
View File

@ -10,9 +10,6 @@
bool DrinkAction::Execute(Event event) bool DrinkAction::Execute(Event event)
{ {
if (bot->IsInCombat())
return false;
if (botAI->HasCheat(BotCheatMask::food)) if (botAI->HasCheat(BotCheatMask::food))
{ {
// if (bot->IsNonMeleeSpellCast(true)) // if (bot->IsNonMeleeSpellCast(true))
@ -52,23 +49,22 @@ bool DrinkAction::Execute(Event event)
bool DrinkAction::isUseful() bool DrinkAction::isUseful()
{ {
// check class uses mana return UseItemAction::isUseful() &&
if (!AI_VALUE2(bool, "has mana", "self target")) AI_VALUE2(bool, "has mana", "self target") &&
return false; AI_VALUE2(uint8, "mana", "self target") < 100;
return UseItemAction::isUseful() && AI_VALUE2(uint8, "mana", "self target") < 100;
} }
bool DrinkAction::isPossible() bool DrinkAction::isPossible()
{ {
return !bot->IsInCombat() && (botAI->HasCheat(BotCheatMask::food) || UseItemAction::isPossible()); return !bot->IsInCombat() &&
!bot->IsMounted() &&
!botAI->HasAnyAuraOf(GetTarget(), "dire bear form", "bear form", "cat form", "travel form",
"aquatic form","flight form", "swift flight form", nullptr) &&
(botAI->HasCheat(BotCheatMask::food) || UseItemAction::isPossible());
} }
bool EatAction::Execute(Event event) bool EatAction::Execute(Event event)
{ {
if (bot->IsInCombat())
return false;
if (botAI->HasCheat(BotCheatMask::food)) if (botAI->HasCheat(BotCheatMask::food))
{ {
// if (bot->IsNonMeleeSpellCast(true)) // if (bot->IsNonMeleeSpellCast(true))
@ -106,9 +102,17 @@ bool EatAction::Execute(Event event)
return UseItemAction::Execute(event); return UseItemAction::Execute(event);
} }
bool EatAction::isUseful() { return UseItemAction::isUseful() && AI_VALUE2(uint8, "health", "self target") < 85; } bool EatAction::isUseful()
{
return UseItemAction::isUseful() &&
AI_VALUE2(uint8, "health", "self target") < 100;
}
bool EatAction::isPossible() bool EatAction::isPossible()
{ {
return !bot->IsInCombat() && (botAI->HasCheat(BotCheatMask::food) || UseItemAction::isPossible()); return !bot->IsInCombat() &&
!bot->IsMounted() &&
!botAI->HasAnyAuraOf(GetTarget(), "dire bear form", "bear form", "cat form", "travel form",
"aquatic form","flight form", "swift flight form", nullptr) &&
(botAI->HasCheat(BotCheatMask::food) || UseItemAction::isPossible());
} }