Quellcode durchsuchen

BETA: Removing static formulas for bow/crossbow ranges since they are not needed anymore.
* Reported by: lion
* Patch by: lion

Rumen Nikiforov vor 11 Jahren
Ursprung
Commit
4680b7cc7b

+ 0 - 55
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncBowAtkRange.java

@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2004-2013 L2J Server
- * 
- * This file is part of L2J Server.
- * 
- * L2J Server 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.
- * 
- * L2J Server 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 com.l2jserver.gameserver.model.skills.funcs.formulas;
-
-import com.l2jserver.gameserver.model.conditions.ConditionUsingItemType;
-import com.l2jserver.gameserver.model.items.type.L2WeaponType;
-import com.l2jserver.gameserver.model.skills.funcs.Func;
-import com.l2jserver.gameserver.model.stats.Env;
-import com.l2jserver.gameserver.model.stats.Stats;
-
-/**
- * @author UnAfraid
- */
-public class FuncBowAtkRange extends Func
-{
-	private static final FuncBowAtkRange _fbar_instance = new FuncBowAtkRange();
-	
-	public static Func getInstance()
-	{
-		return _fbar_instance;
-	}
-	
-	private FuncBowAtkRange()
-	{
-		super(Stats.POWER_ATTACK_RANGE, 0x10, null);
-		setCondition(new ConditionUsingItemType(L2WeaponType.BOW.mask()));
-	}
-	
-	@Override
-	public void calc(Env env)
-	{
-		if (!cond.test(env))
-		{
-			return;
-		}
-		// default is 40 and with bow should be 500
-		env.addValue(460);
-	}
-}

+ 0 - 55
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncCrossBowAtkRange.java

@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2004-2013 L2J Server
- * 
- * This file is part of L2J Server.
- * 
- * L2J Server 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.
- * 
- * L2J Server 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 com.l2jserver.gameserver.model.skills.funcs.formulas;
-
-import com.l2jserver.gameserver.model.conditions.ConditionUsingItemType;
-import com.l2jserver.gameserver.model.items.type.L2WeaponType;
-import com.l2jserver.gameserver.model.skills.funcs.Func;
-import com.l2jserver.gameserver.model.stats.Env;
-import com.l2jserver.gameserver.model.stats.Stats;
-
-/**
- * @author UnAfraid
- */
-public class FuncCrossBowAtkRange extends Func
-{
-	private static final FuncCrossBowAtkRange _fcb_instance = new FuncCrossBowAtkRange();
-	
-	public static Func getInstance()
-	{
-		return _fcb_instance;
-	}
-	
-	private FuncCrossBowAtkRange()
-	{
-		super(Stats.POWER_ATTACK_RANGE, 0x10, null);
-		setCondition(new ConditionUsingItemType(L2WeaponType.CROSSBOW.mask()));
-	}
-	
-	@Override
-	public void calc(Env env)
-	{
-		if (!cond.test(env))
-		{
-			return;
-		}
-		// default is 40 and with crossbow should be 400
-		env.addValue(360);
-	}
-}

+ 0 - 10
L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Formulas.java

@@ -55,8 +55,6 @@ import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncArmorSet;
 import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncAtkAccuracy;
 import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncAtkCritical;
 import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncAtkEvasion;
-import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncBowAtkRange;
-import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncCrossBowAtkRange;
 import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncGatesMDefMod;
 import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncGatesPDefMod;
 import com.l2jserver.gameserver.model.skills.funcs.formulas.FuncHenna;
@@ -199,14 +197,6 @@ public final class Formulas
 			cha.addStatFunc(FuncMaxHpMul.getInstance());
 			cha.addStatFunc(FuncMaxCpMul.getInstance());
 			cha.addStatFunc(FuncMaxMpMul.getInstance());
-			// cha.addStatFunc(FuncMultRegenResting.getInstance(Stats.REGENERATE_HP_RATE));
-			// cha.addStatFunc(FuncMultRegenResting.getInstance(Stats.REGENERATE_CP_RATE));
-			// cha.addStatFunc(FuncMultRegenResting.getInstance(Stats.REGENERATE_MP_RATE));
-			cha.addStatFunc(FuncBowAtkRange.getInstance());
-			cha.addStatFunc(FuncCrossBowAtkRange.getInstance());
-			// cha.addStatFunc(FuncMultLevelMod.getInstance(Stats.POWER_ATTACK));
-			// cha.addStatFunc(FuncMultLevelMod.getInstance(Stats.POWER_DEFENCE));
-			// cha.addStatFunc(FuncMultLevelMod.getInstance(Stats.MAGIC_DEFENCE));
 			cha.addStatFunc(FuncPAtkMod.getInstance());
 			cha.addStatFunc(FuncMAtkMod.getInstance());
 			cha.addStatFunc(FuncPDefMod.getInstance());