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

Add setting to preserve scouter in raid

Browse Source 
See #1871

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-07-19 21:24:14 +02:00
parent 2d4c895e5e
commit f7d0bf4ace
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java
View File

@@ -77,6 +77,17 @@ public interface RaidsConfig extends Config
@ConfigItem( @ConfigItem(
position = 4, position = 4,
keyName = "scoutOverlayInRaid",
name = "Show scout overlay inside raid",
description = "Keep the overlay active while inside raid"
)
default boolean scoutOverlayInRaid()
{
return false;
}
@ConfigItem(
position = 5,
keyName = "whitelistedRooms", keyName = "whitelistedRooms",
name = "Whitelisted rooms", name = "Whitelisted rooms",
description = "Display whitelisted rooms in green on the overlay. Separate with comma (full name)" description = "Display whitelisted rooms in green on the overlay. Separate with comma (full name)"
@@ -87,7 +98,7 @@ public interface RaidsConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 5, position = 6,
keyName = "blacklistedRooms", keyName = "blacklistedRooms",
name = "Blacklisted rooms", name = "Blacklisted rooms",
description = "Display blacklisted rooms in red on the overlay. Separate with comma (full name)" description = "Display blacklisted rooms in red on the overlay. Separate with comma (full name)"
@@ -98,7 +109,7 @@ public interface RaidsConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 6, position = 7,
keyName = "enableRotationWhitelist", keyName = "enableRotationWhitelist",
name = "Enable rotation whitelist", name = "Enable rotation whitelist",
description = "Enable the rotation whitelist" description = "Enable the rotation whitelist"
@@ -109,7 +120,7 @@ public interface RaidsConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 7, position = 8,
keyName = "whitelistedRotations", keyName = "whitelistedRotations",
name = "Whitelisted rotations", name = "Whitelisted rotations",
description = "Warn when boss rotation doesn't match a whitelisted one. Add rotations like [tekton, muttadile, guardians]" description = "Warn when boss rotation doesn't match a whitelisted one. Add rotations like [tekton, muttadile, guardians]"
@@ -120,7 +131,7 @@ public interface RaidsConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 8, position = 9,
keyName = "enableLayoutWhitelist", keyName = "enableLayoutWhitelist",
name = "Enable layout whitelist", name = "Enable layout whitelist",
description = "Enable the layout whitelist" description = "Enable the layout whitelist"
@@ -131,7 +142,7 @@ public interface RaidsConfig extends Config
} }
@ConfigItem( @ConfigItem(
position = 9, position = 10,
keyName = "whitelistedLayouts", keyName = "whitelistedLayouts",
name = "Whitelisted layouts", name = "Whitelisted layouts",
description = "Warn when layout doesn't match a whitelisted one. Add layouts like CFSCPPCSCF separated with comma" description = "Warn when layout doesn't match a whitelisted one. Add layouts like CFSCPPCSCF separated with comma"

3
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
View File

@@ -305,7 +305,8 @@ public class RaidsPlugin extends Plugin
} }
} }
if (client.getVar(VarPlayer.IN_RAID_PARTY) == -1) // If we left party raid was started or we left raid
if (client.getVar(VarPlayer.IN_RAID_PARTY) == -1 && (!inRaidChambers || !config.scoutOverlayInRaid()))
{ {
overlay.setScoutOverlayShown(false); overlay.setScoutOverlayShown(false);
} }