From 22a3cc10c69d850d32c7af0562b0889bb7452b0a Mon Sep 17 00:00:00 2001
From: PhenixCeleste <vivien.d06@gmail.com>
Date: Mon, 14 Feb 2022 11:08:08 +0100
Subject: [PATCH] .contains added
---
src/main/scala/backend/Pokemon/Pokemon.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/scala/backend/Pokemon/Pokemon.scala b/src/main/scala/backend/Pokemon/Pokemon.scala
index 8f2c235..8490be2 100644
--- a/src/main/scala/backend/Pokemon/Pokemon.scala
+++ b/src/main/scala/backend/Pokemon/Pokemon.scala
@@ -30,7 +30,7 @@ trait Pokemon( // TODO: must add later max_life...
(((2.0 * (this.level) / 5.0) * (capacity.power) * (this.attack)
/ (other.defense)) / 50.0 + 2.0)
* (scala.util.Random.between(0.85, 1.0)) * multiplier
- * (if this.ptype.foldLeft(false)(_ || _ == capacity.ctype) then 1.5 else 1.0)
+ * (if this.ptype.contains(capacity.ctype) then 1.5 else 1.0)
other.decreaseLife(Math.round(damage.toFloat))
--
GitLab