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

Merge pull request #2292 from SoyChai/demonic-gorilla-style-tweaks

Browse Source 
Demonic gorilla plugin: Capitalise plugin name
This commit is contained in:
Tomas Slusny
2018-05-04 10:08:37 +02:00
committed by GitHub
parent be597c1abb 1a7d71def6
commit dd64309b31
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
View File

@@ -60,7 +60,7 @@ import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
@PluginDescriptor( @PluginDescriptor(
name = "Demonic gorillas" name = "Demonic Gorillas"
) )
@Slf4j @Slf4j
public class DemonicGorillaPlugin extends Plugin public class DemonicGorillaPlugin extends Plugin
@@ -142,7 +142,7 @@ public class DemonicGorillaPlugin extends Plugin
{ {
gorilla.setNextPosibleAttackStyles(Arrays gorilla.setNextPosibleAttackStyles(Arrays
.stream(DemonicGorilla.ALL_REGULAR_ATTACK_STYLES) .stream(DemonicGorilla.ALL_REGULAR_ATTACK_STYLES)
.filter(x -> !Arrays.stream(protectedStyles).anyMatch(y -> x == y)) .filter(x -> Arrays.stream(protectedStyles).noneMatch(y -> x == y))
.collect(Collectors.toList())); .collect(Collectors.toList()));
gorilla.setAttacksUntilSwitch(DemonicGorilla.ATTACKS_PER_SWITCH); gorilla.setAttacksUntilSwitch(DemonicGorilla.ATTACKS_PER_SWITCH);
gorilla.setChangedAttackStyleThisTick(true); gorilla.setChangedAttackStyleThisTick(true);
@@ -403,7 +403,7 @@ public class DemonicGorillaPlugin extends Plugin
// or other players // or other players
final WorldArea area1 = new WorldArea(x, 1, 1); final WorldArea area1 = new WorldArea(x, 1, 1);
return area1 != null && return area1 != null &&
!gorillas.values().stream().anyMatch(y -> gorillas.values().stream().noneMatch(y ->
{ {
if (y == gorilla) if (y == gorilla)
{ {
@@ -414,7 +414,7 @@ public class DemonicGorillaPlugin extends Plugin
y.getNpc().getWorldArea() : y.getLastWorldArea(); y.getNpc().getWorldArea() : y.getLastWorldArea();
return area2 != null && area1.intersectsWith(area2); return area2 != null && area1.intersectsWith(area2);
}) && }) &&
!memorizedPlayers.values().stream().anyMatch(y -> memorizedPlayers.values().stream().noneMatch(y ->
{ {
final WorldArea area2 = y.getLastWorldArea(); final WorldArea area2 = y.getLastWorldArea();
return area2 != null && area1.intersectsWith(area2); return area2 != null && area1.intersectsWith(area2);
@@ -455,7 +455,7 @@ public class DemonicGorillaPlugin extends Plugin
} }
else if (tickCounter >= gorilla.getNextAttackTick() && else if (tickCounter >= gorilla.getNextAttackTick() &&
gorilla.getRecentProjectileId() == -1 && gorilla.getRecentProjectileId() == -1 &&
!recentBoulders.stream().anyMatch(x -> x.distanceTo(mp.getLastWorldArea()) == 0)) recentBoulders.stream().noneMatch(x -> x.distanceTo(mp.getLastWorldArea()) == 0))
{ {
gorilla.setNextPosibleAttackStyles(gorilla gorilla.setNextPosibleAttackStyles(gorilla
.getNextPosibleAttackStyles() .getNextPosibleAttackStyles()