diff --git a/src/main/scala/backend/Pokemon/Pokemon.scala b/src/main/scala/backend/Pokemon/Pokemon.scala index 8f2c2350a1140b57109164180424203202b5935e..8490be29abdfe0d0a2d19ec16fc5c9fee6ff839e 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))