mirror of
https://github.com/mod-playerbots/mod-playerbots.git
synced 2026-02-08 05:01:09 +00:00
Improper singletons migration to clean Meyer's singletons (cherry-pick) (#2082)
# Pull Request
- Applies the clean and corrected singletons, Meyer pattern. (cherry
picked from @SmashingQuasar )
Testing by just playing the game in various ways. Been tested by myself
@Celandriel and @SmashingQuasar
---
## Complexity & Impact
- Does this change add new decision branches?
- [x] No
- [ ] Yes (**explain below**)
- Does this change increase per-bot or per-tick processing?
- [x] No
- [ ] Yes (**describe and justify impact**)
- Could this logic scale poorly under load?
- [x] No
- [ ] Yes (**explain why**)
---
## Defaults & Configuration
- Does this change modify default bot behavior?
- [x] No
- [ ] Yes (**explain why**)
---
## AI Assistance
- Was AI assistance (e.g. ChatGPT or similar tools) used while working
on this change?
- [x] No
- [ ] Yes (**explain below**)
---
## Final Checklist
- [x] Stability is not compromised
- [x] Performance impact is understood, tested, and acceptable
- [x] Added logic complexity is justified and explained
- [x] Documentation updated if needed
---
## Notes for Reviewers
Anything that significantly improves realism at the cost of stability or
performance should be carefully discussed
before merging.
---------
Co-authored-by: Nicolas Lebacq <nicolas.cordier@outlook.com>
Co-authored-by: Keleborn <22352763+Celandriel@users.noreply.github.com>
This commit is contained in:
@@ -77,9 +77,9 @@ void RpgHelper::setFacing(GuidPosition guidPosition)
|
||||
void RpgHelper::setDelay(bool waitForGroup)
|
||||
{
|
||||
if (!botAI->HasRealPlayerMaster() || (waitForGroup && botAI->GetGroupLeader() == bot && bot->GetGroup()))
|
||||
botAI->SetNextCheckDelay(sPlayerbotAIConfig->rpgDelay);
|
||||
botAI->SetNextCheckDelay(sPlayerbotAIConfig.rpgDelay);
|
||||
else
|
||||
botAI->SetNextCheckDelay(sPlayerbotAIConfig->rpgDelay / 5);
|
||||
botAI->SetNextCheckDelay(sPlayerbotAIConfig.rpgDelay / 5);
|
||||
}
|
||||
|
||||
bool RpgSubAction::isPossible() { return rpg->guidP() && rpg->guidP().GetWorldObject(); }
|
||||
@@ -392,7 +392,7 @@ bool RpgTradeUsefulAction::Execute(Event event)
|
||||
bot->Say("Start trade with" + chat->FormatWorldobject(player),
|
||||
(bot->GetTeamId() == TEAM_ALLIANCE ? LANG_COMMON : LANG_ORCISH));
|
||||
|
||||
botAI->SetNextCheckDelay(sPlayerbotAIConfig->rpgDelay);
|
||||
botAI->SetNextCheckDelay(sPlayerbotAIConfig.rpgDelay);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -402,7 +402,7 @@ bool RpgTradeUsefulAction::Execute(Event event)
|
||||
bool RpgDuelAction::isUseful()
|
||||
{
|
||||
// do not offer duel in non pvp areas
|
||||
if (sPlayerbotAIConfig->IsInPvpProhibitedZone(bot->GetZoneId()))
|
||||
if (sPlayerbotAIConfig.IsInPvpProhibitedZone(bot->GetZoneId()))
|
||||
return false;
|
||||
|
||||
// Players can only fight a duel with each other outside (=not inside dungeons and not in capital cities)
|
||||
@@ -440,4 +440,4 @@ bool RpgMountAnimAction::Execute(Event event)
|
||||
bot->GetSession()->HandleMountSpecialAnimOpcode(p);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user