From 0836dbf7948c03a50a5247465b1e762d8e307c93 Mon Sep 17 00:00:00 2001 From: tom-overton Date: Mon, 11 Jul 2022 02:03:09 -0700 Subject: Add some anti-synergy to Leech Seed and Perish Song --- src/com/sneed/pkrandom/pokemon/MoveSynergy.java | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'src/com/sneed') diff --git a/src/com/sneed/pkrandom/pokemon/MoveSynergy.java b/src/com/sneed/pkrandom/pokemon/MoveSynergy.java index c612679..0d1c412 100644 --- a/src/com/sneed/pkrandom/pokemon/MoveSynergy.java +++ b/src/com/sneed/pkrandom/pokemon/MoveSynergy.java @@ -947,8 +947,6 @@ public class MoveSynergy { synergisticMoves.add(Moves.swallow); break; case Moves.spitUp: - synergisticMoves.add(Moves.stockpile); - break; case Moves.swallow: synergisticMoves.add(Moves.stockpile); break; @@ -979,6 +977,8 @@ public class MoveSynergy { .collect(Collectors.toList())); break; case Moves.focusPunch: + case Moves.dreamEater: + case Moves.nightmare: synergisticMoves.addAll(moveList .stream() .filter(mv -> mv.statusMoveType == StatusMoveType.NO_DAMAGE && @@ -1001,15 +1001,6 @@ public class MoveSynergy { .collect(Collectors.toList())); synergisticMoves.add(Moves.banefulBunker); break; - case Moves.dreamEater: - case Moves.nightmare: - synergisticMoves.addAll(moveList - .stream() - .filter(mv -> mv.statusMoveType == StatusMoveType.NO_DAMAGE && - mv.statusType == StatusType.SLEEP) - .map(mv -> mv.number) - .collect(Collectors.toList())); - break; case Moves.storedPower: synergisticMoves.addAll(moveList .stream() @@ -1126,6 +1117,13 @@ public class MoveSynergy { case Moves.frustration: antiSynergisticMoves.add(Moves.returnTheMoveNotTheKeyword); break; + case Moves.leechSeed: + case Moves.perishSong: + antiSynergisticMoves.add(Moves.whirlwind); + antiSynergisticMoves.add(Moves.roar); + antiSynergisticMoves.add(Moves.circleThrow); + antiSynergisticMoves.add(Moves.dragonTail); + break; } if (mv1.type != null) { -- cgit v1.2.3