mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 23:45:34 +00:00
Code Issues Releases Wiki Activity

Use friendly hits only for player's followers (bug #4984)

Browse source
This commit is contained in:
Andrei Kortunov 2019-04-16 15:09:53 +04:00
parent 4d633fd3e6
commit e534153d00
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -64,6 +64,7 @@
Bug #4972: Player is able to use quickkeys while disableplayerfighting is active Bug #4972: Player is able to use quickkeys while disableplayerfighting is active
Bug #4979: AiTravel maximum range depends on "actors processing range" setting Bug #4979: AiTravel maximum range depends on "actors processing range" setting
Bug #4980: Drowning mechanics is applied for actors indifferently from distance to player Bug #4980: Drowning mechanics is applied for actors indifferently from distance to player
Bug #4984: "Friendly hits" feature should be used only for player's followers
Feature #2229: Improve pathfinding AI Feature #2229: Improve pathfinding AI
Feature #3442: Default values for fallbacks from ini file Feature #3442: Default values for fallbacks from ini file
Feature #3610: Option to invert X axis Feature #3610: Option to invert X axis

32
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -1476,22 +1476,24 @@ namespace MWMechanics
bool MechanicsManager::actorAttacked(const MWWorld::Ptr &target, const MWWorld::Ptr &attacker) bool MechanicsManager::actorAttacked(const MWWorld::Ptr &target, const MWWorld::Ptr &attacker)
{ {
if (target == getPlayer() || !attacker.getClass().isActor()) const MWWorld::Ptr& player = getPlayer();
if (target == player || !attacker.getClass().isActor())
return false; return false;
std::set<MWWorld::Ptr> followersAttacker;
getActorsSidingWith(attacker, followersAttacker);
MWMechanics::CreatureStats& statsTarget = target.getClass().getCreatureStats(target); MWMechanics::CreatureStats& statsTarget = target.getClass().getCreatureStats(target);
if (attacker == player)
if (followersAttacker.find(target) != followersAttacker.end())
{ {
statsTarget.friendlyHit(); std::set<MWWorld::Ptr> followersAttacker;
getActorsSidingWith(attacker, followersAttacker);
if (statsTarget.getFriendlyHits() < 4) if (followersAttacker.find(target) != followersAttacker.end())
{ {
MWBase::Environment::get().getDialogueManager()->say(target, "hit"); statsTarget.friendlyHit();
return false;
if (statsTarget.getFriendlyHits() < 4)
{
MWBase::Environment::get().getDialogueManager()->say(target, "hit");
return false;
}
} }
} }
@ -1500,9 +1502,9 @@ namespace MWMechanics
AiSequence& seq = statsTarget.getAiSequence(); AiSequence& seq = statsTarget.getAiSequence();
if (!attacker.isEmpty() && (attacker.getClass().getCreatureStats(attacker).getAiSequence().isInCombat(target) if (!attacker.isEmpty()
|| attacker == getPlayer()) && (attacker.getClass().getCreatureStats(attacker).getAiSequence().isInCombat(target) || attacker == player)
&& !seq.isInCombat(attacker)) && !seq.isInCombat(attacker))
{ {
// Attacker is in combat with us, but we are not in combat with the attacker yet. Time to fight back. // Attacker is in combat with us, but we are not in combat with the attacker yet. Time to fight back.
// Note: accidental or collateral damage attacks are ignored. // Note: accidental or collateral damage attacks are ignored.
@ -1512,7 +1514,7 @@ namespace MWMechanics
// he will attack the player only if we will force him (e.g. via StartCombat console command) // he will attack the player only if we will force him (e.g. via StartCombat console command)
bool peaceful = false; bool peaceful = false;
std::string script = target.getClass().getScript(target); std::string script = target.getClass().getScript(target);
if (!script.empty() && target.getRefData().getLocals().hasVar(script, "onpchitme") && attacker == getPlayer()) if (!script.empty() && target.getRefData().getLocals().hasVar(script, "onpchitme") && attacker == player)
{ {
int fight = std::max(0, target.getClass().getCreatureStats(target).getAiSetting(CreatureStats::AI_Fight).getModified()); int fight = std::max(0, target.getClass().getCreatureStats(target).getAiSetting(CreatureStats::AI_Fight).getModified());
peaceful = (fight == 0); peaceful = (fight == 0);