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

Add toRoomString and toCodeString Raid utilities

Browse Source 
Add new util methods that will build room and code string from current
raid layout.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2019-01-06 00:23:32 +01:00
parent 93e4d13c31
commit 1c88c93425
3 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java
View File

@@ -134,4 +134,49 @@ public class Raid
return builder.toString();
}
public String toRoomString()
{
final StringBuilder sb = new StringBuilder();
for (Room r : getLayout().getRooms())
{
final int position = r.getPosition();
final RaidRoom room = getRoom(position);
if (room == null || !(room.getType() == RaidRoom.Type.COMBAT || room.getType() == RaidRoom.Type.PUZZLE))
{
continue;
}
switch (room.getType())
{
case PUZZLE:
final RaidRoom.Puzzle puzzle = room.getPuzzle();
sb.append(puzzle.getName());
if (puzzle == RaidRoom.Puzzle.UNKNOWN)
{
sb.append(" (puzzle)");
}
sb.append(", ");
break;
case COMBAT:
final RaidRoom.Boss boss = room.getBoss();
sb.append(boss.getName());
if (boss == RaidRoom.Boss.UNKNOWN)
{
sb.append(" (combat)");
}
sb.append(", ");
break;
}
}
final String roomsString = sb.toString();
return roomsString.substring(0, roomsString.length() - 2);
}
}

2
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
View File

@@ -86,7 +86,7 @@ public class RaidsOverlay extends Overlay
}
Color color = Color.WHITE;
String layout = plugin.getRaid().getLayout().toCode().replaceAll("#", "").replaceAll("¤", "");
String layout = plugin.getRaid().getLayout().toCodeString();
if (config.enableLayoutWhitelist() && !plugin.getLayoutWhitelist().contains(layout.toLowerCase()))
{

5
runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Layout.java
View File

@@ -62,4 +62,9 @@ public class Layout
return builder.toString();
}
public String toCodeString()
{
return toCode().replaceAll("#", "").replaceAll("¤", "");
}
}