瀏覽代碼

BETA: Some more for [5859] and few improvements in FuncMAtkMod.

MELERIX 12 年之前
父節點
當前提交
89f0094110

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/GameTimeController.java

@@ -42,7 +42,7 @@ public final class GameTimeController extends Thread
 	public static final int TICKS_PER_SECOND = 10; // not able to change this without checking through code
 	public static final int MILLIS_IN_TICK = 1000 / TICKS_PER_SECOND;
 	public static final int IG_DAYS_PER_DAY = 6;
-	public static final int MILLIS_PER_IG_DAY = (1000 * 60 * 60 * 24) / IG_DAYS_PER_DAY;
+	public static final int MILLIS_PER_IG_DAY = (3600000 * 24) / IG_DAYS_PER_DAY;
 	public static final int SECONDS_PER_IG_DAY = MILLIS_PER_IG_DAY / 1000;
 	public static final int MINUTES_PER_IG_DAY = SECONDS_PER_IG_DAY / 60;
 	public static final int TICKS_PER_IG_DAY = SECONDS_PER_IG_DAY * TICKS_PER_SECOND;

+ 4 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java

@@ -118,9 +118,9 @@ public final class AuctionableHall extends ClanHall
 		}
 		else if (!_paid && !forced)
 		{
-			if ((System.currentTimeMillis() + (1000 * 60 * 60 * 24)) <= (_paidUntil + _chRate))
+			if ((System.currentTimeMillis() + (3600000 * 24)) <= (_paidUntil + _chRate))
 			{
-				ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), System.currentTimeMillis() + (1000 * 60 * 60 * 24));
+				ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), System.currentTimeMillis() + (3600000 * 24));
 			}
 			else
 			{
@@ -197,9 +197,9 @@ public final class AuctionableHall extends ClanHall
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
 						sm.addNumber(getLease());
 						Clan.broadcastToOnlineMembers(sm);
-						if ((_time + (1000 * 60 * 60 * 24)) <= (_paidUntil + _chRate))
+						if ((_time + (3600000 * 24)) <= (_paidUntil + _chRate))
 						{
-							ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _time + (1000 * 60 * 60 * 24));
+							ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _time + (3600000 * 24));
 						}
 						else
 						{

+ 4 - 12
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMAtkMod.java

@@ -43,17 +43,9 @@ public class FuncMAtkMod extends Func
 	@Override
 	public void calc(Env env)
 	{
-		if (env.getCharacter().isPlayer())
-		{
-			double intb = BaseStats.INT.calcBonus(env.getPlayer());
-			double lvlb = env.getPlayer().getLevelMod();
-			env.mulValue((lvlb * lvlb) * (intb * intb));
-		}
-		else
-		{
-			double intb = BaseStats.INT.calcBonus(env.getCharacter());
-			double lvlb = env.getCharacter().getLevelMod();
-			env.mulValue((lvlb * lvlb) * (intb * intb));
-		}
+		// Level Modifier^2 * INT Modifier^2
+		double lvlMod = env.getCharacter().isPlayer() ? BaseStats.INT.calcBonus(env.getPlayer()) : BaseStats.INT.calcBonus(env.getCharacter());
+		double intMod = env.getCharacter().isPlayer() ? env.getPlayer().getLevelMod() : env.getCharacter().getLevelMod();
+		env.mulValue(Math.pow(lvlMod, 2) * Math.pow(intMod, 2));
 	}
 }