diff --git a/Emne 3/PokemonMarie/PokemonMarie/Pokemon.cs b/Emne 3/PokemonMarie/PokemonMarie/Pokemon.cs index e855ffc..b8dc1c1 100644 --- a/Emne 3/PokemonMarie/PokemonMarie/Pokemon.cs +++ b/Emne 3/PokemonMarie/PokemonMarie/Pokemon.cs @@ -8,13 +8,10 @@ internal class Pokemon public int Health { get; private set; } public int Strength { get; private set; } - public Pokemon(int level, string name, string type, int health, int strength) + public Pokemon(string name, string type) { - Level = level; Name = name; Type = type; - Health = health; - Strength = strength; } public void Fight(Pokemon opponent) diff --git a/Emne 3/PokemonMarie/PokemonMarie/PokemonWorld.cs b/Emne 3/PokemonMarie/PokemonMarie/PokemonWorld.cs index 0bf8ee0..40d5301 100644 --- a/Emne 3/PokemonMarie/PokemonMarie/PokemonWorld.cs +++ b/Emne 3/PokemonMarie/PokemonMarie/PokemonWorld.cs @@ -10,15 +10,15 @@ internal class PokemonWorld public PokemonWorld() { - MyTrainer = new Trainer(this, , , "Ash"); + MyTrainer = new Trainer( "Ash", this); WildPokemons = new List() { - new Pokemon(11,"Lucario", "Grass",100,100), - new Pokemon(12,"Bulbasaur", "Grass",100,100), - new Pokemon(13,"Gyarados", "Water",100,100), - new Pokemon(14,"Oshawott", "Water",100,100), - new Pokemon(15,"Grimer", "Mud",100,100), - new Pokemon(16,"Diglett", "Mud",100,100), + new Pokemon("Lucario", "Grass"), + new Pokemon("Bulbasaur", "Grass"), + new Pokemon("Gyarados", "Water"), + new Pokemon("Oshawott", "Water"), + new Pokemon("Grimer", "Mud"), + new Pokemon("Diglett", "Mud"), }; Menu(); } diff --git a/Emne 3/PokemonMarie/PokemonMarie/Trainer.cs b/Emne 3/PokemonMarie/PokemonMarie/Trainer.cs index 54b0c99..7f64f10 100644 --- a/Emne 3/PokemonMarie/PokemonMarie/Trainer.cs +++ b/Emne 3/PokemonMarie/PokemonMarie/Trainer.cs @@ -7,11 +7,11 @@ internal class Trainer public Pokemon StartPokemon { get; private set; } public string Name { get; private set; } - public Trainer(PokemonWorld myWorld, List inventory, Pokemon startPokemon, string name) + public Trainer(string name, PokemonWorld myWorld) { MyWorld = myWorld; Inventory = new List(); - StartPokemon = new Pokemon(11,"Pikachu", "Lightning",100,100); + StartPokemon = new Pokemon("Pikachu", "Lightning"); Name = name; }