diff --git a/src/main/scala/backend/Pokemon/Capacity.scala b/src/main/scala/backend/Pokemon/Capacity.scala index a5855a7299c71a8d28d7203d02f2b183b6781f1d..e574f01ca82b62242ffaac1af9ca704eeead3a33 100644 --- a/src/main/scala/backend/Pokemon/Capacity.scala +++ b/src/main/scala/backend/Pokemon/Capacity.scala @@ -6,5 +6,5 @@ class Capacity(val name: String, val ctype: Type, val maxUses: Int, private var // setter def usesLeft_=(uses: Int) = this._usesLeft = uses - def useCapacity() = + def use() = this._usesLeft = this.usesLeft - 1 diff --git a/src/main/scala/backend/Pokemon/Pokemon.scala b/src/main/scala/backend/Pokemon/Pokemon.scala index fe6deaee5ab05e0e7d214dfa2b38f9f0985257c1..3ad6630eccc144bb02a5aa7140deae41736e41df 100644 --- a/src/main/scala/backend/Pokemon/Pokemon.scala +++ b/src/main/scala/backend/Pokemon/Pokemon.scala @@ -24,6 +24,9 @@ trait Pokemon( def maxLife: Int = scala.math.floor(2.0 * this.baseSpeed * this.level / 100.0).toInt + 10 + this.level def useCapacity(capacity: Capacity, other: Pokemon) = + + capacity.use() + val multiplier = other.ptype.foldLeft(1.0)(_ * capacity.ctype.typeEfficiency(_).factor) val damage =