From 8dd0c3c82bee8249d5b42aa32c9640695f8284c6 Mon Sep 17 00:00:00 2001 From: aqys <51910@edu.sde.dk> Date: Wed, 25 Mar 2026 08:57:00 +0100 Subject: [PATCH] Refactored --- PeopleVille/Equipment/Food.cs | 4 ++-- PeopleVille/Equipment/Gun.cs | 4 ++-- PeopleVille/Equipment/IEquipment.cs | 5 ++++- PeopleVille/Person/AdultCitizen.cs | 2 +- PeopleVille/Person/ChildCitizen.cs | 2 +- PeopleVille/Person/Person.cs | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/PeopleVille/Equipment/Food.cs b/PeopleVille/Equipment/Food.cs index c4c9d2c..898a139 100644 --- a/PeopleVille/Equipment/Food.cs +++ b/PeopleVille/Equipment/Food.cs @@ -1,4 +1,4 @@ -using PeopleVille.Person; +using PeopleVille.Persons; namespace PeopleVille.Equipment { @@ -17,7 +17,7 @@ namespace PeopleVille.Equipment Console.WriteLine(""); } - public void Consume(Person.Person person) + public void Use(Person person) { person.Health += HealthPoints; Console.WriteLine($""); diff --git a/PeopleVille/Equipment/Gun.cs b/PeopleVille/Equipment/Gun.cs index 269105a..a7f3470 100644 --- a/PeopleVille/Equipment/Gun.cs +++ b/PeopleVille/Equipment/Gun.cs @@ -1,4 +1,4 @@ -using PeopleVille.Person; +using PeopleVille.Persons; namespace PeopleVille.Equipment { @@ -17,7 +17,7 @@ namespace PeopleVille.Equipment Console.WriteLine(""); } - public void Shoot(Person.Person target) + public void Use(Person target) { target.Health -= this.Damage; Console.WriteLine($""); diff --git a/PeopleVille/Equipment/IEquipment.cs b/PeopleVille/Equipment/IEquipment.cs index 8c16c8e..9fad71a 100644 --- a/PeopleVille/Equipment/IEquipment.cs +++ b/PeopleVille/Equipment/IEquipment.cs @@ -1,8 +1,11 @@ -namespace PeopleVille.Equipment +using PeopleVille.Persons; + +namespace PeopleVille.Equipment { interface IEquipment { public void Equip(); public void Unequip(); + public void Use(Person person); } } \ No newline at end of file diff --git a/PeopleVille/Person/AdultCitizen.cs b/PeopleVille/Person/AdultCitizen.cs index 30646c5..f65048f 100644 --- a/PeopleVille/Person/AdultCitizen.cs +++ b/PeopleVille/Person/AdultCitizen.cs @@ -1,4 +1,4 @@ -namespace PeopleVille.Person +namespace PeopleVille.Persons { public class AdultCitizen : Person { diff --git a/PeopleVille/Person/ChildCitizen.cs b/PeopleVille/Person/ChildCitizen.cs index d075302..21f41f9 100644 --- a/PeopleVille/Person/ChildCitizen.cs +++ b/PeopleVille/Person/ChildCitizen.cs @@ -1,4 +1,4 @@ -namespace PeopleVille.Person +namespace PeopleVille.Persons { public class ChildCitizen : Person { diff --git a/PeopleVille/Person/Person.cs b/PeopleVille/Person/Person.cs index a488d23..b364bdb 100644 --- a/PeopleVille/Person/Person.cs +++ b/PeopleVille/Person/Person.cs @@ -1,4 +1,4 @@ -namespace PeopleVille.Person +namespace PeopleVille.Persons { public abstract class Person {