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

Merge pull request #9256 from Nightfirecat/hot-cold-fixes

Browse Source 
Hot cold fixes
This commit is contained in:
Adam
2019-07-02 20:48:32 -04:00
committed by GitHub
parent 6d51862668 2c13816ca9
commit ff5d0432c8
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java
View File

@@ -296,17 +296,18 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
else else
{ {
location = null; location = null;
final HotColdTemperatureChange temperatureChange = HotColdTemperatureChange.of(message);
hotColdSolver.signal(localWorld, temperature, temperatureChange);
} }
final HotColdTemperatureChange temperatureChange = HotColdTemperatureChange.of(message);
hotColdSolver.signal(localWorld, temperature, temperatureChange);
return true; return true;
} }
@Override @Override
public void reset() public void reset()
{ {
location = null;
initializeSolver(); initializeSolver();
} }
@@ -339,7 +340,6 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
private void markFinalSpot(WorldPoint wp) private void markFinalSpot(WorldPoint wp)
{ {
this.location = wp; this.location = wp;
reset();
} }
public String[] getNpcs() public String[] getNpcs()

4
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java
View File

@@ -32,6 +32,7 @@ import java.util.Set;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import net.runelite.client.util.Text;
@AllArgsConstructor @AllArgsConstructor
@Getter @Getter
@@ -93,11 +94,12 @@ public enum HotColdTemperature
return null; return null;
} }
final String messageStart = Text.fromCSV(message).get(0);
final List<HotColdTemperature> possibleTemperatures = new ArrayList<>(); final List<HotColdTemperature> possibleTemperatures = new ArrayList<>();
for (final HotColdTemperature temperature : temperatureSet) for (final HotColdTemperature temperature : temperatureSet)
{ {
if (message.contains(temperature.getText())) if (messageStart.contains(temperature.getText()))
{ {
possibleTemperatures.add(temperature); possibleTemperatures.add(temperature);
} }

2
runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java
View File

@@ -73,5 +73,7 @@ public class HotColdTemperatureTest
assertEquals(HotColdTemperature.ICE_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is ice cold.")); assertEquals(HotColdTemperature.ICE_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is ice cold."));
assertEquals(HotColdTemperature.VERY_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very cold.")); assertEquals(HotColdTemperature.VERY_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very cold."));
assertEquals(HotColdTemperature.VERY_HOT, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very hot.")); assertEquals(HotColdTemperature.VERY_HOT, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very hot."));
assertEquals(HotColdTemperature.COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, "The device is cold, and warmer than last time."));
assertEquals(HotColdTemperature.WARM, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, "The device is warm, but colder than last time."));
} }
} }