Making sure it uses Microsoft Code Convention

This commit is contained in:
2025-08-18 10:33:44 +02:00
parent 7b723f25f6
commit 16fc35e161
10 changed files with 36 additions and 36 deletions

View File

@@ -6,7 +6,7 @@ namespace OOP.Animals
{
public Elephant()
{
this.Name = this.GetType().Name;
Name = GetType().Name;
}
public override void MakeSound()

View File

@@ -4,7 +4,7 @@ namespace OOP.Animals
{
public Lion()
{
this.Name = this.GetType().Name;
Name = GetType().Name;
}
public override void MakeSound()

View File

@@ -4,7 +4,7 @@ namespace OOP.Animals
{
public Parrot()
{
this.Name = this.GetType().Name;
Name = GetType().Name;
}
public override void MakeSound()

View File

@@ -4,19 +4,19 @@ namespace OOP.Figures
{
public Circle(double radius)
{
this.radius = radius;
Radius = radius;
}
public double radius { get; set; }
public double Radius { get; set; }
public override double GetArea()
{
return Math.PI * Math.Pow(radius, 2);
return Math.PI * Math.Pow(Radius, 2);
}
public override double GetPerimeter()
{
return 2 * Math.PI * radius;
return 2 * Math.PI * Radius;
}
}
}

View File

@@ -4,21 +4,21 @@ namespace OOP.Figures
{
public Rectangle(double width, double height)
{
this.height = height;
this.width = width;
Height = height;
Width = width;
}
public double height { get; set; }
public double width { get; set; }
public double Height { get; set; }
public double Width { get; set; }
public override double GetArea()
{
return height * width;
return Height * Width;
}
public override double GetPerimeter()
{
return (height * 2) + (width * 2);
return (Height * 2) + (Width * 2);
}
}
}

View File

@@ -2,7 +2,7 @@ namespace OOP.Payment
{
public class PayPalPayment : GenericPayment
{
public string email { get; set; }
public string Email { get; set; }
public override void ProcessPayment()
{

View File

@@ -2,7 +2,7 @@ namespace OOP.Payment
{
public class GenericPayment
{
public int amount { get; set; }
public int Amount { get; set; }
public string Currency { get; set; }
public virtual void ProcessPayment()

View File

@@ -2,12 +2,12 @@ namespace OOP.RPG
{
public class Mage : Character
{
public Mage(int Mana)
public Mage(int mana)
{
this.Mana = Mana;
Mana = mana;
}
public int Mana = 10;
public int Mana { get; set; } = 10;
public override int Attack()
{

View File

@@ -4,36 +4,36 @@ namespace OOP.RPG
{
public Simulation(Character opponent1, Character opponent2)
{
this.opponent1 = opponent1;
this.opponent2 = opponent2;
Opponent1 = opponent1;
Opponent2 = opponent2;
}
public Character opponent1 { get; set; }
public Character opponent2 { get; set; }
public Character Opponent1 { get; set; }
public Character Opponent2 { get; set; }
public void StartSimulation()
{
while (!(opponent1.Health <= 0) && !(opponent2.Health <= 0))
while (!(Opponent1.Health <= 0) && !(Opponent2.Health <= 0))
{
// Attack opponent2
var attack1 = opponent1.Attack();
opponent2.Health -= attack1;
var attack1 = Opponent1.Attack();
Opponent2.Health -= attack1;
Console.WriteLine($"Opponent1 attacks Opponent2");
Console.WriteLine($"Opponent1 attacks with {attack1} and Opponent2 has {opponent2.Health} left");
Console.WriteLine($"Opponent1 attacks with {attack1} and Opponent2 has {Opponent2.Health} left");
var attack2 = opponent2.Attack();
opponent1.Health -= attack2;
var attack2 = Opponent2.Attack();
Opponent1.Health -= attack2;
Console.WriteLine($"Opponent2 attacks Opponent2");
Console.WriteLine($"Opponent2 attacks with {attack2} and Opponent1 has {opponent1.Health} left");
Console.WriteLine($"Opponent2 attacks with {attack2} and Opponent1 has {Opponent1.Health} left");
}
if (opponent1.Health <= 0)
if (Opponent1.Health <= 0)
{
Console.WriteLine("Opponent2 wins");
}
if (opponent2.Health <= 0)
if (Opponent2.Health <= 0)
{
Console.WriteLine("Opponent1 wins");
}

View File

@@ -4,16 +4,16 @@ namespace OOP.RPG
{
public Warrior(int strength)
{
this.strength = strength;
Strength = strength;
}
public int strength = 10;
public int Strength { get; set; } = 10;
public int multiplier = 2;
public int Multiplier { get; set; } = 2;
public override int Attack()
{
return base.Attack() * multiplier;
return base.Attack() * Multiplier;
}
}
}