@ -9,11 +9,12 @@
# include <components/sceneutil/positionattitudetransform.hpp> # include <components/sceneutil/positionattitudetransform.hpp>
# include <components/settings/settings.hpp>
# include "../mwmp/Main.hpp" # include "../mwmp/Main.hpp"
# include "../mwmp/DedicatedPlayer.hpp" # include "../mwmp/DedicatedPlayer.hpp"
# include "../mwmp/LocalPlayer.hpp" # include "../mwmp/LocalPlayer.hpp"
# include "../mwworld/esmstore.hpp" # include "../mwworld/esmstore.hpp"
# include "../mwworld/class.hpp" # include "../mwworld/class.hpp"
# include "../mwworld/inventorystore.hpp" # include "../mwworld/inventorystore.hpp"
@ -285,7 +286,7 @@ namespace MWMechanics
void Actors : : engageCombat ( const MWWorld : : Ptr & actor1 , const MWWorld : : Ptr & actor2 , bool againstPlayer )
void Actors : : engageCombat ( const MWWorld : : Ptr & actor1 , const MWWorld : : Ptr & actor2 , bool againstPlayer )
{
{
const CreatureStats & creatureStats1 = actor1 . getClass ( ) . getCreatureStats ( actor1 ) ;
CreatureStats & creatureStats1 = actor1 . getClass ( ) . getCreatureStats ( actor1 ) ;
if ( creatureStats1 . getAiSequence ( ) . isInCombat ( actor2 ) )
if ( creatureStats1 . getAiSequence ( ) . isInCombat ( actor2 ) )
return ;
return ;
@ -303,97 +304,124 @@ namespace MWMechanics
if ( ! actor1 . getClass ( ) . isMobile ( actor1 ) )
if ( ! actor1 . getClass ( ) . isMobile ( actor1 ) )
return ;
return ;
// Start combat if target actor is in combat with one of our followers or escorters
// Stop here if target is unreachable
const std : : list < MWWorld : : Ptr > & followersAndEscorters = getActorsSidingWith ( actor1 ) ;
if ( ! MWMechanics : : canFight ( actor1 , actor2 ) )
for ( std : : list < MWWorld : : Ptr > : : const_iterator it = followersAndEscorters . begin ( ) ; it ! = followersAndEscorters . end ( ) ; + + it )
return ;
// If this is set to true, actor1 will start combat with actor2 if the awareness check at the end of the method returns true
bool aggressive = false ;
// Get actors allied with actor1. Includes those following or escorting actor1, actors following or escorting those actors, (recursive)
// and any actor currently being followed or escorted by actor1
std : : set < MWWorld : : Ptr > allies1 ;
getActorsSidingWith ( actor1 , allies1 ) ;
// If an ally of actor1 has been attacked by actor2 or has attacked actor2, start combat between actor1 and actor2
for ( std : : set < MWWorld : : Ptr > : : const_iterator it = allies1 . begin ( ) ; it ! = allies1 . end ( ) ; + + it )
{
{
// Need to check both ways since player doesn't use AI packages
if ( creatureStats1 . getAiSequence ( ) . isInCombat ( * it ) )
if ( ( creatureStats2 . getAiSequence ( ) . isInCombat ( * it )
continue ;
| | it - > getClass ( ) . getCreatureStats ( * it ) . getAiSequence ( ) . isInCombat ( actor2 ) )
& & ! creatureStats1 . getAiSequence ( ) . isInCombat ( * it ) )
if ( creatureStats2 . matchesActorId ( it - > getClass ( ) . getCreatureStats ( * it ) . getHitAttemptActorId ( ) ) )
{
{
MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > startCombat ( actor1 , actor2 ) ;
MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > startCombat ( actor1 , actor2 ) ;
return ;
// Also set the same hit attempt actor. Otherwise, if fighting the player, they may stop combat
// if the player gets out of reach, while the ally would continue combat with the player
creatureStats1 . setHitAttemptActorId ( it - > getClass ( ) . getCreatureStats ( * it ) . getHitAttemptActorId ( ) ) ;
return ;
}
}
}
// Start combat if target actor is in combat with someone we are following through a follow package
for ( std : : list < MWMechanics : : AiPackage * > : : const_iterator it = creatureStats1 . getAiSequence ( ) . begin ( ) ; it ! = creatureStats1 . getAiSequence ( ) . end ( ) ; + + it )
{
if ( ! ( * it ) - > sideWithTarget ( ) )
continue ;
MWWorld : : Ptr followTarget = ( * it ) - > getTarget ( ) ;
// If there's been no attack attempt yet but an ally of actor1 is in combat with actor2, become aggressive to actor2
if ( it - > getClass ( ) . getCreatureStats ( * it ) . getAiSequence ( ) . isInCombat ( actor2 ) )
aggressive = true ;
}
if ( followTarget . isEmpty ( ) )
std : : set < MWWorld : : Ptr > playerFollowersAndEscorters ;
continue ;
getActorsSidingWith ( MWMechanics : : getPlayer ( ) , playerFollowersAndEscorters ) ;
if ( creatureStats1 . getAiSequence ( ) . isInCombat ( followTarget ) )
bool isPlayerFollowerOrEscorter = std : : find ( playerFollowersAndEscorters . begin ( ) , playerFollowersAndEscorters . end ( ) , actor1 ) ! = playerFollowersAndEscorters . end ( ) ;
continue ;
// Need to check both ways since player doesn't use AI packages
// If actor2 and at least one actor2 are in combat with actor1, actor1 and its allies start combat with them
if ( creatureStats2 . getAiSequence ( ) . isInCombat ( followTarget )
// Doesn't apply for player followers/escorters
| | followTarget . getClass ( ) . getCreatureStats ( followTarget ) . getAiSequence ( ) . isInCombat ( actor2 ) )
if ( ! aggressive & & ! isPlayerFollowerOrEscorter )
{
// Check that actor2 is in combat with actor1
if ( actor2 . getClass ( ) . getCreatureStats ( actor2 ) . getAiSequence ( ) . isInCombat ( actor1 ) )
{
{
MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > startCombat ( actor1 , actor2 ) ;
std : : set < MWWorld : : Ptr > allies2 ;
return ;
getActorsSidingWith ( actor2 , allies2 ) ;
// Check that an ally of actor2 is also in combat with actor1
for ( std : : set < MWWorld : : Ptr > : : const_iterator it = allies2 . begin ( ) ; it ! = allies2 . end ( ) ; + + it )
{
if ( ( it ) - > getClass ( ) . getCreatureStats ( * it ) . getAiSequence ( ) . isInCombat ( actor1 ) )
{
MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > startCombat ( actor1 , actor2 ) ;
// Also have actor1's allies start combat
for ( std : : set < MWWorld : : Ptr > : : const_iterator it2 = allies1 . begin ( ) ; it2 ! = allies1 . end ( ) ; + + it2 )
MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > startCombat ( * it2 , actor2 ) ;
return ;
}
}
}
}
}
}
// Start combat with the player if we are already in combat with a player follower or escorter
// If set in the settings file, player followers and escorters will become aggressive toward enemies in combat with them or the player
const std : : list < MWWorld : : Ptr > & playerFollowersAndEscorters = getActorsSidingWith ( getPlayer ( ) ) ;
if ( ! aggressive & & isPlayerFollowerOrEscorter & & Settings : : Manager : : getBool ( " followers attack on sight " , " Game " ) )
if ( againstPlayer )
{
{
for ( std : : list < MWWorld : : Ptr > : : const_iterator it = playerFollowersAndEscorters . begin ( ) ; it ! = playerFollowersAndEscorters . end ( ) ; + + it )
if ( actor2 . getClass ( ) . getCreatureStats ( actor2 ) . getAiSequence ( ) . isInCombat ( actor1 ) )
aggressive = true ;
else
{
{
if ( creatureStats1 . getAiSequence ( ) . isInCombat ( * it ) )
for ( std : : set < MWWorld : : Ptr > : : const_iterator it = allies1 . begin ( ) ; it ! = allies1 . end ( ) ; + + it )
{
{
MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > startCombat ( actor1 , actor2 ) ;
if ( actor2 . getClass ( ) . getCreatureStats ( actor2 ) . getAiSequence ( ) . isInCombat ( * it ) )
return ;
{
aggressive = true ;
break ;
}
}
}
}
}
}
}
// Otherwise, don't initiate combat with an unreachable target
// Do aggression check if actor2 is the player or a player follower or escorter
if ( ! MWMechanics : : canFight ( actor1 , actor2 ) )
if ( ! aggressive )
return ;
bool aggressive = false ;
if ( againstPlayer | | std : : find ( playerFollowersAndEscorters . begin ( ) , playerFollowersAndEscorters . end ( ) , actor2 ) ! = playerFollowersAndEscorters . end ( ) )
{
{
// Player followers and escorters with high fight should not initiate combat here with the player or with
if ( againstPlayer | | std : : find ( playerFollowersAndEscorters . begin ( ) , playerFollowersAndEscorters . end ( ) , actor2 ) ! = playerFollowersAndEscorters . end ( ) )
// other player followers or escorters
{
if ( std : : find ( playerFollowersAndEscorters . begin ( ) , playerFollowersAndEscorters . end ( ) , actor1 ) ! = playerFollowersAndEscorters . end ( ) )
// Player followers and escorters with high fight should not initiate combat with the player or with
return ;
// other player followers or escorters
if ( std : : find ( playerFollowersAndEscorters . begin ( ) , playerFollowersAndEscorters . end ( ) , actor1 ) = = playerFollowersAndEscorters . end ( ) )
aggressive = MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > isAggressive ( actor1 , actor2 ) ;
aggressive = MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > isAggressive ( actor1 , actor2 ) ;
}
}
}
else
// Make guards go aggressive with creatures that are in combat, unless the creature is a follower or escorter
if ( actor1 . getClass ( ) . isClass ( actor1 , " Guard " ) & & ! actor2 . getClass ( ) . isNpc ( ) )
{
{
// Make guards fight aggressive creatures
bool followerOrEscorter = false ;
if ( ! actor1 . getClass ( ) . isNpc ( ) & & actor2 . getClass ( ) . isClass ( actor2 , " Guard " ) )
for ( std : : list < MWMechanics : : AiPackage * > : : const_iterator it = creatureStats2 . getAiSequence ( ) . begin ( ) ; it ! = creatureStats2 . getAiSequence ( ) . end ( ) ; + + it )
{
{
if ( creatureStats1 . getAiSequence ( ) . isInCombat ( ) & & MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > isAggressive ( actor1 , actor2 ) )
// The follow package must be first or have nothing but combat before it
aggressive = true ;
if ( ( * it ) - > sideWithTarget ( ) )
{
followerOrEscorter = true ;
break ;
}
else if ( ( * it ) - > getTypeId ( ) ! = MWMechanics : : AiPackage : : TypeIdCombat )
break ;
}
}
if ( ! followerOrEscorter & & creatureStats2 . getAiSequence ( ) . isInCombat ( ) )
aggressive = true ;
}
}
// If any of the above conditions turned actor1 aggressive towards actor2, do an awareness check. If it passes, start combat with actor2.
if ( aggressive )
if ( aggressive )
{
{
bool LOS = MWBase : : Environment : : get ( ) . getWorld ( ) - > getLOS ( actor1 , actor2 ) ;
bool LOS = MWBase : : Environment : : get ( ) . getWorld ( ) - > getLOS ( actor1 , actor2 ) ;
LOS & = MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > awarenessCheck ( actor2 , actor1 ) ;
if ( againstPlayer | | std : : find ( playerFollowersAndEscorters . begin ( ) , playerFollowersAndEscorters . end ( ) , actor2 ) ! = playerFollowersAndEscorters . end ( ) )
LOS & = MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > awarenessCheck ( actor2 , actor1 ) ;
if ( LOS )
if ( LOS )
{
MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > startCombat ( actor1 , actor2 ) ;
MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > startCombat ( actor1 , actor2 ) ;
if ( ! againstPlayer ) // start combat between each other
{
MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > startCombat ( actor2 , actor1 ) ;
}
}
}
}
}
}
@ -940,7 +968,10 @@ namespace MWMechanics
{
{
static const int iCrimeThresholdMultiplier = esmStore . get < ESM : : GameSetting > ( ) . find ( " iCrimeThresholdMultiplier " ) - > getInt ( ) ;
static const int iCrimeThresholdMultiplier = esmStore . get < ESM : : GameSetting > ( ) . find ( " iCrimeThresholdMultiplier " ) - > getInt ( ) ;
if ( player . getClass ( ) . getNpcStats ( player ) . getBounty ( ) > = cutoff * iCrimeThresholdMultiplier )
if ( player . getClass ( ) . getNpcStats ( player ) . getBounty ( ) > = cutoff * iCrimeThresholdMultiplier )
{
MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > startCombat ( ptr , player ) ;
MWBase : : Environment : : get ( ) . getMechanicsManager ( ) - > startCombat ( ptr , player ) ;
creatureStats . setHitAttemptActorId ( player . getClass ( ) . getCreatureStats ( player ) . getActorId ( ) ) ; // Stops the guard from quitting combat if player is unreachable
}
else
else
creatureStats . getAiSequence ( ) . stack ( AiPursue ( player ) , ptr ) ;
creatureStats . getAiSequence ( ) . stack ( AiPursue ( player ) , ptr ) ;
creatureStats . setAlarmed ( true ) ;
creatureStats . setAlarmed ( true ) ;
@ -1074,10 +1105,25 @@ namespace MWMechanics
dedicatedPlayer - > updateActor ( iter - > second ) ;
dedicatedPlayer - > updateActor ( iter - > second ) ;
// If dead or no longer in combat, no longer store any actors who attempted to hit us. Also remove for the player.
if ( iter - > first ! = player & & ( iter - > first . getClass ( ) . getCreatureStats ( iter - > first ) . isDead ( )
| | ! iter - > first . getClass ( ) . getCreatureStats ( iter - > first ) . getAiSequence ( ) . isInCombat ( )
| | ! inProcessingRange ) )
{
iter - > first . getClass ( ) . getCreatureStats ( iter - > first ) . setHitAttemptActorId ( - 1 ) ;
if ( player . getClass ( ) . getCreatureStats ( player ) . getHitAttemptActorId ( ) = = iter - > first . getClass ( ) . getCreatureStats ( iter - > first ) . getActorId ( ) )
player . getClass ( ) . getCreatureStats ( player ) . setHitAttemptActorId ( - 1 ) ;
}
const MWWorld : : Ptr playerHitAttemptActor = MWBase : : Environment : : get ( ) . getWorld ( ) - > searchPtrViaActorId ( player . getClass ( ) . getCreatureStats ( player ) . getHitAttemptActorId ( ) ) ;
if ( ! playerHitAttemptActor . isInCell ( ) )
player . getClass ( ) . getCreatureStats ( player ) . setHitAttemptActorId ( - 1 ) ;
if ( ! iter - > first . getClass ( ) . getCreatureStats ( iter - > first ) . isDead ( ) )
if ( ! iter - > first . getClass ( ) . getCreatureStats ( iter - > first ) . isDead ( ) )
{
{
MWWorld : : Ptr actor = iter - > first ; // make a copy of the map key to avoid it being invalidated when the player teleports
bool cellChanged = MWBase : : Environment : : get ( ) . getWorld ( ) - > hasCellChanged ( ) ;
bool cellChanged = MWBase : : Environment : : get ( ) . getWorld ( ) - > hasCellChanged ( ) ;
MWWorld : : Ptr actor = iter - > first ; // make a copy of the map key to avoid it being invalidated when the player teleports
updateActor ( actor , duration ) ;
updateActor ( actor , duration ) ;
if ( ! cellChanged & & MWBase : : Environment : : get ( ) . getWorld ( ) - > hasCellChanged ( ) )
if ( ! cellChanged & & MWBase : : Environment : : get ( ) . getWorld ( ) - > hasCellChanged ( ) )
{
{
@ -1490,18 +1536,36 @@ namespace MWMechanics
for ( PtrActorMap : : iterator iter ( mActors . begin ( ) ) ; iter ! = mActors . end ( ) ; + + iter )
for ( PtrActorMap : : iterator iter ( mActors . begin ( ) ) ; iter ! = mActors . end ( ) ; + + iter )
{
{
const MWWorld : : Class & cls = iter - > first . getClass ( ) ;
const MWWorld : : Class & cls = iter - > first . getClass ( ) ;
CreatureStats & stats = cls . getCreatureStats ( iter - > first ) ;
const CreatureStats & stats = cls . getCreatureStats ( iter - > first ) ;
if ( stats . isDead ( ) )
if ( stats . isDead ( ) )
continue ;
continue ;
// An actor counts as following if AiFollow or AiEscort is the current AiP ackage, or there are only Combat packages before the Ai Follow/Ai Escort package
// An actor counts as siding with this actor if Follow or Escort is the current AI p ackage, or there are only Combat packages before the Follow/Escort package
for ( std : : list < MWMechanics : : AiPackage * > : : const_iterator it = stats . getAiSequence ( ) . begin ( ) ; it ! = stats . getAiSequence ( ) . end ( ) ; + + it )
for ( std : : list < MWMechanics : : AiPackage * > : : const_iterator it = stats . getAiSequence ( ) . begin ( ) ; it ! = stats . getAiSequence ( ) . end ( ) ; + + it )
{
{
if ( ( * it ) - > sideWithTarget ( ) & & ( * it ) - > getTarget ( ) = = actor )
if ( ( * it ) - > sideWithTarget ( ) & & ( * it ) - > getTarget ( ) = = actor )
{
list . push_back ( iter - > first ) ;
list . push_back ( iter - > first ) ;
break ;
}
else if ( ( * it ) - > getTypeId ( ) ! = MWMechanics : : AiPackage : : TypeIdCombat )
else if ( ( * it ) - > getTypeId ( ) ! = MWMechanics : : AiPackage : : TypeIdCombat )
break ;
break ;
}
}
// Actors that are targeted by this actor's Follow or Escort packages also side with them
if ( actor ! = getPlayer ( ) )
{
const CreatureStats & stats2 = actor . getClass ( ) . getCreatureStats ( actor ) ;
for ( std : : list < MWMechanics : : AiPackage * > : : const_iterator it2 = stats2 . getAiSequence ( ) . begin ( ) ; it2 ! = stats2 . getAiSequence ( ) . end ( ) ; + + it2 )
{
if ( ( * it2 ) - > sideWithTarget ( ) & & ! ( * it2 ) - > getTarget ( ) . isEmpty ( ) )
{
list . push_back ( ( * it2 ) - > getTarget ( ) ) ;
break ;
}
else if ( ( * it2 ) - > getTypeId ( ) ! = MWMechanics : : AiPackage : : TypeIdCombat )
break ;
}
}
}
}
return list ;
return list ;
}
}
@ -1571,8 +1635,6 @@ namespace MWMechanics
return list ;
return list ;
}
}
std : : list < MWWorld : : Ptr > Actors : : getActorsFighting ( const MWWorld : : Ptr & actor ) {
std : : list < MWWorld : : Ptr > Actors : : getActorsFighting ( const MWWorld : : Ptr & actor ) {
std : : list < MWWorld : : Ptr > list ;
std : : list < MWWorld : : Ptr > list ;
std : : vector < MWWorld : : Ptr > neighbors ;
std : : vector < MWWorld : : Ptr > neighbors ;
David Cernat
8 years ago