yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected combat level formula

Browse Source
This commit is contained in:
ceikry
2021-08-07 18:22:45 -05:00
parent e05c4ac1b0
commit f0b6a4d702
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/node/entity/skill/Skills.java
+16 -19
View File
@@ -22,6 +22,9 @@ import org.rs09.consts.Items;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import static java.lang.Math.floor;
import static java.lang.Math.max;
/** /**
* Represents an entity's skills. * Represents an entity's skills.
* @author Emperor * @author Emperor
@@ -453,8 +456,8 @@ public final class Skills {
int points = 0; int points = 0;
int output = 0; int output = 0;
for (byte lvl = 1; lvl < 100; lvl++) { for (byte lvl = 1; lvl < 100; lvl++) {
points += Math.floor(lvl + 300.0 * Math.pow(2.0, lvl / 7.0)); points += floor(lvl + 300.0 * Math.pow(2.0, lvl / 7.0));
output = (int) Math.floor(points / 4); output = (int) floor(points / 4);
if ((output - 1) >= exp) { if ((output - 1) >= exp) {
return lvl; return lvl;
} }
@@ -467,8 +470,8 @@ public final class Skills {
int points = 0; int points = 0;
int output = 0; int output = 0;
for (byte lvl = 1; lvl < 100; lvl++) { for (byte lvl = 1; lvl < 100; lvl++) {
points += Math.floor(lvl + 300.0 * Math.pow(2.0, lvl / 7.0)); points += floor(lvl + 300.0 * Math.pow(2.0, lvl / 7.0));
output = (int) Math.floor(points / 4); output = (int) floor(points / 4);
if ((output - 1) >= exp) { if ((output - 1) >= exp) {
return lvl; return lvl;
} }
@@ -485,11 +488,11 @@ public final class Skills {
int points = 0; int points = 0;
int output = 0; int output = 0;
for (int lvl = 1; lvl <= level; lvl++) { for (int lvl = 1; lvl <= level; lvl++) {
points += Math.floor(lvl + 300.0 * Math.pow(2.0, lvl / 7.0)); points += floor(lvl + 300.0 * Math.pow(2.0, lvl / 7.0));
if (lvl >= level) { if (lvl >= level) {
return output; return output;
} }
output = (int) Math.floor(points / 4); output = (int) floor(points / 4);
} }
return 0; return 0;
} }
@@ -523,19 +526,13 @@ public final class Skills {
if (entity instanceof NPC) { if (entity instanceof NPC) {
return ((NPC) entity).getDefinition().getCombatLevel(); return ((NPC) entity).getDefinition().getCombatLevel();
} }
int combatLevel = 0;
int melee = staticLevels[ATTACK] + staticLevels[STRENGTH]; double base = 0.25 * (staticLevels[DEFENCE] + staticLevels[HITPOINTS] + floor(0.5 * staticLevels[PRAYER]));
int range = (int) (1.5 * staticLevels[RANGE]); double meleeBase = 0.325 * (staticLevels[ATTACK] + staticLevels[STRENGTH]);
int mage = (int) (1.5 * staticLevels[MAGIC]); double rangeBase = 0.325 * (floor(staticLevels[RANGE] / 2.0) * 1.5);
if (melee > range && melee > mage) { double magicBase = 0.325 * (floor(staticLevels[MAGIC] / 2.0) * 1.5);
combatLevel = melee;
} else if (range > melee && range > mage) { return (int) (base + max(meleeBase, max(rangeBase, magicBase)));
combatLevel = range;
} else {
combatLevel = mage;
}
combatLevel = staticLevels[DEFENCE] + staticLevels[HITPOINTS] + (staticLevels[PRAYER] / 2) + (int) (1.3 * combatLevel);
return combatLevel / 4;
} }
/** /**