Merge remote-tracking branch 'origin/master'

aps2019project · May 6, 2019 · 8047679 · 8047679
2 parents 66b6ce0 + 8e11ced
commit 8047679
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/models/Deck.java b/src/models/Deck.java
@@ -103,7 +103,6 @@ public boolean hasCard(int cardID) {
     }
 
     public boolean isValid() {
-
         return this.cards.size() == CARD_CAPACITY && this.getHero() != null;
     }
 

diff --git a/src/models/Initializer.java b/src/models/Initializer.java
@@ -210,7 +210,7 @@ private static void addMinions(ArrayList<Card> cards) {
                         .setTargetSociety(new OneUnit(TargetType.MINION, TargetTeam.FRIEND, TargetAttackType.ANY))
                         .addBuff(new Buff.BuffBuilder()
                                 .setDeltaHP(10)
-                                .setDuration(Buff.INFINITY)
+                                .setHalfTurnDuration()
                                 .create())
                         .create())
                 .setAttackType(new Ranged(3))