Instructions Jenkins Doxygen

[Tweaked] amount healed by /healmind - mantis 4844 10/1610/1
authorIvojedi <ivojedi@swgemu.com>
Fri, 25 Apr 2014 00:03:33 +0000 (17:03 -0700)
committerIvojedi <ivojedi@swgemu.com>
Fri, 25 Apr 2014 00:03:33 +0000 (17:03 -0700)
[Fixed] /healmind no longer works on duel or guild war opponents -
mantis 4946

Change-Id: I54befdb7cf1f5dbc6b319039066986d79d137f24

MMOCoreORB/src/server/zone/objects/creature/CreatureObjectImplementation.cpp
MMOCoreORB/src/server/zone/objects/creature/commands/HealMindCommand.h

index ed47f49..f1f4a9d 100644 (file)
@@ -2653,6 +2653,9 @@ bool CreatureObjectImplementation::isHealableBy(CreatureObject* object) {
        if (isInvisible())
                return false;
 
+       if (isAttackableBy(object))
+               return false;
+
        PlayerObject* ghost = object->getPlayerObject(); // ghost is the healer
        PlayerObject* targetGhost = getPlayerObject();
 
index ef3a623..a3e2b0e 100755 (executable)
@@ -190,7 +190,7 @@ public:
                }
 
                float modSkill = (float) creature->getSkillMod("combat_medic_effectiveness");
-               int healPower = (int) (System::random(300)+700) * modSkill / 100; // 700-1000 heal
+               int healPower = (int) (System::random(500)+800) * modSkill / 100;
                
                // Check BF
                healPower = (int) (healPower * (1 - creature->calculateBFRatio()) * (1 - creatureTarget->calculateBFRatio()));