ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

combatlevel: Fix prayer level needed to next combat

Browse Source 
This adds a test which exposes an edge case where the needed prayer
levels to next combat level had been calculated to be 3 instead of 1,
and fixes that calculation.

Fixes runelite/runelite#7103
This commit is contained in:
Jordan Atwood
2018-12-31 10:39:48 -08:00
parent 541ad1e26d
commit 5edeeb6633
2 changed files with 62 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
runelite-client/src/test/java/net/runelite/client/plugins/combatlevel/CombatLevelPluginTest.java
View File

@@ -31,11 +31,10 @@ import net.runelite.api.Client;
import net.runelite.api.Player;
import net.runelite.api.Skill;
import static net.runelite.client.plugins.combatlevel.CombatLevelOverlay.calcLevels;
import static net.runelite.client.plugins.combatlevel.CombatLevelOverlay.calcLevelsPray;
import static net.runelite.client.plugins.combatlevel.CombatLevelOverlay.calcLevelsRM;
import static net.runelite.client.plugins.combatlevel.CombatLevelOverlay.correctPrayer;
import static net.runelite.client.plugins.combatlevel.CombatLevelOverlay.ATT_STR_MULT;
import static net.runelite.client.plugins.combatlevel.CombatLevelOverlay.DEF_HP_MULT;
import static net.runelite.client.plugins.combatlevel.CombatLevelOverlay.PRAY_MULT;
import static net.runelite.client.plugins.combatlevel.CombatLevelOverlay.RANGE_MAGIC_LEVEL_MULT;
import static net.runelite.client.plugins.combatlevel.CombatLevelOverlay.RANGE_MAGIC_MULT;
import static org.junit.Assert.assertEquals;
@@ -50,10 +49,6 @@ import java.util.HashMap;
@RunWith(MockitoJUnitRunner.class)
public class CombatLevelPluginTest
{
private static final double ATT_STR_MULT = 0.325;
private static final double DEF_HP_MULT = 0.25;
private static final double PRAY_MULT = 0.125;
@Mock
@Bind
private Client client;
@@ -114,9 +109,8 @@ public class CombatLevelPluginTest
player.getCombatLevel() + 1, DEF_HP_MULT));
// test prayer
int prayNeed = calcLevels(baseValues.get("base") + baseValues.get("max"),
player.getCombatLevel() + 1, PRAY_MULT);
assertEquals(5, correctPrayer(client.getRealSkillLevel(Skill.PRAYER), prayNeed));
assertEquals(5, calcLevelsPray(baseValues.get("base") + baseValues.get("max"),
player.getCombatLevel() + 1, client.getRealSkillLevel(Skill.PRAYER)));
// test ranged
assertEquals(2, calcLevelsRM(client.getRealSkillLevel(Skill.RANGED),
@@ -150,9 +144,8 @@ public class CombatLevelPluginTest
player.getCombatLevel() + 1, DEF_HP_MULT));
// test prayer
int prayNeed = calcLevels(baseValues.get("base") + baseValues.get("max"),
player.getCombatLevel() + 1, PRAY_MULT);
assertEquals(2, correctPrayer(client.getRealSkillLevel(Skill.PRAYER), prayNeed));
assertEquals(2, calcLevelsPray(baseValues.get("base") + baseValues.get("max"),
player.getCombatLevel() + 1, client.getRealSkillLevel(Skill.PRAYER)));
// test ranged
assertEquals(4, calcLevelsRM(client.getRealSkillLevel(Skill.RANGED),
@@ -187,9 +180,8 @@ public class CombatLevelPluginTest
player.getCombatLevel() + 1, DEF_HP_MULT));
// test prayer
int prayNeed = calcLevels(baseValues.get("base") + baseValues.get("max"),
player.getCombatLevel() + 1, PRAY_MULT);
assertEquals(4, correctPrayer(client.getRealSkillLevel(Skill.PRAYER), prayNeed));
assertEquals(4, calcLevelsPray(baseValues.get("base") + baseValues.get("max"),
player.getCombatLevel() + 1, client.getRealSkillLevel(Skill.PRAYER)));
// test ranged
assertEquals(17, calcLevelsRM(client.getRealSkillLevel(Skill.RANGED),
@@ -224,9 +216,8 @@ public class CombatLevelPluginTest
player.getCombatLevel() + 1, DEF_HP_MULT));
// test prayer
int prayNeed = calcLevels(baseValues.get("base") + baseValues.get("max"),
player.getCombatLevel() + 1, PRAY_MULT);
assertEquals(3, correctPrayer(client.getRealSkillLevel(Skill.PRAYER), prayNeed));
assertEquals(3, calcLevelsPray(baseValues.get("base") + baseValues.get("max"),
player.getCombatLevel() + 1, client.getRealSkillLevel(Skill.PRAYER)));
// test ranged
assertEquals(14, calcLevelsRM(client.getRealSkillLevel(Skill.RANGED),
@@ -262,8 +253,26 @@ public class CombatLevelPluginTest
player.getCombatLevel() + 1, DEF_HP_MULT));
// test prayer
int prayNeed = calcLevels(baseValues.get("base") + baseValues.get("max"),
player.getCombatLevel() + 1, PRAY_MULT);
assertEquals(4, correctPrayer(client.getRealSkillLevel(Skill.PRAYER), prayNeed));
assertEquals(4, calcLevelsPray(baseValues.get("base") + baseValues.get("max"),
player.getCombatLevel() + 1, client.getRealSkillLevel(Skill.PRAYER)));
}
@Test
public void testPrayerLevelsNeeded()
{
when(player.getCombatLevel()).thenReturn(124);
when(client.getRealSkillLevel(Skill.ATTACK)).thenReturn(99);
when(client.getRealSkillLevel(Skill.STRENGTH)).thenReturn(99);
when(client.getRealSkillLevel(Skill.DEFENCE)).thenReturn(99);
when(client.getRealSkillLevel(Skill.PRAYER)).thenReturn(89);
when(client.getRealSkillLevel(Skill.RANGED)).thenReturn(99);
when(client.getRealSkillLevel(Skill.MAGIC)).thenReturn(99);
when(client.getRealSkillLevel(Skill.HITPOINTS)).thenReturn(99);
HashMap<String, Double> baseValues = getBaseValues();
// test prayer
assertEquals(1, calcLevelsPray(baseValues.get("base") + baseValues.get("max"),
player.getCombatLevel() + 1, client.getRealSkillLevel(Skill.PRAYER)));
}
}