diff --git a/src/main/scala/backend/Pokemon/7 b/src/main/scala/backend/Pokemon/7 deleted file mode 100644 index 9f3656a7c437f265b6caa4f4f06429466f13fa31..0000000000000000000000000000000000000000 --- a/src/main/scala/backend/Pokemon/7 +++ /dev/null @@ -1,26 +0,0 @@ -object PokemonFactory: - - private case class Bulbasaur() - extends Pokemon( - "Bulbasaur", - 11, - List(Grass, Poison), - List(apply("Absorb"), apply("Vine Whip"), apply("Constrict"), apply("Bubble")), - 49, - 49, - 45, - 45, - 1 - ) - private case class Charmander() - extends Pokemon( - "Charmander", - 12, List(Fire), - List(apply("Bubble"), apply("Bubble Beam"), apply("Rock Throw"), apply("Absorb")), - 52, 43, 65, 39, 1) - private case class Squirtle() extends Pokemon("Squirtle", 11, List(Water), List(), 48, 65, 43, 44, 1) - - def apply(name: String): Pokemon = name match - case "Bulbasaur" => Bulbasaur() - case "Charmander" => Charmander() - case "Squirtle" => Squirtle() diff --git a/src/main/scala/backend/Pokemon/Capacity.scala b/src/main/scala/backend/Pokemon/Capacity.scala index e574f01ca82b62242ffaac1af9ca704eeead3a33..b47e207fea6e4e7a2f4f23c8f8fcb74af6ec4e1e 100644 --- a/src/main/scala/backend/Pokemon/Capacity.scala +++ b/src/main/scala/backend/Pokemon/Capacity.scala @@ -3,8 +3,5 @@ class Capacity(val name: String, val ctype: Type, val maxUses: Int, private var // getter def usesLeft: Int = this._usesLeft - // setter - def usesLeft_=(uses: Int) = this._usesLeft = uses - def use() = - this._usesLeft = this.usesLeft - 1 + this._usesLeft = this._usesLeft - 1