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

Merge pull request #8696 from Trevor159/daily-fix

Browse Source 
daily tasks plugin: tidy up if statements and make less config options on by default
This commit is contained in:
Tomas Slusny
2019-05-03 16:37:52 +02:00
committed by GitHub
parent 63a65dd893 09125b12e1
commit b0906d40ec
2 changed files with 34 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksConfig.java
View File

@@ -63,7 +63,7 @@ public interface DailyTasksConfig extends Config
) )
default boolean showEssence() default boolean showEssence()
{ {
return true; return false;
} }
@ConfigItem( @ConfigItem(
@@ -74,7 +74,7 @@ public interface DailyTasksConfig extends Config
) )
default boolean showRunes() default boolean showRunes()
{ {
return true; return false;
} }
@ConfigItem( @ConfigItem(
@@ -85,7 +85,7 @@ public interface DailyTasksConfig extends Config
) )
default boolean showSand() default boolean showSand()
{ {
return true; return false;
} }
@ConfigItem( @ConfigItem(
@@ -96,7 +96,7 @@ public interface DailyTasksConfig extends Config
) )
default boolean showFlax() default boolean showFlax()
{ {
return true; return false;
} }
@ConfigItem( @ConfigItem(
@@ -107,7 +107,7 @@ public interface DailyTasksConfig extends Config
) )
default boolean showBonemeal() default boolean showBonemeal()
{ {
return true; return false;
} }
@ConfigItem( @ConfigItem(

97
runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java
View File

@@ -166,91 +166,61 @@ public class DailyTasksPlugin extends Plugin
private void checkHerbBoxes(boolean dailyReset) private void checkHerbBoxes(boolean dailyReset)
{ {
if (client.getAccountType() == AccountType.NORMAL if (client.getAccountType() == AccountType.NORMAL
&& client.getVar(VarPlayer.NMZ_REWARD_POINTS) >= HERB_BOX_COST) && client.getVar(VarPlayer.NMZ_REWARD_POINTS) >= HERB_BOX_COST
&& (client.getVar(Varbits.DAILY_HERB_BOXES_COLLECTED) < HERB_BOX_MAX
|| dailyReset))
{ {
if (client.getVar(Varbits.DAILY_HERB_BOXES_COLLECTED) < HERB_BOX_MAX) sendChatMessage(HERB_BOX_MESSAGE);
{
sendChatMessage(HERB_BOX_MESSAGE);
}
else if (dailyReset)
{
sendChatMessage(HERB_BOX_MESSAGE);
}
} }
} }
private void checkStaves(boolean dailyReset) private void checkStaves(boolean dailyReset)
{ {
if (client.getVar(Varbits.DIARY_VARROCK_EASY) == 1) if (client.getVar(Varbits.DIARY_VARROCK_EASY) == 1
&& (client.getVar(Varbits.DAILY_STAVES_COLLECTED) == 0
|| dailyReset))
{ {
if (client.getVar(Varbits.DAILY_STAVES_COLLECTED) == 0) sendChatMessage(STAVES_MESSAGE);
{
sendChatMessage(STAVES_MESSAGE);
}
else if (dailyReset)
{
sendChatMessage(STAVES_MESSAGE + RELOG_MESSAGE);
}
} }
} }
private void checkEssence(boolean dailyReset) private void checkEssence(boolean dailyReset)
{ {
if (client.getVar(Varbits.DIARY_ARDOUGNE_MEDIUM) == 1) if (client.getVar(Varbits.DIARY_ARDOUGNE_MEDIUM) == 1
&& (client.getVar(Varbits.DAILY_ESSENCE_COLLECTED) == 0
|| dailyReset))
{ {
if (client.getVar(Varbits.DAILY_ESSENCE_COLLECTED) == 0) sendChatMessage(ESSENCE_MESSAGE);
{
sendChatMessage(ESSENCE_MESSAGE);
}
else if (dailyReset)
{
sendChatMessage(ESSENCE_MESSAGE);
}
} }
} }
private void checkRunes(boolean dailyReset) private void checkRunes(boolean dailyReset)
{ {
if (client.getVar(Varbits.DIARY_WILDERNESS_EASY) == 1) if (client.getVar(Varbits.DIARY_WILDERNESS_EASY) == 1
&& (client.getVar(Varbits.DAILY_RUNES_COLLECTED) == 0)
|| dailyReset)
{ {
if (client.getVar(Varbits.DAILY_RUNES_COLLECTED) == 0) sendChatMessage(RUNES_MESSAGE);
{
sendChatMessage(RUNES_MESSAGE);
}
else if (dailyReset)
{
sendChatMessage(RUNES_MESSAGE);
}
} }
} }
private void checkSand(boolean dailyReset) private void checkSand(boolean dailyReset)
{ {
if (client.getVar(Varbits.QUEST_THE_HAND_IN_THE_SAND) >= SAND_QUEST_COMPLETE) if (client.getVar(Varbits.QUEST_THE_HAND_IN_THE_SAND) >= SAND_QUEST_COMPLETE
&& (client.getVar(Varbits.DAILY_SAND_COLLECTED) == 0
|| dailyReset))
{ {
if (client.getVar(Varbits.DAILY_SAND_COLLECTED) == 0) sendChatMessage(SAND_MESSAGE);
{
sendChatMessage(SAND_MESSAGE);
}
else if (dailyReset)
{
sendChatMessage(SAND_MESSAGE);
}
} }
} }
private void checkFlax(boolean dailyReset) private void checkFlax(boolean dailyReset)
{ {
if (client.getVar(Varbits.DIARY_KANDARIN_EASY) == 1) if (client.getVar(Varbits.DIARY_KANDARIN_EASY) == 1
&& (client.getVar(Varbits.DAILY_FLAX_STATE) == 0
|| dailyReset))
{ {
if (client.getVar(Varbits.DAILY_FLAX_STATE) == 0) sendChatMessage(FLAX_MESSAGE);
{
sendChatMessage(FLAX_MESSAGE);
}
else if (dailyReset)
{
sendChatMessage(FLAX_MESSAGE);
}
} }
} }
@@ -268,11 +238,7 @@ public class DailyTasksPlugin extends Plugin
max += BONEMEAL_PER_DIARY; max += BONEMEAL_PER_DIARY;
} }
} }
if (collected < max) if (collected < max || dailyReset)
{
sendChatMessage(BONEMEAL_MESSAGE);
}
else if (dailyReset)
{ {
sendChatMessage(BONEMEAL_MESSAGE); sendChatMessage(BONEMEAL_MESSAGE);
} }
@@ -281,16 +247,11 @@ public class DailyTasksPlugin extends Plugin
private void checkDynamite(boolean dailyReset) private void checkDynamite(boolean dailyReset)
{ {
if (client.getVar(Varbits.DIARY_KOUREND_MEDIUM) == 1) if (client.getVar(Varbits.DIARY_KOUREND_MEDIUM) == 1
&& (client.getVar(Varbits.DAILY_DYNAMITE_COLLECTED) == 0
|| dailyReset))
{ {
if (client.getVar(Varbits.DAILY_DYNAMITE_COLLECTED) == 0) sendChatMessage(DYNAMITE_MESSAGE);
{
sendChatMessage(DYNAMITE_MESSAGE);
}
else if (dailyReset)
{
sendChatMessage(DYNAMITE_MESSAGE);
}
} }
} }