Reverted recent break speed limit changes.

L2J_Mobius_01.0_Ertheia/dist/game/config/Character.ini

@@ -315,10 +315,6 @@ MaxSpBonus =  0
 # Default: 300
 MaxRunSpeed = 300
 
-# Maximum summon running speed.
-# Default: 350
-MaxRunSpeedSummon = 350
-
 # Maximum character Physical Attack.
 # Default: 999999
 MaxPAtk = 999999

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -328,7 +328,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Sow", Sow::new);
 		EffectHandler.getInstance().registerHandler("Speed", Speed::new);
 		EffectHandler.getInstance().registerHandler("SphericBarrier", SphericBarrier::new);
-		EffectHandler.getInstance().registerHandler("SpeedLimit", SpeedLimit::new);
 		EffectHandler.getInstance().registerHandler("SpModify", SpModify::new);
 		EffectHandler.getInstance().registerHandler("Spoil", Spoil::new);
 		EffectHandler.getInstance().registerHandler("StatAddForLevel", StatAddForLevel::new);

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SpeedLimit.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author dontknowdontcare
- */
-public class SpeedLimit extends AbstractStatEffect
-{
-	public SpeedLimit(StatSet params)
-	{
-		super(params, Stat.SPEED_LIMIT);
-	}
-}

L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt

@@ -297,7 +297,6 @@ SoulEating: Absorbs souls when taking exp from mobs and sets max soul count.
 Sow: Planting a seed into NPC target. Manor stuff.
 Speed: Speed stat.
 SphericBarrier: Blocks damage and buff/debuff incoming from outside the specified range.
-SpeedLimit: Increase a character's max Speed limit. (l2jmobius)
 SpModify: Bonus SP stat.
 Spoil: Spoils a mob activating its extra sweep drop.
 StatAddForLevel: Adds a fixed amount of a Stat for a specific player level. (l2jmobius)

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java

@@ -200,7 +200,6 @@ public class Config
 	public static double MAX_BONUS_EXP;
 	public static double MAX_BONUS_SP;
 	public static int MAX_RUN_SPEED;
-	public static int MAX_RUN_SPEED_SUMMON;
 	public static int MAX_PATK;
 	public static int MAX_MATK;
 	public static int MAX_PCRIT_RATE;
@@ -1766,7 +1765,6 @@ public class Config
 			MAX_BONUS_EXP = characterConfig.getDouble("MaxExpBonus", 0);
 			MAX_BONUS_SP = characterConfig.getDouble("MaxSpBonus", 0);
 			MAX_RUN_SPEED = characterConfig.getInt("MaxRunSpeed", 300);
-			MAX_RUN_SPEED_SUMMON = characterConfig.getInt("MaxRunSpeedSummon", 350);
 			MAX_PATK = characterConfig.getInt("MaxPAtk", 999999);
 			MAX_MATK = characterConfig.getInt("MaxMAtk", 999999);
 			MAX_PCRIT_RATE = characterConfig.getInt("MaxPCritRate", 500);

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -327,17 +327,7 @@ public class CreatureStat
 		{
 			baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.RUN_SPEED : Stat.WALK_SPEED, 0);
 		}
-		return getMoveSpeed() * (1 / baseSpeed);
+		return getMoveSpeed() * (1. / baseSpeed);
-	}
-	
-	protected double maxSpeed()
-	{
-		return 99999999;
-	}
-	
-	private double calcValidSpeed(final double val)
-	{
-		return Math.max(Math.min(val, maxSpeed() + getValue(Stat.SPEED_LIMIT)), 0);
 	}
 	
 	/**
@@ -345,7 +335,7 @@ public class CreatureStat
 	 */
 	public double getRunSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED);
 	}
 	
 	/**
@@ -353,7 +343,7 @@ public class CreatureStat
 	 */
 	public double getWalkSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED);
 	}
 	
 	/**
@@ -361,7 +351,7 @@ public class CreatureStat
 	 */
 	public double getSwimRunSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_RUN_SPEED));
+		return getValue(Stat.SWIM_RUN_SPEED);
 	}
 	
 	/**
@@ -369,7 +359,7 @@ public class CreatureStat
 	 */
 	public double getSwimWalkSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_WALK_SPEED));
+		return getValue(Stat.SWIM_WALK_SPEED);
 	}
 	
 	/**

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java

@@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged;
 import org.l2jmobius.gameserver.model.events.returns.TerminateReturn;
 import org.l2jmobius.gameserver.model.item.Weapon;
-import org.l2jmobius.gameserver.model.stats.Stat;
 import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp;
 
 public class PlayableStat extends CreatureStat
@@ -255,10 +254,4 @@ public class PlayableStat extends CreatureStat
 		final Weapon weapon = getActiveChar().getActiveWeaponItem();
 		return weapon != null ? weapon.getBaseAttackAngle() : super.getPhysicalAttackAngle();
 	}
-	
-	@Override
-	protected double maxSpeed()
-	{
-		return Config.MAX_RUN_SPEED + getValue(Stat.SPEED_LIMIT);
-	}
 }

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/SummonStat.java

@@ -33,8 +33,28 @@ public class SummonStat extends PlayableStat
 	}
 	
 	@Override
-	protected double maxSpeed()
+	public double getRunSpeed()
 	{
-		return Config.MAX_RUN_SPEED_SUMMON;
+		final double val = super.getRunSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
+	}
+	
+	@Override
+	public double getWalkSpeed()
+	{
+		final double val = super.getWalkSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
 	}
 }

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -164,7 +164,6 @@ public enum Stat
 	
 	// Run speed, walk & escape speed are calculated proportionally, magic speed is a buff
 	MOVE_SPEED("moveSpeed"),
-	SPEED_LIMIT("speedLimit"),
 	RUN_SPEED("runSpd", new SpeedFinalizer()),
 	WALK_SPEED("walkSpd", new SpeedFinalizer()),
 	SWIM_RUN_SPEED("fastSwimSpd", new SpeedFinalizer()),

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java

@@ -42,7 +42,7 @@ public class SpeedFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = getBaseSpeed(creature, stat);
-		if (creature.isPlayable())
+		if (creature.isPlayer())
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
@@ -56,21 +56,7 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		final double maxSpeed;
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
-		if (creature.isPlayer())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else if (creature.isSummon())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED_SUMMON + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else
-		{
-			maxSpeed = Double.MAX_VALUE;
-		}
-		
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, maxSpeed);
 	}
 	
 	@Override
@@ -78,7 +64,7 @@ public class SpeedFinalizer implements IStatFunction
 	{
 		if (isBlessed)
 		{
-			return Math.max(enchantLevel - 3, 0) + Math.max(enchantLevel - 6, 0);
+			return (1 * Math.max(enchantLevel - 3, 0)) + (1 * Math.max(enchantLevel - 6, 0));
 		}
 		return (0.6 * Math.max(enchantLevel - 3, 0)) + (0.6 * Math.max(enchantLevel - 6, 0));
 	}

L2J_Mobius_02.5_Underground/dist/game/config/Character.ini

@@ -315,10 +315,6 @@ MaxSpBonus =  0
 # Default: 300
 MaxRunSpeed = 300
 
-# Maximum summon running speed.
-# Default: 350
-MaxRunSpeedSummon = 350
-
 # Maximum character Physical Attack.
 # Default: 999999
 MaxPAtk = 999999

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -328,7 +328,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Sow", Sow::new);
 		EffectHandler.getInstance().registerHandler("Speed", Speed::new);
 		EffectHandler.getInstance().registerHandler("SphericBarrier", SphericBarrier::new);
-		EffectHandler.getInstance().registerHandler("SpeedLimit", SpeedLimit::new);
 		EffectHandler.getInstance().registerHandler("SpModify", SpModify::new);
 		EffectHandler.getInstance().registerHandler("Spoil", Spoil::new);
 		EffectHandler.getInstance().registerHandler("StatAddForLevel", StatAddForLevel::new);

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SpeedLimit.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author dontknowdontcare
- */
-public class SpeedLimit extends AbstractStatEffect
-{
-	public SpeedLimit(StatSet params)
-	{
-		super(params, Stat.SPEED_LIMIT);
-	}
-}

L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt

@@ -297,7 +297,6 @@ SoulEating: Absorbs souls when taking exp from mobs and sets max soul count.
 Sow: Planting a seed into NPC target. Manor stuff.
 Speed: Speed stat.
 SphericBarrier: Blocks damage and buff/debuff incoming from outside the specified range.
-SpeedLimit: Increase a character's max Speed limit. (l2jmobius)
 SpModify: Bonus SP stat.
 Spoil: Spoils a mob activating its extra sweep drop.
 StatAddForLevel: Adds a fixed amount of a Stat for a specific player level. (l2jmobius)

L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java

@@ -207,7 +207,6 @@ public class Config
 	public static double MAX_BONUS_EXP;
 	public static double MAX_BONUS_SP;
 	public static int MAX_RUN_SPEED;
-	public static int MAX_RUN_SPEED_SUMMON;
 	public static int MAX_PATK;
 	public static int MAX_MATK;
 	public static int MAX_PCRIT_RATE;
@@ -1786,7 +1785,6 @@ public class Config
 			MAX_BONUS_EXP = characterConfig.getDouble("MaxExpBonus", 0);
 			MAX_BONUS_SP = characterConfig.getDouble("MaxSpBonus", 0);
 			MAX_RUN_SPEED = characterConfig.getInt("MaxRunSpeed", 300);
-			MAX_RUN_SPEED_SUMMON = characterConfig.getInt("MaxRunSpeedSummon", 350);
 			MAX_PATK = characterConfig.getInt("MaxPAtk", 999999);
 			MAX_MATK = characterConfig.getInt("MaxMAtk", 999999);
 			MAX_PCRIT_RATE = characterConfig.getInt("MaxPCritRate", 500);

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -327,17 +327,7 @@ public class CreatureStat
 		{
 			baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.RUN_SPEED : Stat.WALK_SPEED, 0);
 		}
-		return getMoveSpeed() * (1 / baseSpeed);
+		return getMoveSpeed() * (1. / baseSpeed);
-	}
-	
-	protected double maxSpeed()
-	{
-		return 99999999;
-	}
-	
-	private double calcValidSpeed(final double val)
-	{
-		return Math.max(Math.min(val, maxSpeed() + getValue(Stat.SPEED_LIMIT)), 0);
 	}
 	
 	/**
@@ -345,7 +335,7 @@ public class CreatureStat
 	 */
 	public double getRunSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED);
 	}
 	
 	/**
@@ -353,7 +343,7 @@ public class CreatureStat
 	 */
 	public double getWalkSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED);
 	}
 	
 	/**
@@ -361,7 +351,7 @@ public class CreatureStat
 	 */
 	public double getSwimRunSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_RUN_SPEED));
+		return getValue(Stat.SWIM_RUN_SPEED);
 	}
 	
 	/**
@@ -369,7 +359,7 @@ public class CreatureStat
 	 */
 	public double getSwimWalkSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_WALK_SPEED));
+		return getValue(Stat.SWIM_WALK_SPEED);
 	}
 	
 	/**

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java

@@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged;
 import org.l2jmobius.gameserver.model.events.returns.TerminateReturn;
 import org.l2jmobius.gameserver.model.item.Weapon;
-import org.l2jmobius.gameserver.model.stats.Stat;
 import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp;
 
 public class PlayableStat extends CreatureStat
@@ -255,10 +254,4 @@ public class PlayableStat extends CreatureStat
 		final Weapon weapon = getActiveChar().getActiveWeaponItem();
 		return weapon != null ? weapon.getBaseAttackAngle() : super.getPhysicalAttackAngle();
 	}
-	
-	@Override
-	protected double maxSpeed()
-	{
-		return Config.MAX_RUN_SPEED + getValue(Stat.SPEED_LIMIT);
-	}
 }

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/SummonStat.java

@@ -33,8 +33,28 @@ public class SummonStat extends PlayableStat
 	}
 	
 	@Override
-	protected double maxSpeed()
+	public double getRunSpeed()
 	{
-		return Config.MAX_RUN_SPEED_SUMMON;
+		final double val = super.getRunSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
+	}
+	
+	@Override
+	public double getWalkSpeed()
+	{
+		final double val = super.getWalkSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
 	}
 }

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -164,7 +164,6 @@ public enum Stat
 	
 	// Run speed, walk & escape speed are calculated proportionally, magic speed is a buff
 	MOVE_SPEED("moveSpeed"),
-	SPEED_LIMIT("speedLimit"),
 	RUN_SPEED("runSpd", new SpeedFinalizer()),
 	WALK_SPEED("walkSpd", new SpeedFinalizer()),
 	SWIM_RUN_SPEED("fastSwimSpd", new SpeedFinalizer()),

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java

@@ -42,7 +42,7 @@ public class SpeedFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = getBaseSpeed(creature, stat);
-		if (creature.isPlayable())
+		if (creature.isPlayer())
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
@@ -56,21 +56,7 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		final double maxSpeed;
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
-		if (creature.isPlayer())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else if (creature.isSummon())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED_SUMMON + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else
-		{
-			maxSpeed = Double.MAX_VALUE;
-		}
-		
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, maxSpeed);
 	}
 	
 	@Override
@@ -78,7 +64,7 @@ public class SpeedFinalizer implements IStatFunction
 	{
 		if (isBlessed)
 		{
-			return Math.max(enchantLevel - 3, 0) + Math.max(enchantLevel - 6, 0);
+			return (1 * Math.max(enchantLevel - 3, 0)) + (1 * Math.max(enchantLevel - 6, 0));
 		}
 		return (0.6 * Math.max(enchantLevel - 3, 0)) + (0.6 * Math.max(enchantLevel - 6, 0));
 	}

L2J_Mobius_03.0_Helios/dist/game/config/Character.ini

@@ -315,10 +315,6 @@ MaxSpBonus =  0
 # Default: 300
 MaxRunSpeed = 300
 
-# Maximum summon running speed.
-# Default: 350
-MaxRunSpeedSummon = 350
-
 # Maximum character Physical Attack.
 # Default: 999999
 MaxPAtk = 999999

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -328,7 +328,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Sow", Sow::new);
 		EffectHandler.getInstance().registerHandler("Speed", Speed::new);
 		EffectHandler.getInstance().registerHandler("SphericBarrier", SphericBarrier::new);
-		EffectHandler.getInstance().registerHandler("SpeedLimit", SpeedLimit::new);
 		EffectHandler.getInstance().registerHandler("SpModify", SpModify::new);
 		EffectHandler.getInstance().registerHandler("Spoil", Spoil::new);
 		EffectHandler.getInstance().registerHandler("StatAddForLevel", StatAddForLevel::new);

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SpeedLimit.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author dontknowdontcare
- */
-public class SpeedLimit extends AbstractStatEffect
-{
-	public SpeedLimit(StatSet params)
-	{
-		super(params, Stat.SPEED_LIMIT);
-	}
-}

L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt

@@ -297,7 +297,6 @@ SoulEating: Absorbs souls when taking exp from mobs and sets max soul count.
 Sow: Planting a seed into NPC target. Manor stuff.
 Speed: Speed stat.
 SphericBarrier: Blocks damage and buff/debuff incoming from outside the specified range.
-SpeedLimit: Increase a character's max Speed limit. (l2jmobius)
 SpModify: Bonus SP stat.
 Spoil: Spoils a mob activating its extra sweep drop.
 StatAddForLevel: Adds a fixed amount of a Stat for a specific player level. (l2jmobius)

L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java

@@ -207,7 +207,6 @@ public class Config
 	public static double MAX_BONUS_EXP;
 	public static double MAX_BONUS_SP;
 	public static int MAX_RUN_SPEED;
-	public static int MAX_RUN_SPEED_SUMMON;
 	public static int MAX_PATK;
 	public static int MAX_MATK;
 	public static int MAX_PCRIT_RATE;
@@ -1799,7 +1798,6 @@ public class Config
 			MAX_BONUS_EXP = characterConfig.getDouble("MaxExpBonus", 0);
 			MAX_BONUS_SP = characterConfig.getDouble("MaxSpBonus", 0);
 			MAX_RUN_SPEED = characterConfig.getInt("MaxRunSpeed", 300);
-			MAX_RUN_SPEED_SUMMON = characterConfig.getInt("MaxRunSpeedSummon", 350);
 			MAX_PATK = characterConfig.getInt("MaxPAtk", 999999);
 			MAX_MATK = characterConfig.getInt("MaxMAtk", 999999);
 			MAX_PCRIT_RATE = characterConfig.getInt("MaxPCritRate", 500);

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -327,17 +327,7 @@ public class CreatureStat
 		{
 			baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.RUN_SPEED : Stat.WALK_SPEED, 0);
 		}
-		return getMoveSpeed() * (1 / baseSpeed);
+		return getMoveSpeed() * (1. / baseSpeed);
-	}
-	
-	protected double maxSpeed()
-	{
-		return 99999999;
-	}
-	
-	private double calcValidSpeed(final double val)
-	{
-		return Math.max(Math.min(val, maxSpeed() + getValue(Stat.SPEED_LIMIT)), 0);
 	}
 	
 	/**
@@ -345,7 +335,7 @@ public class CreatureStat
 	 */
 	public double getRunSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED);
 	}
 	
 	/**
@@ -353,7 +343,7 @@ public class CreatureStat
 	 */
 	public double getWalkSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED);
 	}
 	
 	/**
@@ -361,7 +351,7 @@ public class CreatureStat
 	 */
 	public double getSwimRunSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_RUN_SPEED));
+		return getValue(Stat.SWIM_RUN_SPEED);
 	}
 	
 	/**
@@ -369,7 +359,7 @@ public class CreatureStat
 	 */
 	public double getSwimWalkSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_WALK_SPEED));
+		return getValue(Stat.SWIM_WALK_SPEED);
 	}
 	
 	/**

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java

@@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged;
 import org.l2jmobius.gameserver.model.events.returns.TerminateReturn;
 import org.l2jmobius.gameserver.model.item.Weapon;
-import org.l2jmobius.gameserver.model.stats.Stat;
 import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp;
 
 public class PlayableStat extends CreatureStat
@@ -255,10 +254,4 @@ public class PlayableStat extends CreatureStat
 		final Weapon weapon = getActiveChar().getActiveWeaponItem();
 		return weapon != null ? weapon.getBaseAttackAngle() : super.getPhysicalAttackAngle();
 	}
-	
-	@Override
-	protected double maxSpeed()
-	{
-		return Config.MAX_RUN_SPEED + getValue(Stat.SPEED_LIMIT);
-	}
 }

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/SummonStat.java

@@ -33,8 +33,28 @@ public class SummonStat extends PlayableStat
 	}
 	
 	@Override
-	protected double maxSpeed()
+	public double getRunSpeed()
 	{
-		return Config.MAX_RUN_SPEED_SUMMON;
+		final double val = super.getRunSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
+	}
+	
+	@Override
+	public double getWalkSpeed()
+	{
+		final double val = super.getWalkSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
 	}
 }

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -164,7 +164,6 @@ public enum Stat
 	
 	// Run speed, walk & escape speed are calculated proportionally, magic speed is a buff
 	MOVE_SPEED("moveSpeed"),
-	SPEED_LIMIT("speedLimit"),
 	RUN_SPEED("runSpd", new SpeedFinalizer()),
 	WALK_SPEED("walkSpd", new SpeedFinalizer()),
 	SWIM_RUN_SPEED("fastSwimSpd", new SpeedFinalizer()),

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java

@@ -42,7 +42,7 @@ public class SpeedFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = getBaseSpeed(creature, stat);
-		if (creature.isPlayable())
+		if (creature.isPlayer())
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
@@ -56,21 +56,7 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		final double maxSpeed;
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
-		if (creature.isPlayer())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else if (creature.isSummon())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED_SUMMON + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else
-		{
-			maxSpeed = Double.MAX_VALUE;
-		}
-		
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, maxSpeed);
 	}
 	
 	@Override
@@ -78,7 +64,7 @@ public class SpeedFinalizer implements IStatFunction
 	{
 		if (isBlessed)
 		{
-			return Math.max(enchantLevel - 3, 0) + Math.max(enchantLevel - 6, 0);
+			return (1 * Math.max(enchantLevel - 3, 0)) + (1 * Math.max(enchantLevel - 6, 0));
 		}
 		return (0.6 * Math.max(enchantLevel - 3, 0)) + (0.6 * Math.max(enchantLevel - 6, 0));
 	}

L2J_Mobius_04.0_GrandCrusade/dist/game/config/Character.ini

@@ -315,10 +315,6 @@ MaxSpBonus =  0
 # Default: 300
 MaxRunSpeed = 300
 
-# Maximum summon running speed.
-# Default: 350
-MaxRunSpeedSummon = 350
-
 # Maximum character Physical Attack.
 # Default: 999999
 MaxPAtk = 999999

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -333,7 +333,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Sow", Sow::new);
 		EffectHandler.getInstance().registerHandler("Speed", Speed::new);
 		EffectHandler.getInstance().registerHandler("SphericBarrier", SphericBarrier::new);
-		EffectHandler.getInstance().registerHandler("SpeedLimit", SpeedLimit::new);
 		EffectHandler.getInstance().registerHandler("SpModify", SpModify::new);
 		EffectHandler.getInstance().registerHandler("Spoil", Spoil::new);
 		EffectHandler.getInstance().registerHandler("StatAddForLevel", StatAddForLevel::new);

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SpeedLimit.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author dontknowdontcare
- */
-public class SpeedLimit extends AbstractStatEffect
-{
-	public SpeedLimit(StatSet params)
-	{
-		super(params, Stat.SPEED_LIMIT);
-	}
-}

L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt

@@ -302,7 +302,6 @@ SoulEating: Absorbs souls when taking exp from mobs and sets max soul count.
 Sow: Planting a seed into NPC target. Manor stuff.
 Speed: Speed stat.
 SphericBarrier: Blocks damage and buff/debuff incoming from outside the specified range.
-SpeedLimit: Increase a character's max Speed limit. (l2jmobius)
 SpModify: Bonus SP stat.
 Spoil: Spoils a mob activating its extra sweep drop.
 StatAddForLevel: Adds a fixed amount of a Stat for a specific player level. (l2jmobius)

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java

@@ -207,7 +207,6 @@ public class Config
 	public static double MAX_BONUS_EXP;
 	public static double MAX_BONUS_SP;
 	public static int MAX_RUN_SPEED;
-	public static int MAX_RUN_SPEED_SUMMON;
 	public static int MAX_PATK;
 	public static int MAX_MATK;
 	public static int MAX_PCRIT_RATE;
@@ -1786,7 +1785,6 @@ public class Config
 			MAX_BONUS_EXP = characterConfig.getDouble("MaxExpBonus", 0);
 			MAX_BONUS_SP = characterConfig.getDouble("MaxSpBonus", 0);
 			MAX_RUN_SPEED = characterConfig.getInt("MaxRunSpeed", 300);
-			MAX_RUN_SPEED_SUMMON = characterConfig.getInt("MaxRunSpeedSummon", 350);
 			MAX_PATK = characterConfig.getInt("MaxPAtk", 999999);
 			MAX_MATK = characterConfig.getInt("MaxMAtk", 999999);
 			MAX_PCRIT_RATE = characterConfig.getInt("MaxPCritRate", 500);

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -327,17 +327,7 @@ public class CreatureStat
 		{
 			baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.RUN_SPEED : Stat.WALK_SPEED, 0);
 		}
-		return getMoveSpeed() * (1 / baseSpeed);
+		return getMoveSpeed() * (1. / baseSpeed);
-	}
-	
-	protected double maxSpeed()
-	{
-		return 99999999;
-	}
-	
-	private double calcValidSpeed(final double val)
-	{
-		return Math.max(Math.min(val, maxSpeed() + getValue(Stat.SPEED_LIMIT)), 0);
 	}
 	
 	/**
@@ -345,7 +335,7 @@ public class CreatureStat
 	 */
 	public double getRunSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED);
 	}
 	
 	/**
@@ -353,7 +343,7 @@ public class CreatureStat
 	 */
 	public double getWalkSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED);
 	}
 	
 	/**
@@ -361,7 +351,7 @@ public class CreatureStat
 	 */
 	public double getSwimRunSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_RUN_SPEED));
+		return getValue(Stat.SWIM_RUN_SPEED);
 	}
 	
 	/**
@@ -369,7 +359,7 @@ public class CreatureStat
 	 */
 	public double getSwimWalkSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_WALK_SPEED));
+		return getValue(Stat.SWIM_WALK_SPEED);
 	}
 	
 	/**

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java

@@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged;
 import org.l2jmobius.gameserver.model.events.returns.TerminateReturn;
 import org.l2jmobius.gameserver.model.item.Weapon;
-import org.l2jmobius.gameserver.model.stats.Stat;
 import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp;
 
 public class PlayableStat extends CreatureStat
@@ -255,10 +254,4 @@ public class PlayableStat extends CreatureStat
 		final Weapon weapon = getActiveChar().getActiveWeaponItem();
 		return weapon != null ? weapon.getBaseAttackAngle() : super.getPhysicalAttackAngle();
 	}
-	
-	@Override
-	protected double maxSpeed()
-	{
-		return Config.MAX_RUN_SPEED + getValue(Stat.SPEED_LIMIT);
-	}
 }

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/SummonStat.java

@@ -33,8 +33,28 @@ public class SummonStat extends PlayableStat
 	}
 	
 	@Override
-	protected double maxSpeed()
+	public double getRunSpeed()
 	{
-		return Config.MAX_RUN_SPEED_SUMMON;
+		final double val = super.getRunSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
+	}
+	
+	@Override
+	public double getWalkSpeed()
+	{
+		final double val = super.getWalkSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
 	}
 }

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -164,7 +164,6 @@ public enum Stat
 	
 	// Run speed, walk & escape speed are calculated proportionally, magic speed is a buff
 	MOVE_SPEED("moveSpeed"),
-	SPEED_LIMIT("speedLimit"),
 	RUN_SPEED("runSpd", new SpeedFinalizer()),
 	WALK_SPEED("walkSpd", new SpeedFinalizer()),
 	SWIM_RUN_SPEED("fastSwimSpd", new SpeedFinalizer()),

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java

@@ -42,7 +42,7 @@ public class SpeedFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = getBaseSpeed(creature, stat);
-		if (creature.isPlayable())
+		if (creature.isPlayer())
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
@@ -56,21 +56,7 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		final double maxSpeed;
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
-		if (creature.isPlayer())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else if (creature.isSummon())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED_SUMMON + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else
-		{
-			maxSpeed = Double.MAX_VALUE;
-		}
-		
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, maxSpeed);
 	}
 	
 	@Override
@@ -78,7 +64,7 @@ public class SpeedFinalizer implements IStatFunction
 	{
 		if (isBlessed)
 		{
-			return Math.max(enchantLevel - 3, 0) + Math.max(enchantLevel - 6, 0);
+			return (1 * Math.max(enchantLevel - 3, 0)) + (1 * Math.max(enchantLevel - 6, 0));
 		}
 		return (0.6 * Math.max(enchantLevel - 3, 0)) + (0.6 * Math.max(enchantLevel - 6, 0));
 	}

L2J_Mobius_05.0_Salvation/dist/game/config/Character.ini

@@ -315,10 +315,6 @@ MaxSpBonus =  0
 # Default: 300
 MaxRunSpeed = 300
 
-# Maximum summon running speed.
-# Default: 350
-MaxRunSpeedSummon = 350
-
 # Maximum character Physical Attack.
 # Default: 999999
 MaxPAtk = 999999

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -338,7 +338,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Sow", Sow::new);
 		EffectHandler.getInstance().registerHandler("Speed", Speed::new);
 		EffectHandler.getInstance().registerHandler("SphericBarrier", SphericBarrier::new);
-		EffectHandler.getInstance().registerHandler("SpeedLimit", SpeedLimit::new);
 		EffectHandler.getInstance().registerHandler("SpModify", SpModify::new);
 		EffectHandler.getInstance().registerHandler("Spoil", Spoil::new);
 		EffectHandler.getInstance().registerHandler("StatAddForLevel", StatAddForLevel::new);

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SpeedLimit.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author dontknowdontcare
- */
-public class SpeedLimit extends AbstractStatEffect
-{
-	public SpeedLimit(StatSet params)
-	{
-		super(params, Stat.SPEED_LIMIT);
-	}
-}

L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt

@@ -307,7 +307,6 @@ SoulEating: Absorbs souls when taking exp from mobs and sets max soul count.
 Sow: Planting a seed into NPC target. Manor stuff.
 Speed: Speed stat.
 SphericBarrier: Blocks damage and buff/debuff incoming from outside the specified range.
-SpeedLimit: Increase a character's max Speed limit. (l2jmobius)
 SpModify: Bonus SP stat.
 Spoil: Spoils a mob activating its extra sweep drop.
 StatAddForLevel: Adds a fixed amount of a Stat for a specific player level. (l2jmobius)

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java

@@ -214,7 +214,6 @@ public class Config
 	public static double MAX_BONUS_EXP;
 	public static double MAX_BONUS_SP;
 	public static int MAX_RUN_SPEED;
-	public static int MAX_RUN_SPEED_SUMMON;
 	public static int MAX_PATK;
 	public static int MAX_MATK;
 	public static int MAX_PCRIT_RATE;
@@ -1795,7 +1794,6 @@ public class Config
 			MAX_BONUS_EXP = characterConfig.getDouble("MaxExpBonus", 0);
 			MAX_BONUS_SP = characterConfig.getDouble("MaxSpBonus", 0);
 			MAX_RUN_SPEED = characterConfig.getInt("MaxRunSpeed", 300);
-			MAX_RUN_SPEED_SUMMON = characterConfig.getInt("MaxRunSpeedSummon", 350);
 			MAX_PATK = characterConfig.getInt("MaxPAtk", 999999);
 			MAX_MATK = characterConfig.getInt("MaxMAtk", 999999);
 			MAX_PCRIT_RATE = characterConfig.getInt("MaxPCritRate", 500);

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -327,17 +327,7 @@ public class CreatureStat
 		{
 			baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.RUN_SPEED : Stat.WALK_SPEED, 0);
 		}
-		return getMoveSpeed() * (1 / baseSpeed);
+		return getMoveSpeed() * (1. / baseSpeed);
-	}
-	
-	protected double maxSpeed()
-	{
-		return 99999999;
-	}
-	
-	private double calcValidSpeed(final double val)
-	{
-		return Math.max(Math.min(val, maxSpeed() + getValue(Stat.SPEED_LIMIT)), 0);
 	}
 	
 	/**
@@ -345,7 +335,7 @@ public class CreatureStat
 	 */
 	public double getRunSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED);
 	}
 	
 	/**
@@ -353,7 +343,7 @@ public class CreatureStat
 	 */
 	public double getWalkSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED);
 	}
 	
 	/**
@@ -361,7 +351,7 @@ public class CreatureStat
 	 */
 	public double getSwimRunSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_RUN_SPEED));
+		return getValue(Stat.SWIM_RUN_SPEED);
 	}
 	
 	/**
@@ -369,7 +359,7 @@ public class CreatureStat
 	 */
 	public double getSwimWalkSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_WALK_SPEED));
+		return getValue(Stat.SWIM_WALK_SPEED);
 	}
 	
 	/**

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java

@@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged;
 import org.l2jmobius.gameserver.model.events.returns.TerminateReturn;
 import org.l2jmobius.gameserver.model.item.Weapon;
-import org.l2jmobius.gameserver.model.stats.Stat;
 import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp;
 
 public class PlayableStat extends CreatureStat
@@ -255,10 +254,4 @@ public class PlayableStat extends CreatureStat
 		final Weapon weapon = getActiveChar().getActiveWeaponItem();
 		return weapon != null ? weapon.getBaseAttackAngle() : super.getPhysicalAttackAngle();
 	}
-	
-	@Override
-	protected double maxSpeed()
-	{
-		return Config.MAX_RUN_SPEED + getValue(Stat.SPEED_LIMIT);
-	}
 }

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/SummonStat.java

@@ -33,8 +33,28 @@ public class SummonStat extends PlayableStat
 	}
 	
 	@Override
-	protected double maxSpeed()
+	public double getRunSpeed()
 	{
-		return Config.MAX_RUN_SPEED_SUMMON;
+		final double val = super.getRunSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
+	}
+	
+	@Override
+	public double getWalkSpeed()
+	{
+		final double val = super.getWalkSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
 	}
 }

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -167,7 +167,6 @@ public enum Stat
 	
 	// Run speed, walk & escape speed are calculated proportionally, magic speed is a buff
 	MOVE_SPEED("moveSpeed"),
-	SPEED_LIMIT("speedLimit"),
 	RUN_SPEED("runSpd", new SpeedFinalizer()),
 	WALK_SPEED("walkSpd", new SpeedFinalizer()),
 	SWIM_RUN_SPEED("fastSwimSpd", new SpeedFinalizer()),

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java

@@ -42,7 +42,7 @@ public class SpeedFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = getBaseSpeed(creature, stat);
-		if (creature.isPlayable())
+		if (creature.isPlayer())
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
@@ -56,21 +56,7 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		final double maxSpeed;
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
-		if (creature.isPlayer())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else if (creature.isSummon())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED_SUMMON + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else
-		{
-			maxSpeed = Double.MAX_VALUE;
-		}
-		
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, maxSpeed);
 	}
 	
 	@Override
@@ -78,7 +64,7 @@ public class SpeedFinalizer implements IStatFunction
 	{
 		if (isBlessed)
 		{
-			return Math.max(enchantLevel - 3, 0) + Math.max(enchantLevel - 6, 0);
+			return (1 * Math.max(enchantLevel - 3, 0)) + (1 * Math.max(enchantLevel - 6, 0));
 		}
 		return (0.6 * Math.max(enchantLevel - 3, 0)) + (0.6 * Math.max(enchantLevel - 6, 0));
 	}

L2J_Mobius_05.5_EtinasFate/dist/game/config/Character.ini

@@ -315,10 +315,6 @@ MaxSpBonus =  0
 # Default: 300
 MaxRunSpeed = 300
 
-# Maximum summon running speed.
-# Default: 350
-MaxRunSpeedSummon = 350
-
 # Maximum character Physical Attack.
 # Default: 999999
 MaxPAtk = 999999

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -339,7 +339,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Sow", Sow::new);
 		EffectHandler.getInstance().registerHandler("Speed", Speed::new);
 		EffectHandler.getInstance().registerHandler("SphericBarrier", SphericBarrier::new);
-		EffectHandler.getInstance().registerHandler("SpeedLimit", SpeedLimit::new);
 		EffectHandler.getInstance().registerHandler("SpModify", SpModify::new);
 		EffectHandler.getInstance().registerHandler("Spoil", Spoil::new);
 		EffectHandler.getInstance().registerHandler("StatAddForLevel", StatAddForLevel::new);

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SpeedLimit.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author dontknowdontcare
- */
-public class SpeedLimit extends AbstractStatEffect
-{
-	public SpeedLimit(StatSet params)
-	{
-		super(params, Stat.SPEED_LIMIT);
-	}
-}

L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt

@@ -308,7 +308,6 @@ SoulEating: Absorbs souls when taking exp from mobs and sets max soul count.
 Sow: Planting a seed into NPC target. Manor stuff.
 Speed: Speed stat.
 SphericBarrier: Blocks damage and buff/debuff incoming from outside the specified range.
-SpeedLimit: Increase a character's max Speed limit. (l2jmobius)
 SpModify: Bonus SP stat.
 Spoil: Spoils a mob activating its extra sweep drop.
 StatAddForLevel: Adds a fixed amount of a Stat for a specific player level. (l2jmobius)

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java

@@ -214,7 +214,6 @@ public class Config
 	public static double MAX_BONUS_EXP;
 	public static double MAX_BONUS_SP;
 	public static int MAX_RUN_SPEED;
-	public static int MAX_RUN_SPEED_SUMMON;
 	public static int MAX_PATK;
 	public static int MAX_MATK;
 	public static int MAX_PCRIT_RATE;
@@ -1802,7 +1801,6 @@ public class Config
 			MAX_BONUS_EXP = characterConfig.getDouble("MaxExpBonus", 0);
 			MAX_BONUS_SP = characterConfig.getDouble("MaxSpBonus", 0);
 			MAX_RUN_SPEED = characterConfig.getInt("MaxRunSpeed", 300);
-			MAX_RUN_SPEED_SUMMON = characterConfig.getInt("MaxRunSpeedSummon", 350);
 			MAX_PATK = characterConfig.getInt("MaxPAtk", 999999);
 			MAX_MATK = characterConfig.getInt("MaxMAtk", 999999);
 			MAX_PCRIT_RATE = characterConfig.getInt("MaxPCritRate", 500);

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -327,17 +327,7 @@ public class CreatureStat
 		{
 			baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.RUN_SPEED : Stat.WALK_SPEED, 0);
 		}
-		return getMoveSpeed() * (1 / baseSpeed);
+		return getMoveSpeed() * (1. / baseSpeed);
-	}
-	
-	protected double maxSpeed()
-	{
-		return 99999999;
-	}
-	
-	private double calcValidSpeed(final double val)
-	{
-		return Math.max(Math.min(val, maxSpeed() + getValue(Stat.SPEED_LIMIT)), 0);
 	}
 	
 	/**
@@ -345,7 +335,7 @@ public class CreatureStat
 	 */
 	public double getRunSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED);
 	}
 	
 	/**
@@ -353,7 +343,7 @@ public class CreatureStat
 	 */
 	public double getWalkSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED);
 	}
 	
 	/**
@@ -361,7 +351,7 @@ public class CreatureStat
 	 */
 	public double getSwimRunSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_RUN_SPEED));
+		return getValue(Stat.SWIM_RUN_SPEED);
 	}
 	
 	/**
@@ -369,7 +359,7 @@ public class CreatureStat
 	 */
 	public double getSwimWalkSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_WALK_SPEED));
+		return getValue(Stat.SWIM_WALK_SPEED);
 	}
 	
 	/**

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java

@@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged;
 import org.l2jmobius.gameserver.model.events.returns.TerminateReturn;
 import org.l2jmobius.gameserver.model.item.Weapon;
-import org.l2jmobius.gameserver.model.stats.Stat;
 import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp;
 
 public class PlayableStat extends CreatureStat
@@ -255,10 +254,4 @@ public class PlayableStat extends CreatureStat
 		final Weapon weapon = getActiveChar().getActiveWeaponItem();
 		return weapon != null ? weapon.getBaseAttackAngle() : super.getPhysicalAttackAngle();
 	}
-	
-	@Override
-	protected double maxSpeed()
-	{
-		return Config.MAX_RUN_SPEED + getValue(Stat.SPEED_LIMIT);
-	}
 }

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/SummonStat.java

@@ -33,8 +33,28 @@ public class SummonStat extends PlayableStat
 	}
 	
 	@Override
-	protected double maxSpeed()
+	public double getRunSpeed()
 	{
-		return Config.MAX_RUN_SPEED_SUMMON;
+		final double val = super.getRunSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
+	}
+	
+	@Override
+	public double getWalkSpeed()
+	{
+		final double val = super.getWalkSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
 	}
 }

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -167,7 +167,6 @@ public enum Stat
 	
 	// Run speed, walk & escape speed are calculated proportionally, magic speed is a buff
 	MOVE_SPEED("moveSpeed"),
-	SPEED_LIMIT("speedLimit"),
 	RUN_SPEED("runSpd", new SpeedFinalizer()),
 	WALK_SPEED("walkSpd", new SpeedFinalizer()),
 	SWIM_RUN_SPEED("fastSwimSpd", new SpeedFinalizer()),

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java

@@ -42,7 +42,7 @@ public class SpeedFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = getBaseSpeed(creature, stat);
-		if (creature.isPlayable())
+		if (creature.isPlayer())
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
@@ -56,21 +56,7 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		final double maxSpeed;
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
-		if (creature.isPlayer())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else if (creature.isSummon())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED_SUMMON + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else
-		{
-			maxSpeed = Double.MAX_VALUE;
-		}
-		
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, maxSpeed);
 	}
 	
 	@Override
@@ -78,7 +64,7 @@ public class SpeedFinalizer implements IStatFunction
 	{
 		if (isBlessed)
 		{
-			return Math.max(enchantLevel - 3, 0) + Math.max(enchantLevel - 6, 0);
+			return (1 * Math.max(enchantLevel - 3, 0)) + (1 * Math.max(enchantLevel - 6, 0));
 		}
 		return (0.6 * Math.max(enchantLevel - 3, 0)) + (0.6 * Math.max(enchantLevel - 6, 0));
 	}

L2J_Mobius_06.0_Fafurion/dist/game/config/Character.ini

@@ -319,10 +319,6 @@ MaxSpBonus =  0
 # Default: 300
 MaxRunSpeed = 300
 
-# Maximum summon running speed.
-# Default: 350
-MaxRunSpeedSummon = 350
-
 # Maximum character Physical Attack.
 # Default: 999999999
 MaxPAtk = 999999999

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -339,7 +339,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Sow", Sow::new);
 		EffectHandler.getInstance().registerHandler("Speed", Speed::new);
 		EffectHandler.getInstance().registerHandler("SphericBarrier", SphericBarrier::new);
-		EffectHandler.getInstance().registerHandler("SpeedLimit", SpeedLimit::new);
 		EffectHandler.getInstance().registerHandler("SpModify", SpModify::new);
 		EffectHandler.getInstance().registerHandler("Spoil", Spoil::new);
 		EffectHandler.getInstance().registerHandler("StatAddForLevel", StatAddForLevel::new);

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SpeedLimit.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author dontknowdontcare
- */
-public class SpeedLimit extends AbstractStatEffect
-{
-	public SpeedLimit(StatSet params)
-	{
-		super(params, Stat.SPEED_LIMIT);
-	}
-}

L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt

@@ -308,7 +308,6 @@ SoulEating: Absorbs souls when taking exp from mobs and sets max soul count.
 Sow: Planting a seed into NPC target. Manor stuff.
 Speed: Speed stat.
 SphericBarrier: Blocks damage and buff/debuff incoming from outside the specified range.
-SpeedLimit: Increase a character's max Speed limit. (l2jmobius)
 SpModify: Bonus SP stat.
 Spoil: Spoils a mob activating its extra sweep drop.
 StatAddForLevel: Adds a fixed amount of a Stat for a specific player level. (l2jmobius)

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java

@@ -215,7 +215,6 @@ public class Config
 	public static double MAX_BONUS_EXP;
 	public static double MAX_BONUS_SP;
 	public static int MAX_RUN_SPEED;
-	public static int MAX_RUN_SPEED_SUMMON;
 	public static int MAX_PATK;
 	public static int MAX_MATK;
 	public static int MAX_PCRIT_RATE;
@@ -1837,7 +1836,6 @@ public class Config
 			MAX_BONUS_EXP = characterConfig.getDouble("MaxExpBonus", 0);
 			MAX_BONUS_SP = characterConfig.getDouble("MaxSpBonus", 0);
 			MAX_RUN_SPEED = characterConfig.getInt("MaxRunSpeed", 300);
-			MAX_RUN_SPEED_SUMMON = characterConfig.getInt("MaxRunSpeedSummon", 350);
 			MAX_PATK = characterConfig.getInt("MaxPAtk", 999999);
 			MAX_MATK = characterConfig.getInt("MaxMAtk", 999999);
 			MAX_PCRIT_RATE = characterConfig.getInt("MaxPCritRate", 500);

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -327,17 +327,7 @@ public class CreatureStat
 		{
 			baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.RUN_SPEED : Stat.WALK_SPEED, 0);
 		}
-		return getMoveSpeed() * (1 / baseSpeed);
+		return getMoveSpeed() * (1. / baseSpeed);
-	}
-	
-	protected double maxSpeed()
-	{
-		return 99999999;
-	}
-	
-	private double calcValidSpeed(final double val)
-	{
-		return Math.max(Math.min(val, maxSpeed() + getValue(Stat.SPEED_LIMIT)), 0);
 	}
 	
 	/**
@@ -345,7 +335,7 @@ public class CreatureStat
 	 */
 	public double getRunSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED);
 	}
 	
 	/**
@@ -353,7 +343,7 @@ public class CreatureStat
 	 */
 	public double getWalkSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED);
 	}
 	
 	/**
@@ -361,7 +351,7 @@ public class CreatureStat
 	 */
 	public double getSwimRunSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_RUN_SPEED));
+		return getValue(Stat.SWIM_RUN_SPEED);
 	}
 	
 	/**
@@ -369,7 +359,7 @@ public class CreatureStat
 	 */
 	public double getSwimWalkSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_WALK_SPEED));
+		return getValue(Stat.SWIM_WALK_SPEED);
 	}
 	
 	/**

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java

@@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged;
 import org.l2jmobius.gameserver.model.events.returns.TerminateReturn;
 import org.l2jmobius.gameserver.model.item.Weapon;
-import org.l2jmobius.gameserver.model.stats.Stat;
 import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp;
 
 public class PlayableStat extends CreatureStat
@@ -255,10 +254,4 @@ public class PlayableStat extends CreatureStat
 		final Weapon weapon = getActiveChar().getActiveWeaponItem();
 		return weapon != null ? weapon.getBaseAttackAngle() : super.getPhysicalAttackAngle();
 	}
-	
-	@Override
-	protected double maxSpeed()
-	{
-		return Config.MAX_RUN_SPEED + getValue(Stat.SPEED_LIMIT);
-	}
 }

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/SummonStat.java

@@ -33,8 +33,28 @@ public class SummonStat extends PlayableStat
 	}
 	
 	@Override
-	protected double maxSpeed()
+	public double getRunSpeed()
 	{
-		return Config.MAX_RUN_SPEED_SUMMON;
+		final double val = super.getRunSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
+	}
+	
+	@Override
+	public double getWalkSpeed()
+	{
+		final double val = super.getWalkSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
 	}
 }

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -167,7 +167,6 @@ public enum Stat
 	
 	// Run speed, walk & escape speed are calculated proportionally, magic speed is a buff
 	MOVE_SPEED("moveSpeed"),
-	SPEED_LIMIT("speedLimit"),
 	RUN_SPEED("runSpd", new SpeedFinalizer()),
 	WALK_SPEED("walkSpd", new SpeedFinalizer()),
 	SWIM_RUN_SPEED("fastSwimSpd", new SpeedFinalizer()),

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java

@@ -42,7 +42,7 @@ public class SpeedFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = getBaseSpeed(creature, stat);
-		if (creature.isPlayable())
+		if (creature.isPlayer())
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
@@ -56,21 +56,7 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		final double maxSpeed;
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
-		if (creature.isPlayer())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else if (creature.isSummon())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED_SUMMON + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else
-		{
-			maxSpeed = Double.MAX_VALUE;
-		}
-		
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, maxSpeed);
 	}
 	
 	@Override
@@ -78,7 +64,7 @@ public class SpeedFinalizer implements IStatFunction
 	{
 		if (isBlessed)
 		{
-			return Math.max(enchantLevel - 3, 0) + Math.max(enchantLevel - 6, 0);
+			return (1 * Math.max(enchantLevel - 3, 0)) + (1 * Math.max(enchantLevel - 6, 0));
 		}
 		return (0.6 * Math.max(enchantLevel - 3, 0)) + (0.6 * Math.max(enchantLevel - 6, 0));
 	}

L2J_Mobius_07.0_PreludeOfWar/dist/game/config/Character.ini

@@ -329,10 +329,6 @@ MaxSpBonus =  0
 # Default: 300
 MaxRunSpeed = 300
 
-# Maximum summon running speed.
-# Default: 350
-MaxRunSpeedSummon = 350
-
 # Maximum character Physical Attack.
 # Default: 999999999
 MaxPAtk = 999999999

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -339,7 +339,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Sow", Sow::new);
 		EffectHandler.getInstance().registerHandler("Speed", Speed::new);
 		EffectHandler.getInstance().registerHandler("SphericBarrier", SphericBarrier::new);
-		EffectHandler.getInstance().registerHandler("SpeedLimit", SpeedLimit::new);
 		EffectHandler.getInstance().registerHandler("SpModify", SpModify::new);
 		EffectHandler.getInstance().registerHandler("Spoil", Spoil::new);
 		EffectHandler.getInstance().registerHandler("StatAddForLevel", StatAddForLevel::new);

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SpeedLimit.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author dontknowdontcare
- */
-public class SpeedLimit extends AbstractStatEffect
-{
-	public SpeedLimit(StatSet params)
-	{
-		super(params, Stat.SPEED_LIMIT);
-	}
-}

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt

@@ -307,7 +307,6 @@ SoulEating: Absorbs souls when taking exp from mobs and sets max soul count.
 Sow: Planting a seed into NPC target. Manor stuff.
 Speed: Speed stat.
 SphericBarrier: Blocks damage and buff/debuff incoming from outside the specified range.
-SpeedLimit: Increase a character's max Speed limit. (l2jmobius)
 SpModify: Bonus SP stat.
 Spoil: Spoils a mob activating its extra sweep drop.
 StatAddForLevel: Adds a fixed amount of a Stat for a specific player level. (l2jmobius)

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java

@@ -215,7 +215,6 @@ public class Config
 	public static double MAX_BONUS_EXP;
 	public static double MAX_BONUS_SP;
 	public static int MAX_RUN_SPEED;
-	public static int MAX_RUN_SPEED_SUMMON;
 	public static int MAX_PATK;
 	public static int MAX_MATK;
 	public static int MAX_PCRIT_RATE;
@@ -1847,7 +1846,6 @@ public class Config
 			MAX_BONUS_EXP = characterConfig.getDouble("MaxExpBonus", 0);
 			MAX_BONUS_SP = characterConfig.getDouble("MaxSpBonus", 0);
 			MAX_RUN_SPEED = characterConfig.getInt("MaxRunSpeed", 300);
-			MAX_RUN_SPEED_SUMMON = characterConfig.getInt("MaxRunSpeedSummon", 350);
 			MAX_PATK = characterConfig.getInt("MaxPAtk", 999999);
 			MAX_MATK = characterConfig.getInt("MaxMAtk", 999999);
 			MAX_PCRIT_RATE = characterConfig.getInt("MaxPCritRate", 500);

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -327,17 +327,7 @@ public class CreatureStat
 		{
 			baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.RUN_SPEED : Stat.WALK_SPEED, 0);
 		}
-		return getMoveSpeed() * (1 / baseSpeed);
+		return getMoveSpeed() * (1. / baseSpeed);
-	}
-	
-	protected double maxSpeed()
-	{
-		return 99999999;
-	}
-	
-	private double calcValidSpeed(final double val)
-	{
-		return Math.max(Math.min(val, maxSpeed() + getValue(Stat.SPEED_LIMIT)), 0);
 	}
 	
 	/**
@@ -345,7 +335,7 @@ public class CreatureStat
 	 */
 	public double getRunSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED);
 	}
 	
 	/**
@@ -353,7 +343,7 @@ public class CreatureStat
 	 */
 	public double getWalkSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED);
 	}
 	
 	/**
@@ -361,7 +351,7 @@ public class CreatureStat
 	 */
 	public double getSwimRunSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_RUN_SPEED));
+		return getValue(Stat.SWIM_RUN_SPEED);
 	}
 	
 	/**
@@ -369,7 +359,7 @@ public class CreatureStat
 	 */
 	public double getSwimWalkSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_WALK_SPEED));
+		return getValue(Stat.SWIM_WALK_SPEED);
 	}
 	
 	/**

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java

@@ -255,10 +255,4 @@ public class PlayableStat extends CreatureStat
 		final Weapon weapon = getActiveChar().getActiveWeaponItem();
 		return (weapon != null ? weapon.getBaseAttackAngle() + (int) getActiveChar().getStat().getValue(Stat.WEAPON_ATTACK_ANGLE_BONUS, 0) : super.getPhysicalAttackAngle());
 	}
-	
-	@Override
-	protected double maxSpeed()
-	{
-		return Config.MAX_RUN_SPEED + getValue(Stat.SPEED_LIMIT);
-	}
 }

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/SummonStat.java

@@ -33,8 +33,28 @@ public class SummonStat extends PlayableStat
 	}
 	
 	@Override
-	protected double maxSpeed()
+	public double getRunSpeed()
 	{
-		return Config.MAX_RUN_SPEED_SUMMON;
+		final double val = super.getRunSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
+	}
+	
+	@Override
+	public double getWalkSpeed()
+	{
+		final double val = super.getWalkSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
 	}
 }

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -168,7 +168,6 @@ public enum Stat
 	
 	// Run speed, walk & escape speed are calculated proportionally, magic speed is a buff
 	MOVE_SPEED("moveSpeed"),
-	SPEED_LIMIT("speedLimit"),
 	RUN_SPEED("runSpd", new SpeedFinalizer()),
 	WALK_SPEED("walkSpd", new SpeedFinalizer()),
 	SWIM_RUN_SPEED("fastSwimSpd", new SpeedFinalizer()),

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java

@@ -42,7 +42,7 @@ public class SpeedFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = getBaseSpeed(creature, stat);
-		if (creature.isPlayable())
+		if (creature.isPlayer())
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
@@ -56,21 +56,7 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		final double maxSpeed;
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
-		if (creature.isPlayer())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else if (creature.isSummon())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED_SUMMON + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else
-		{
-			maxSpeed = Double.MAX_VALUE;
-		}
-		
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, maxSpeed);
 	}
 	
 	@Override
@@ -78,7 +64,7 @@ public class SpeedFinalizer implements IStatFunction
 	{
 		if (isBlessed)
 		{
-			return Math.max(enchantLevel - 3, 0) + Math.max(enchantLevel - 6, 0);
+			return (1 * Math.max(enchantLevel - 3, 0)) + (1 * Math.max(enchantLevel - 6, 0));
 		}
 		return (0.6 * Math.max(enchantLevel - 3, 0)) + (0.6 * Math.max(enchantLevel - 6, 0));
 	}

L2J_Mobius_08.2_Homunculus/dist/game/config/Character.ini

@@ -329,10 +329,6 @@ MaxSpBonus =  0
 # Default: 300
 MaxRunSpeed = 300
 
-# Maximum summon running speed.
-# Default: 350
-MaxRunSpeedSummon = 350
-
 # Maximum character Physical Attack.
 # Default: 999999999
 MaxPAtk = 999999999

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -341,7 +341,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Sow", Sow::new);
 		EffectHandler.getInstance().registerHandler("Speed", Speed::new);
 		EffectHandler.getInstance().registerHandler("SphericBarrier", SphericBarrier::new);
-		EffectHandler.getInstance().registerHandler("SpeedLimit", SpeedLimit::new);
 		EffectHandler.getInstance().registerHandler("SpModify", SpModify::new);
 		EffectHandler.getInstance().registerHandler("Spoil", Spoil::new);
 		EffectHandler.getInstance().registerHandler("StatAddForLevel", StatAddForLevel::new);

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SpeedLimit.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author dontknowdontcare
- */
-public class SpeedLimit extends AbstractStatEffect
-{
-	public SpeedLimit(StatSet params)
-	{
-		super(params, Stat.SPEED_LIMIT);
-	}
-}

L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt

@@ -309,7 +309,6 @@ SoulEating: Absorbs souls when taking exp from mobs and sets max soul count.
 Sow: Planting a seed into NPC target. Manor stuff.
 Speed: Speed stat.
 SphericBarrier: Blocks damage and buff/debuff incoming from outside the specified range.
-SpeedLimit: Increase a character's max Speed limit. (l2jmobius)
 SpModify: Bonus SP stat.
 Spoil: Spoils a mob activating its extra sweep drop.
 StatAddForLevel: Adds a fixed amount of a Stat for a specific player level. (l2jmobius)

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/Config.java

@@ -208,7 +208,6 @@ public class Config
 	public static double MAX_BONUS_EXP;
 	public static double MAX_BONUS_SP;
 	public static int MAX_RUN_SPEED;
-	public static int MAX_RUN_SPEED_SUMMON;
 	public static int MAX_PATK;
 	public static int MAX_MATK;
 	public static int MAX_PCRIT_RATE;
@@ -1820,7 +1819,6 @@ public class Config
 			MAX_BONUS_EXP = characterConfig.getDouble("MaxExpBonus", 0);
 			MAX_BONUS_SP = characterConfig.getDouble("MaxSpBonus", 0);
 			MAX_RUN_SPEED = characterConfig.getInt("MaxRunSpeed", 300);
-			MAX_RUN_SPEED_SUMMON = characterConfig.getInt("MaxRunSpeedSummon", 350);
 			MAX_PATK = characterConfig.getInt("MaxPAtk", 999999);
 			MAX_MATK = characterConfig.getInt("MaxMAtk", 999999);
 			MAX_PCRIT_RATE = characterConfig.getInt("MaxPCritRate", 500);

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -332,17 +332,7 @@ public class CreatureStat
 		{
 			baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.RUN_SPEED : Stat.WALK_SPEED, 0);
 		}
-		return getMoveSpeed() * (1 / baseSpeed);
+		return getMoveSpeed() * (1. / baseSpeed);
-	}
-	
-	protected double maxSpeed()
-	{
-		return 99999999;
-	}
-	
-	private double calcValidSpeed(final double val)
-	{
-		return Math.max(Math.min(val, maxSpeed() + getValue(Stat.SPEED_LIMIT)), 0);
 	}
 	
 	/**
@@ -350,7 +340,7 @@ public class CreatureStat
 	 */
 	public double getRunSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED);
 	}
 	
 	/**
@@ -358,7 +348,7 @@ public class CreatureStat
 	 */
 	public double getWalkSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED);
 	}
 	
 	/**
@@ -366,7 +356,7 @@ public class CreatureStat
 	 */
 	public double getSwimRunSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_RUN_SPEED));
+		return getValue(Stat.SWIM_RUN_SPEED);
 	}
 	
 	/**
@@ -374,7 +364,7 @@ public class CreatureStat
 	 */
 	public double getSwimWalkSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_WALK_SPEED));
+		return getValue(Stat.SWIM_WALK_SPEED);
 	}
 	
 	/**

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java

@@ -255,10 +255,4 @@ public class PlayableStat extends CreatureStat
 		final Weapon weapon = getActiveChar().getActiveWeaponItem();
 		return (weapon != null ? weapon.getBaseAttackAngle() + (int) getActiveChar().getStat().getValue(Stat.WEAPON_ATTACK_ANGLE_BONUS, 0) : super.getPhysicalAttackAngle());
 	}
-	
-	@Override
-	protected double maxSpeed()
-	{
-		return Config.MAX_RUN_SPEED + getValue(Stat.SPEED_LIMIT);
-	}
 }

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/SummonStat.java

@@ -33,8 +33,28 @@ public class SummonStat extends PlayableStat
 	}
 	
 	@Override
-	protected double maxSpeed()
+	public double getRunSpeed()
 	{
-		return Config.MAX_RUN_SPEED_SUMMON;
+		final double val = super.getRunSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
+	}
+	
+	@Override
+	public double getWalkSpeed()
+	{
+		final double val = super.getWalkSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
 	}
 }

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -173,7 +173,6 @@ public enum Stat
 	
 	// Run speed, walk & escape speed are calculated proportionally, magic speed is a buff
 	MOVE_SPEED("moveSpeed"),
-	SPEED_LIMIT("speedLimit"),
 	RUN_SPEED("runSpd", new SpeedFinalizer()),
 	WALK_SPEED("walkSpd", new SpeedFinalizer()),
 	SWIM_RUN_SPEED("fastSwimSpd", new SpeedFinalizer()),

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java

@@ -42,7 +42,7 @@ public class SpeedFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = getBaseSpeed(creature, stat);
-		if (creature.isPlayable())
+		if (creature.isPlayer())
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
@@ -61,21 +61,7 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		final double maxSpeed;
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
-		if (creature.isPlayer())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else if (creature.isSummon())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED_SUMMON + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else
-		{
-			maxSpeed = Double.MAX_VALUE;
-		}
-		
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, maxSpeed);
 	}
 	
 	@Override
@@ -83,7 +69,7 @@ public class SpeedFinalizer implements IStatFunction
 	{
 		if (isBlessed)
 		{
-			return Math.max(enchantLevel - 3, 0) + Math.max(enchantLevel - 6, 0);
+			return (1 * Math.max(enchantLevel - 3, 0)) + (1 * Math.max(enchantLevel - 6, 0));
 		}
 		return (0.6 * Math.max(enchantLevel - 3, 0)) + (0.6 * Math.max(enchantLevel - 6, 0));
 	}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Character.ini

@@ -329,10 +329,6 @@ MaxSpBonus =  0
 # Default: 300
 MaxRunSpeed = 300
 
-# Maximum summon running speed.
-# Default: 350
-MaxRunSpeedSummon = 350
-
 # Maximum character Physical Attack.
 # Default: 999999999
 MaxPAtk = 999999999

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -342,7 +342,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Sow", Sow::new);
 		EffectHandler.getInstance().registerHandler("Speed", Speed::new);
 		EffectHandler.getInstance().registerHandler("SphericBarrier", SphericBarrier::new);
-		EffectHandler.getInstance().registerHandler("SpeedLimit", SpeedLimit::new);
 		EffectHandler.getInstance().registerHandler("SpModify", SpModify::new);
 		EffectHandler.getInstance().registerHandler("Spoil", Spoil::new);
 		EffectHandler.getInstance().registerHandler("StatAddForLevel", StatAddForLevel::new);

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SpeedLimit.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author dontknowdontcare
- */
-public class SpeedLimit extends AbstractStatEffect
-{
-	public SpeedLimit(StatSet params)
-	{
-		super(params, Stat.SPEED_LIMIT);
-	}
-}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt

@@ -309,7 +309,6 @@ SoulEating: Absorbs souls when taking exp from mobs and sets max soul count.
 Sow: Planting a seed into NPC target. Manor stuff.
 Speed: Speed stat.
 SphericBarrier: Blocks damage and buff/debuff incoming from outside the specified range.
-SpeedLimit: Increase a character's max Speed limit. (l2jmobius)
 SpModify: Bonus SP stat.
 Spoil: Spoils a mob activating its extra sweep drop.
 StatAddForLevel: Adds a fixed amount of a Stat for a specific player level. (l2jmobius)

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java

@@ -208,7 +208,6 @@ public class Config
 	public static double MAX_BONUS_EXP;
 	public static double MAX_BONUS_SP;
 	public static int MAX_RUN_SPEED;
-	public static int MAX_RUN_SPEED_SUMMON;
 	public static int MAX_PATK;
 	public static int MAX_MATK;
 	public static int MAX_PCRIT_RATE;
@@ -1822,7 +1821,6 @@ public class Config
 			MAX_BONUS_EXP = characterConfig.getDouble("MaxExpBonus", 0);
 			MAX_BONUS_SP = characterConfig.getDouble("MaxSpBonus", 0);
 			MAX_RUN_SPEED = characterConfig.getInt("MaxRunSpeed", 300);
-			MAX_RUN_SPEED_SUMMON = characterConfig.getInt("MaxRunSpeedSummon", 350);
 			MAX_PATK = characterConfig.getInt("MaxPAtk", 999999);
 			MAX_MATK = characterConfig.getInt("MaxMAtk", 999999);
 			MAX_PCRIT_RATE = characterConfig.getInt("MaxPCritRate", 500);

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java

@@ -332,17 +332,7 @@ public class CreatureStat
 		{
 			baseSpeed = _creature.getTemplate().getBaseValue(_creature.isRunning() ? Stat.RUN_SPEED : Stat.WALK_SPEED, 0);
 		}
-		return getMoveSpeed() * (1 / baseSpeed);
+		return getMoveSpeed() * (1. / baseSpeed);
-	}
-	
-	protected double maxSpeed()
-	{
-		return 99999999;
-	}
-	
-	private double calcValidSpeed(final double val)
-	{
-		return Math.max(Math.min(val, maxSpeed() + getValue(Stat.SPEED_LIMIT)), 0);
 	}
 	
 	/**
@@ -350,7 +340,7 @@ public class CreatureStat
 	 */
 	public double getRunSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_RUN_SPEED : Stat.RUN_SPEED);
 	}
 	
 	/**
@@ -358,7 +348,7 @@ public class CreatureStat
 	 */
 	public double getWalkSpeed()
 	{
-		return calcValidSpeed(getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED));
+		return getValue(_creature.isInsideZone(ZoneId.WATER) ? Stat.SWIM_WALK_SPEED : Stat.WALK_SPEED);
 	}
 	
 	/**
@@ -366,7 +356,7 @@ public class CreatureStat
 	 */
 	public double getSwimRunSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_RUN_SPEED));
+		return getValue(Stat.SWIM_RUN_SPEED);
 	}
 	
 	/**
@@ -374,7 +364,7 @@ public class CreatureStat
 	 */
 	public double getSwimWalkSpeed()
 	{
-		return calcValidSpeed(getValue(Stat.SWIM_WALK_SPEED));
+		return getValue(Stat.SWIM_WALK_SPEED);
 	}
 	
 	/**

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java

@@ -255,10 +255,4 @@ public class PlayableStat extends CreatureStat
 		final Weapon weapon = getActiveChar().getActiveWeaponItem();
 		return (weapon != null ? weapon.getBaseAttackAngle() + (int) getActiveChar().getStat().getValue(Stat.WEAPON_ATTACK_ANGLE_BONUS, 0) : super.getPhysicalAttackAngle());
 	}
-	
-	@Override
-	protected double maxSpeed()
-	{
-		return Config.MAX_RUN_SPEED + getValue(Stat.SPEED_LIMIT);
-	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/SummonStat.java

@@ -33,8 +33,28 @@ public class SummonStat extends PlayableStat
 	}
 	
 	@Override
-	protected double maxSpeed()
+	public double getRunSpeed()
 	{
-		return Config.MAX_RUN_SPEED_SUMMON;
+		final double val = super.getRunSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
+	}
+	
+	@Override
+	public double getWalkSpeed()
+	{
+		final double val = super.getWalkSpeed() + Config.RUN_SPD_BOOST;
+		
+		// Apply max run speed cap.
+		if (val > (Config.MAX_RUN_SPEED + 50)) // In retail maximum run speed is 350 for summons and 300 for players
+		{
+			return Config.MAX_RUN_SPEED + 50;
+		}
+		return val;
 	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -173,7 +173,6 @@ public enum Stat
 	
 	// Run speed, walk & escape speed are calculated proportionally, magic speed is a buff
 	MOVE_SPEED("moveSpeed"),
-	SPEED_LIMIT("speedLimit"),
 	RUN_SPEED("runSpd", new SpeedFinalizer()),
 	WALK_SPEED("walkSpd", new SpeedFinalizer()),
 	SWIM_RUN_SPEED("fastSwimSpd", new SpeedFinalizer()),

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java

@@ -42,7 +42,7 @@ public class SpeedFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = getBaseSpeed(creature, stat);
-		if (creature.isPlayable())
+		if (creature.isPlayer())
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
@@ -61,21 +61,7 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		final double maxSpeed;
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
-		if (creature.isPlayer())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else if (creature.isSummon())
-		{
-			maxSpeed = Config.MAX_RUN_SPEED_SUMMON + creature.getStat().getValue(Stat.SPEED_LIMIT, 0);
-		}
-		else
-		{
-			maxSpeed = Double.MAX_VALUE;
-		}
-		
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, maxSpeed);
 	}
 	
 	@Override
@@ -83,7 +69,7 @@ public class SpeedFinalizer implements IStatFunction
 	{
 		if (isBlessed)
 		{
-			return Math.max(enchantLevel - 3, 0) + Math.max(enchantLevel - 6, 0);
+			return (1 * Math.max(enchantLevel - 3, 0)) + (1 * Math.max(enchantLevel - 6, 0));
 		}
 		return (0.6 * Math.max(enchantLevel - 3, 0)) + (0.6 * Math.max(enchantLevel - 6, 0));
 	}