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

Merge pull request #14497 from wayne-li2/clue-hot-code-delete-leagues

Browse Source
This commit is contained in:
Jordan
2021-12-22 05:31:50 +00:00
committed by GitHub
parent ae5614ce6a 6901adc2ff
commit cc3ba2d633
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,10 +66,6 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
"Jorral", "Jorral",
"Speak to Jorral to receive a strange device.", "Speak to Jorral to receive a strange device.",
new WorldPoint(2436, 3347, 0)); new WorldPoint(2436, 3347, 0));
private static final HotColdClue MASTER_CLUE_LEAGUE = new HotColdClue("Buried beneath the ground, who knows where it's found. Lucky for you, A man called Watson may have a clue.",
"Watson",
"Speak to Watson to receive a strange device.",
new WorldPoint(1645, 3572, 0));
private final String text; private final String text;
private final String npc; private final String npc;
@@ -91,11 +87,6 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
MASTER_CLUE.reset(); MASTER_CLUE.reset();
return MASTER_CLUE; return MASTER_CLUE;
} }
else if (MASTER_CLUE_LEAGUE.text.equalsIgnoreCase(text))
{
MASTER_CLUE_LEAGUE.reset();
return MASTER_CLUE_LEAGUE;
}
return null; return null;
} }
@@ -290,7 +281,7 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
{ {
temperatureSet = HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES; temperatureSet = HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES;
} }
else if (this == MASTER_CLUE || this == MASTER_CLUE_LEAGUE) else if (this == MASTER_CLUE)
{ {
temperatureSet = HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES; temperatureSet = HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES;
} }
@@ -314,9 +305,8 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
return false; return false;
} }
boolean master = this == MASTER_CLUE || this == MASTER_CLUE_LEAGUE;
if ((this == BEGINNER_CLUE && temperature == HotColdTemperature.BEGINNER_VISIBLY_SHAKING) if ((this == BEGINNER_CLUE && temperature == HotColdTemperature.BEGINNER_VISIBLY_SHAKING)
|| (master && temperature == HotColdTemperature.MASTER_VISIBLY_SHAKING)) || (this == MASTER_CLUE && temperature == HotColdTemperature.MASTER_VISIBLY_SHAKING))
{ {
markFinalSpot(localWorld); markFinalSpot(localWorld);
} }
@@ -346,7 +336,7 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
{ {
isBeginner = true; isBeginner = true;
} }
else if (this == MASTER_CLUE || this == MASTER_CLUE_LEAGUE) else if (this == MASTER_CLUE)
{ {
isBeginner = false; isBeginner = false;
} }