mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
Merge pull request #1074 from Allofich/telekinesis
Implement using telekinesis with touch spells
This commit is contained in:
commit
4b178f6f3d
@ -1020,12 +1020,7 @@ namespace MWWorld
|
|||||||
facedObject = getFacedObject(getMaxActivationDistance() * 50, false);
|
facedObject = getFacedObject(getMaxActivationDistance() * 50, false);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
float telekinesisRangeBonus =
|
float activationDistance = getActivationDistancePlusTelekinesis();
|
||||||
mPlayer->getPlayer().getClass().getCreatureStats(mPlayer->getPlayer()).getMagicEffects()
|
|
||||||
.get(ESM::MagicEffect::Telekinesis).getMagnitude();
|
|
||||||
telekinesisRangeBonus = feetToGameUnits(telekinesisRangeBonus);
|
|
||||||
|
|
||||||
float activationDistance = getMaxActivationDistance() + telekinesisRangeBonus;
|
|
||||||
|
|
||||||
facedObject = getFacedObject(activationDistance, true);
|
facedObject = getFacedObject(activationDistance, true);
|
||||||
|
|
||||||
@ -2642,7 +2637,7 @@ namespace MWWorld
|
|||||||
|
|
||||||
// Get the target to use for "on touch" effects, using the facing direction from Head node
|
// Get the target to use for "on touch" effects, using the facing direction from Head node
|
||||||
MWWorld::Ptr target;
|
MWWorld::Ptr target;
|
||||||
float distance = getMaxActivationDistance();
|
float distance = getActivationDistancePlusTelekinesis();
|
||||||
|
|
||||||
osg::Vec3f hitPosition = actor.getRefData().getPosition().asVec3();
|
osg::Vec3f hitPosition = actor.getRefData().getPosition().asVec3();
|
||||||
osg::Vec3f origin = getActorHeadTransform(actor).getTrans();
|
osg::Vec3f origin = getActorHeadTransform(actor).getTrans();
|
||||||
@ -2674,11 +2669,15 @@ namespace MWWorld
|
|||||||
{
|
{
|
||||||
target = result1.mHitObject;
|
target = result1.mHitObject;
|
||||||
hitPosition = result1.mHitPos;
|
hitPosition = result1.mHitPos;
|
||||||
|
if (dist1 > getMaxActivationDistance() && !target.isEmpty() && (target.getClass().isActor() || !target.getClass().canBeActivated(target)))
|
||||||
|
target = NULL;
|
||||||
}
|
}
|
||||||
else if (result2.mHit)
|
else if (result2.mHit)
|
||||||
{
|
{
|
||||||
target = result2.mHitObject;
|
target = result2.mHitObject;
|
||||||
hitPosition = result2.mHitPointWorld;
|
hitPosition = result2.mHitPointWorld;
|
||||||
|
if (dist2 > getMaxActivationDistance() && !target.isEmpty() && (target.getClass().isActor() || !target.getClass().canBeActivated(target)))
|
||||||
|
target = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// When targeting an actor that is in combat with an "on touch" spell,
|
// When targeting an actor that is in combat with an "on touch" spell,
|
||||||
@ -3011,6 +3010,18 @@ namespace MWWorld
|
|||||||
return feet * 22;
|
return feet * 22;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float World::getActivationDistancePlusTelekinesis()
|
||||||
|
{
|
||||||
|
float telekinesisRangeBonus =
|
||||||
|
mPlayer->getPlayer().getClass().getCreatureStats(mPlayer->getPlayer()).getMagicEffects()
|
||||||
|
.get(ESM::MagicEffect::Telekinesis).getMagnitude();
|
||||||
|
telekinesisRangeBonus = feetToGameUnits(telekinesisRangeBonus);
|
||||||
|
|
||||||
|
float activationDistance = getMaxActivationDistance() + telekinesisRangeBonus;
|
||||||
|
|
||||||
|
return activationDistance;
|
||||||
|
}
|
||||||
|
|
||||||
MWWorld::Ptr World::getPlayerPtr()
|
MWWorld::Ptr World::getPlayerPtr()
|
||||||
{
|
{
|
||||||
return mPlayer->getPlayer();
|
return mPlayer->getPlayer();
|
||||||
@ -3176,6 +3187,9 @@ namespace MWWorld
|
|||||||
if (effectIt->mRange != rangeType || (effectIt->mArea <= 0 && !ignore.isEmpty() && ignore.getClass().isActor()))
|
if (effectIt->mRange != rangeType || (effectIt->mArea <= 0 && !ignore.isEmpty() && ignore.getClass().isActor()))
|
||||||
continue; // Not right range type, or not area effect and hit an actor
|
continue; // Not right range type, or not area effect and hit an actor
|
||||||
|
|
||||||
|
if (effectIt->mRange == ESM::RT_Touch && (!ignore.isEmpty()) && (!ignore.getClass().isActor() && !ignore.getClass().canBeActivated(ignore)))
|
||||||
|
continue; // Don't play explosion for touch spells on non-activatable objects
|
||||||
|
|
||||||
// Spawn the explosion orb effect
|
// Spawn the explosion orb effect
|
||||||
const ESM::Static* areaStatic;
|
const ESM::Static* areaStatic;
|
||||||
if (!effect->mArea.empty())
|
if (!effect->mArea.empty())
|
||||||
|
@ -168,6 +168,7 @@ namespace MWWorld
|
|||||||
int mDaysInPrison;
|
int mDaysInPrison;
|
||||||
|
|
||||||
float feetToGameUnits(float feet);
|
float feetToGameUnits(float feet);
|
||||||
|
float getActivationDistancePlusTelekinesis();
|
||||||
|
|
||||||
MWWorld::ConstPtr getClosestMarker( const MWWorld::Ptr &ptr, const std::string &id );
|
MWWorld::ConstPtr getClosestMarker( const MWWorld::Ptr &ptr, const std::string &id );
|
||||||
MWWorld::ConstPtr getClosestMarkerFromExteriorPosition( const osg::Vec3f& worldPos, const std::string &id );
|
MWWorld::ConstPtr getClosestMarkerFromExteriorPosition( const osg::Vec3f& worldPos, const std::string &id );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user