lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with L2JServer Jan 24th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
trunk/java/com/l2jserver/gameserver/model/stats/BaseStats.java
View File

@@ -46,7 +46,7 @@ public enum BaseStats
@Override
public double calcBonus(L2Character actor)
{
return Math.pow(1.005, actor.getDEX() - 23);
return Math.pow(1.004558949443461, actor.getDEX() - 19.27356040917275);
}
},
WIT // Updated and better Formula to match Ertheia
@@ -54,7 +54,7 @@ public enum BaseStats
@Override
public double calcBonus(L2Character actor)
{
return Math.pow(1.015, actor.getWIT() - 90);
return Math.pow(1.013832042738272, actor.getWIT() - 64.57078483041223);
}
},
CON // Updated and better Formula to match Ertheia
@@ -62,7 +62,7 @@ public enum BaseStats
@Override
public double calcBonus(L2Character actor)
{
return Math.pow(1.012, actor.getCON() - 35); // maybe - 36
return Math.pow(1.011685289099497, actor.getCON() - 34.80273839854561);
}
},
MEN // Updated and better Formula to match Ertheia
@@ -70,7 +70,7 @@ public enum BaseStats
@Override
public double calcBonus(L2Character actor)
{
return Math.pow(1.004, actor.getMEN() + 30);
return Math.pow(1.003687502032154, actor.getMEN() + 30.4505503162);
}
},
CHA // Addition for Ertheia

6
trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java
View File

@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.HitConditionBonus;
import com.l2jserver.gameserver.datatables.KarmaData;
import com.l2jserver.gameserver.data.xml.impl.HitConditionBonusData;
import com.l2jserver.gameserver.data.xml.impl.KarmaData;
import com.l2jserver.gameserver.enums.ShotType;
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.instancemanager.ClanHallManager;
@@ -1155,7 +1155,7 @@ public final class Formulas
int chance = (80 + (2 * (attacker.getAccuracy() - target.getEvasionRate(attacker)))) * 10;
// Get additional bonus from the conditions when you are attacking
chance *= HitConditionBonus.getInstance().getConditionBonus(attacker, target);
chance *= HitConditionBonusData.getInstance().getConditionBonus(attacker, target);
chance = Math.max(chance, 200);
chance = Math.min(chance, 980);

5
trunk/java/com/l2jserver/gameserver/model/stats/Stats.java
View File

@@ -198,7 +198,10 @@ public enum Stats
FISHING_EXPERTISE("fishingExpertise"),
// Brooches
BROOCH_JEWELS("broochJewels");
BROOCH_JEWELS("broochJewels"),
// Summon Points
MAX_SUMMON_POINTS("summonPoints");
public static final int NUM_STATS = values().length;

2
trunk/java/com/l2jserver/gameserver/model/stats/functions/FuncEnchantHp.java
View File

@@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.model.stats.functions;
import com.l2jserver.gameserver.datatables.EnchantItemHPBonusData;
import com.l2jserver.gameserver.data.xml.impl.EnchantItemHPBonusData;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;

4
trunk/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncArmorSet.java
View File

@@ -21,7 +21,7 @@ package com.l2jserver.gameserver.model.stats.functions.formulas;
import java.util.HashMap;
import java.util.Map;
import com.l2jserver.gameserver.datatables.ArmorSetsData;
import com.l2jserver.gameserver.data.xml.impl.ArmorSetsData;
import com.l2jserver.gameserver.model.L2ArmorSet;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -90,4 +90,4 @@ public class FuncArmorSet extends AbstractFunction
}
return value;
}
}
}