fixs

opentibiabr · Mar 6, 2023 · 96c56fd · 96c56fd
1 parent cd8470e
commit 96c56fd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/data-canary/scripts/spells/support/charge.lua b/data-canary/scripts/spells/support/charge.lua
@@ -4,7 +4,7 @@ combat:setParameter(COMBAT_PARAM_AGGRESSIVE, false)
 
 local condition = Condition(CONDITION_HASTE)
 condition:setParameter(CONDITION_PARAM_TICKS, 5000)
-condition:setFormula(0.9, -72, 0.9, -72)
+condition:setFormula(1.9, 40, 1.9, 40)
 combat:addCondition(condition)
 
 local spell = Spell("instant")

diff --git a/data-canary/scripts/spells/support/haste.lua b/data-canary/scripts/spells/support/haste.lua
@@ -4,7 +4,7 @@ combat:setParameter(COMBAT_PARAM_AGGRESSIVE, false)
 
 local condition = Condition(CONDITION_HASTE)
 condition:setParameter(CONDITION_PARAM_TICKS, 33000)
-condition:setFormula(0.3, -24, 0.3, -24)
+condition:setFormula(1.3, 40, 1.3, 40)
 combat:addCondition(condition)
 
 local spell = Spell("instant")

diff --git a/data-canary/scripts/spells/support/sharpshooter.lua b/data-canary/scripts/spells/support/sharpshooter.lua
@@ -12,7 +12,7 @@ combat:addCondition(skill)
 
 local speed = Condition(CONDITION_PARALYZE)
 speed:setParameter(CONDITION_PARAM_TICKS, 10000)
-speed:setFormula(-0.7, 0, -0.7, 0)
+speed:setFormula(-0.73, 0, -0.73, 0)
 combat:addCondition(speed)
 
 local exhaustHealGroup = Condition(CONDITION_SPELLGROUPCOOLDOWN)

diff --git a/data-canary/scripts/spells/support/strong_haste.lua b/data-canary/scripts/spells/support/strong_haste.lua
@@ -4,7 +4,7 @@ combat:setParameter(COMBAT_PARAM_AGGRESSIVE, 0)
 
 local condition = Condition(CONDITION_HASTE)
 condition:setParameter(CONDITION_PARAM_TICKS, 21000)
-condition:setFormula(0.7, -0, 0.7, -0)
+condition:setFormula(1.7, 40, 1.7, 40)
 combat:addCondition(condition)
 
 local spell = Spell("instant")

diff --git a/src/creatures/monsters/monsters.cpp b/src/creatures/monsters/monsters.cpp
@@ -126,7 +126,7 @@ bool Monsters::deserializeSpell(MonsterSpell* spell, spellBlock_t &sb, const std
 		combatPtr->setParam(COMBAT_PARAM_TYPE, spell->combatType);
 	} else if (spellName == "speed") {
 		int32_t speedChange = 0;
-		int32_t speedChangeMin = 0;
+		int32_t speedChangeValue = 0;
 		int32_t speedChangeRange = 0;
 		int32_t duration = 10000;
 
@@ -152,8 +152,8 @@ bool Monsters::deserializeSpell(MonsterSpell* spell, spellBlock_t &sb, const std
 
 		ConditionSpeed* condition = static_cast<ConditionSpeed*>(Condition::createCondition(CONDITIONID_COMBAT, conditionType, duration, 0));
 		speedChangeRange = speedChange / 2;
-		speedChangeMin = uniform_random(speedChangeRange, speedChange);
-		condition->setFormulaVars(speedChange / 1000.0, 40, speedChange / 1000.0, 40);
+		speedChangeValue = uniform_random(speedChangeRange, speedChange);
+		condition->setFormulaVars(speedChangeValue / 1000.0, 40, speedChangeValue / 1000.0, 40);
 		combatPtr->addCondition(condition);
 	} else if (spellName == "outfit") {
 		int32_t duration = 10000;