Instructions Jenkins Doxygen

[fixed] Injury Treatment Speed for stims/states/cures - Mantis 3665 28/828/2
authorBert <tbarker22@gmail.com>
Sat, 21 Sep 2013 21:08:29 +0000 (21:08 +0000)
committerBert <tbarker22@gmail.com>
Sat, 21 Sep 2013 21:08:29 +0000 (21:08 +0000)
Change-Id: If12fd349f66e96fc3dd1e42f81b22e276af41b59

MMOCoreORB/src/server/zone/objects/creature/commands/CurePackCommand.h
MMOCoreORB/src/server/zone/objects/creature/commands/HealDamageCommand.h [changed mode: 0755->0644]
MMOCoreORB/src/server/zone/objects/creature/commands/HealStateCommand.h [changed mode: 0755->0644]

index 0c1212b..c50c424 100644 (file)
@@ -117,13 +117,13 @@ public:
        }
 
        void deactivateConditionTreatment(CreatureObject* creature) {
-               float modSkill = (float)creature->getSkillMod("healing_wound_speed");
-               int delay = (int)round((modSkill * -(2.0f / 25.0f)) + 20.0f);
+               float modSkill = (float)creature->getSkillMod("healing_injury_speed");
+               int delay = (int)round(20.0f - (modSkill / 5));
 
-               //Force the delay to be at least 3 seconds.
-               delay = (delay < 3) ? 3 : delay;
+               //Force the delay to be at least 4 seconds.
+               delay = (delay < 4) ? 4 : delay;
 
-               StringIdChatParameter message("healing_response", "healing_response_59");
+               StringIdChatParameter message("healing_response", "healing_response_58"); //You are now ready to heal more damage.
                Reference<InjuryTreatmentTask*> task = new InjuryTreatmentTask(creature, message, "conditionTreatment");
                creature->addPendingTask("conditionTreatment", task, delay * 1000);
        }
old mode 100755 (executable)
new mode 100644 (file)
index 1c92931..6b98022
@@ -76,7 +76,7 @@ public:
                else
                        modSkill = (float)creature->getSkillMod("healing_injury_speed");
 
-               int delay = (int)round((modSkill * -(1.0f / 8.0f)) + 21.0f);
+               int delay = (int)round(20.0f - (modSkill / 5));
 
                if (creature->hasBuff(BuffCRC::FOOD_HEAL_RECOVERY)) {
                        DelayedBuff* buff = cast<DelayedBuff*>( creature->getBuff(BuffCRC::FOOD_HEAL_RECOVERY));
@@ -88,8 +88,8 @@ public:
                        }
                }
 
-               //Force the delay to be at least 3 seconds.
-               delay = (delay < 3) ? 3 : delay;
+               //Force the delay to be at least 4 seconds.
+               delay = (delay < 4) ? 4 : delay;
 
                StringIdChatParameter message("healing_response", "healing_response_58"); //You are now ready to heal more damage.
                Reference<InjuryTreatmentTask*> task = new InjuryTreatmentTask(creature, message, "injuryTreatment");
old mode 100755 (executable)
new mode 100644 (file)
index e3d2aff..74512ef
@@ -70,12 +70,12 @@ public:
 
        void deactivateStateTreatment(CreatureObject* creature) {
                float modSkill = (float)creature->getSkillMod("healing_injury_speed");
-               int delay = (int)round((modSkill * -(1.0f / 8.0f)) + 21.0f);
+               int delay = (int)round(20.0f - (modSkill / 5));
 
-               //Force the delay to be at least 3 seconds.
-               delay = (delay < 3) ? 3 : delay;
+               //Force the delay to be at least 4 seconds.
+               delay = (delay < 4) ? 4 : delay;
 
-               StringIdChatParameter message("healing_response", "healing_response_59"); //You are now ready to heal more wounds or apply more enhancements.
+               StringIdChatParameter message("healing_response", "healing_response_58"); //You are now ready to heal more damage.
                Reference<InjuryTreatmentTask*> task = new InjuryTreatmentTask(creature, message, "stateTreatment");
                creature->addPendingTask("stateTreatment", task, delay * 1000);
        }