From 6a170e65f717484b51a0167a8bf583559d359a35 Mon Sep 17 00:00:00 2001
From: PhenixCeleste <vivien.d06@gmail.com>
Date: Mon, 14 Feb 2022 15:34:28 +0100
Subject: [PATCH] capacity use added when pokemon attack
---
src/main/scala/backend/Pokemon/Capacity.scala | 2 +-
src/main/scala/backend/Pokemon/Pokemon.scala | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/scala/backend/Pokemon/Capacity.scala b/src/main/scala/backend/Pokemon/Capacity.scala
index a5855a7..e574f01 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 fe6deae..3ad6630 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 =
--
GitLab