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

combat level: show next levels needed even past 99

Browse Source 
In some cases, it is not possible to get a combat level solely from leveling
any one stat. If this happened previously the overlay would show an empty
tooltip due to the levels required all being >99. This just shows the levels
required even if it surpasses 99.
This commit is contained in:
Adam
2020-11-20 19:44:17 -05:00
parent 9baf4c4a45
commit 6f60750c31
2 changed files with 87 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java
View File

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.plugins.combatlevel; package net.runelite.client.plugins.combatlevel;
import com.google.common.annotations.VisibleForTesting;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Experience; import net.runelite.api.Experience;
import net.runelite.api.Skill; import net.runelite.api.Skill;
@@ -81,7 +82,8 @@ class CombatLevelOverlay extends Overlay
return null; return null;
} }
private String getLevelsUntilTooltip() @VisibleForTesting
String getLevelsUntilTooltip()
{ {
// grab combat skills from player // grab combat skills from player
int attackLevel = client.getRealSkillLevel(Skill.ATTACK); int attackLevel = client.getRealSkillLevel(Skill.ATTACK);
@@ -108,23 +110,23 @@ class CombatLevelOverlay extends Overlay
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(ColorUtil.wrapWithColorTag("Next combat level:</br>", COMBAT_LEVEL_COLOUR)); sb.append(ColorUtil.wrapWithColorTag("Next combat level:</br>", COMBAT_LEVEL_COLOUR));
if ((attackLevel + strengthLevel + meleeNeed) <= Experience.MAX_REAL_LEVEL * 2) if ((attackLevel + strengthLevel) < Experience.MAX_REAL_LEVEL * 2)
{ {
sb.append(meleeNeed).append(" Attack/Strength</br>"); sb.append(meleeNeed).append(" Attack/Strength</br>");
} }
if ((hitpointsLevel + defenceLevel + hpDefNeed) <= Experience.MAX_REAL_LEVEL * 2) if ((hitpointsLevel + defenceLevel) < Experience.MAX_REAL_LEVEL * 2)
{ {
sb.append(hpDefNeed).append(" Defence/Hitpoints</br>"); sb.append(hpDefNeed).append(" Defence/Hitpoints</br>");
} }
if ((rangeLevel + rangeNeed) <= Experience.MAX_REAL_LEVEL) if (rangeLevel < Experience.MAX_REAL_LEVEL)
{ {
sb.append(rangeNeed).append(" Ranged</br>"); sb.append(rangeNeed).append(" Ranged</br>");
} }
if ((magicLevel + magicNeed) <= Experience.MAX_REAL_LEVEL) if (magicLevel < Experience.MAX_REAL_LEVEL)
{ {
sb.append(magicNeed).append(" Magic</br>"); sb.append(magicNeed).append(" Magic</br>");
} }
if ((prayerLevel + prayerNeed) <= Experience.MAX_REAL_LEVEL) if (prayerLevel < Experience.MAX_REAL_LEVEL)
{ {
sb.append(prayerNeed).append(" Prayer"); sb.append(prayerNeed).append(" Prayer");
} }

79
runelite-client/src/test/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlayTest.java Normal file
View File

@@ -0,0 +1,79 @@
/*
* Copyright (c) 2020, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.combatlevel;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.testing.fieldbinder.Bind;
import com.google.inject.testing.fieldbinder.BoundFieldModule;
import net.runelite.api.Client;
import net.runelite.api.Skill;
import net.runelite.client.ui.overlay.tooltip.TooltipManager;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import static org.mockito.Mockito.when;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class CombatLevelOverlayTest
{
@Mock
@Bind
private Client client;
@Mock
@Bind
private CombatLevelConfig combatLevelConfig;
@Mock
@Bind
private TooltipManager tooltipManager;
@Inject
private CombatLevelOverlay combatLevelOverlay;
@Before
public void before()
{
Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
}
@Test
public void testGetLevelsUntilTooltip()
{
when(client.getRealSkillLevel(Skill.ATTACK)).thenReturn(99);
when(client.getRealSkillLevel(Skill.STRENGTH)).thenReturn(99);
when(client.getRealSkillLevel(Skill.DEFENCE)).thenReturn(97);
when(client.getRealSkillLevel(Skill.HITPOINTS)).thenReturn(99);
when(client.getRealSkillLevel(Skill.MAGIC)).thenReturn(99);
when(client.getRealSkillLevel(Skill.RANGED)).thenReturn(99);
when(client.getRealSkillLevel(Skill.PRAYER)).thenReturn(94);
assertEquals("<col=ff981f>Next combat level:</br></col>4 Defence/Hitpoints</br>8 Prayer", combatLevelOverlay.getLevelsUntilTooltip());
}
}