diff --git a/Cards.kt b/Cards.kt index 41f1526..4c7f846 100644 --- a/Cards.kt +++ b/Cards.kt @@ -6,8 +6,6 @@ abstract class AggressiveCard: Card { owner.enemy.effectBuffer = this.effects owner.enemy.attackingCard = this owner.enemy.effectBuffer.forEach { it.apply() } - owner.enemy.effectBuffer = emptyArray() - owner.enemy.attackingCard = null } override fun toString(): String { @@ -21,6 +19,8 @@ abstract class DefensiveCard: Card { if(owner.effectBuffer.isEmpty()) { throw NotInPassiveContextException() } + println("attacking: ${owner.attackingCard}") + println("${owner.enemy.attackingCard}") println(activeString) this.effects.forEach { it.apply() } } @@ -82,8 +82,8 @@ class SurpriceCard(override val owner: Character): AggressiveCard() { class AwareCard(override val owner: Character): DefensiveCard() { override val name = "洞悉" override val id = 7 - override val effects: Array = arrayOf(Defense(owner), DrawFromDeck(owner, numberOfCards = 2)) - override val activeString = "$owner 洞悉了 ${owner.enemy} 的 ${owner.attackingCard},並抽取2張手牌" + override val effects: Array = arrayOf(DrawFromDeck(owner, numberOfCards = 2), Defense(owner)) + override val activeString = "$owner 洞悉了 ${owner.enemy} 的攻擊,並抽取2張手牌" } class PlanCard(override val owner: Character): GeneralCard() { override val name = "妙策"