From 8a67e721880959b431d220e2d1fd5b60a4f11ad7 Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Fri, 29 Apr 2011 01:21:45 +0200 Subject: Added customizable on-hit effects for characters. This patch adds support for the following two parameters in weapon items: hit-effect-id: Effect triggered on the victim on normal hit. critical-hit-effect-id: Triggered on the victim on critical hit. (Specified in effects.xml) The patch also permits the use of custom defaults set in paths.xml by setting the following keys: (Paths are relative to the 'particles' key value, here.) hitEffectId: defaulted to effect id 26. criticalHitEffectId: defaulted to effect id 28. Resolves: Mana-mantis #337. Reviewed-by: bcs86 --- src/being.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 5911b03c..94ece475 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -389,10 +389,24 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type) updateName(); } - if (type != CRITICAL) - effectManager->trigger(26, this); + // Init the particle effect path based on current weapon or default. + int hitEffectId = 0; + const ItemInfo *attackerWeapon = attacker->getEquippedWeapon(); + if (attacker->getType() == PLAYER && attackerWeapon) + { + if (type != CRITICAL) + hitEffectId = attackerWeapon->getHitEffectId(); + else + hitEffectId = attackerWeapon->getCriticalHitEffectId(); + } else - effectManager->trigger(28, this); + { + if (type != CRITICAL) + hitEffectId = paths.getIntValue("hitEffectId"); + else + hitEffectId = paths.getIntValue("criticalHitEffectId"); + } + effectManager->trigger(hitEffectId, this); } } @@ -405,7 +419,7 @@ void Being::handleAttack(Being *victim, int damage, AttackType type) lookAt(victim->getPosition()); if (getType() == PLAYER && victim && mEquippedWeapon) - fireMissile(victim, mEquippedWeapon->getMissileParticle()); + fireMissile(victim, mEquippedWeapon->getMissileParticleFile()); else fireMissile(victim, mInfo->getAttack(mAttackType)->missileParticle); -- cgit v1.2.3-70-g09d2