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

Merge pull request #10234 from Trevor159/raids-fix

Browse Source 
raids plugin: fix rotation solver
This commit is contained in:
Adam
2019-11-13 13:52:07 -05:00
committed by GitHub
parent 30fcd76d4a e3edc16f86
commit 2ab9877f1d
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,6 +98,25 @@ public class Raid
return combatRooms.toArray(new RaidRoom[0]);
}
void setCombatRooms(RaidRoom[] combatRooms)
{
int index = 0;
for (Room room : layout.getRooms())
{
if (room == null)
{
continue;
}
if (rooms[room.getPosition()].getType() == RoomType.COMBAT)
{
rooms[room.getPosition()] = combatRooms[index];
index++;
}
}
}
public String toCode()
{
StringBuilder builder = new StringBuilder();

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

@@ -320,7 +320,9 @@ public class RaidsPlugin extends Plugin
}
raid.updateLayout(layout);
RotationSolver.solve(raid.getCombatRooms());
RaidRoom[] rooms = raid.getCombatRooms();
RotationSolver.solve(rooms);
raid.setCombatRooms(rooms);
overlay.setScoutOverlayShown(true);
if (config.layoutMessage())

8
runelite-client/src/test/java/net/runelite/client/plugins/raids/RotationSolverTest.java
View File

@@ -69,4 +69,12 @@ public class RotationSolverTest
RotationSolver.solve(rooms);
assertArrayEquals(new RaidRoom[]{VASA, SHAMANS, VESPULA, GUARDIANS}, rooms);
}
@Test
public void testSolve5()
{
RaidRoom[] rooms = new RaidRoom[]{GUARDIANS, UNKNOWN_COMBAT, SHAMANS, VASA};
RotationSolver.solve(rooms);
assertArrayEquals(new RaidRoom[]{GUARDIANS, VESPULA, SHAMANS, VASA}, rooms);
}
}