diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/ScriptMgr.cpp | 1 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 21 | ||||
| -rw-r--r-- | src/game/World.cpp | 1 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 5 |
4 files changed, 15 insertions, 13 deletions
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index 84efc3378f9..ab5b29aa928 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -30,7 +30,6 @@ void LoadDatabase() { //Get db string from file std::string dbstring = TScriptConfig.GetStringDefault("WorldDatabaseInfo", ""); - explode() if (dbstring.empty()) { diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index cd2555f28ef..ec9d836bda5 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -58,15 +58,15 @@ float baseMoveSpeed[MAX_MOVE_TYPE] = { - 2.5f * sWorld.getRate(RATE_MOVESPEED), // MOVE_WALK - 7.0f * sWorld.getRate(RATE_MOVESPEED), // MOVE_RUN - 3.0f * sWorld.getRate(RATE_MOVESPEED), // MOVE_RUN_BACK - 4.722222f * sWorld.getRate(RATE_MOVESPEED), // MOVE_SWIM - 4.5f * sWorld.getRate(RATE_MOVESPEED), // MOVE_SWIM_BACK - 3.141594f * sWorld.getRate(RATE_MOVESPEED), // MOVE_TURN_RATE - 7.0f * sWorld.getRate(RATE_MOVESPEED), // MOVE_FLIGHT - 4.5f * sWorld.getRate(RATE_MOVESPEED), // MOVE_FLIGHT_BACK - 3.14f * sWorld.getRate(RATE_MOVESPEED) // MOVE_PITCH_RATE + 2.5f, // MOVE_WALK + 7.0f, // MOVE_RUN + 3.0f, // MOVE_RUN_BACK + 4.722222f, // MOVE_SWIM + 4.5f, // MOVE_SWIM_BACK + 3.141594f, // MOVE_TURN_RATE + 7.0f, // MOVE_FLIGHT + 4.5f, // MOVE_FLIGHT_BACK + 3.14f // MOVE_PITCH_RATE }; // Used for prepare can/can`t triggr aura @@ -10900,6 +10900,9 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced) break; } + // Only players and pets should get speed increase from Rate.MoveSpeed + if(GetTypeId() != TYPEID_PLAYER && GetOwner()->GetTypeId() != TYPEID_PLAYER) speed /= sWorld.getRate(RATE_MOVESPEED); + // Apply strongest slow aura mod to speed int32 slow = GetMaxNegativeAuraModifier(SPELL_AURA_MOD_DECREASE_SPEED); if (slow) diff --git a/src/game/World.cpp b/src/game/World.cpp index 00f7cc87c15..0aa2551e5c4 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -524,6 +524,7 @@ void World::LoadConfigSettings(bool reload) sLog.outError("Rate.MoveSpeed (%f) must be > 0. Using 1 instead.",rate_values[RATE_MOVESPEED]); rate_values[RATE_MOVESPEED] = 1.0f; } + for(uint8 i = 0; i < MAX_MOVE_TYPE; ++i) baseMoveSpeed[i] *= rate_values[RATE_MOVESPEED]; rate_values[RATE_CORPSE_DECAY_LOOTED] = sConfig.GetFloatDefault("Rate.Corpse.Decay.Looted",0.5f); rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = sConfig.GetFloatDefault("TargetPosRecalculateRange",1.5f); diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 160a5fb6656..483095c9182 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -1259,8 +1259,7 @@ Visibility.Distance.Grey.Object = 10 # Default: 1 # # Rate.MoveSpeed -# Multiply the default unit (player,pet,...) speed. -# Shouldn't affect creatures, as their speed is set in the database. +# Multiply the default movement speed for players and their pets. # Default: 1 - no change # 1.4 - 40% increase # @@ -1374,9 +1373,9 @@ Rate.Mining.Amount = 1 Rate.Mining.Next = 1 Rate.Talent = 1 Rate.Reputation.Gain = 1 -Rate.MoveSpeed = 1 Rate.Reputation.LowLevel.Kill = 1 Rate.Reputation.LowLevel.Quest = 1 +Rate.MoveSpeed = 1 Rate.InstanceResetTime = 1 SkillGain.Crafting = 1 SkillGain.Defense = 1 |