diff --git a/Server/Inventory/Interfaces/IDroppableItem.cs b/Server/Inventory/Interfaces/IDroppableItem.cs index b854ec5a..667e6b29 100644 --- a/Server/Inventory/Interfaces/IDroppableItem.cs +++ b/Server/Inventory/Interfaces/IDroppableItem.cs @@ -11,7 +11,7 @@ using System.Text; namespace reallife_gamemode.Server.Inventory.Interfaces { - public interface IDroppableItem + public interface IDroppableItem : IItem { void Drop(Client player); } diff --git a/Server/Inventory/Interfaces/IUsableItem.cs b/Server/Inventory/Interfaces/IUsableItem.cs index d89d5293..7256c46c 100644 --- a/Server/Inventory/Interfaces/IUsableItem.cs +++ b/Server/Inventory/Interfaces/IUsableItem.cs @@ -12,7 +12,7 @@ using System.Text; namespace reallife_gamemode.Server.Inventory.Interfaces { - public interface IUsableItem + public interface IUsableItem : IItem { void Use(UserItem uItem, Client player); } diff --git a/Server/Inventory/Items/Cheeseburger.cs b/Server/Inventory/Items/Cheeseburger.cs index d311b348..39162356 100644 --- a/Server/Inventory/Items/Cheeseburger.cs +++ b/Server/Inventory/Items/Cheeseburger.cs @@ -11,13 +11,13 @@ using System.Text; namespace reallife_gamemode.Server.Inventory.Items { - public class Cheeseburger : FoodItem, IItem + public class Cheeseburger : FoodItem { - public int Id => 2; - public string Name => "Cheeseburger"; - public string Description => "Wie der Hamburger, nur mit Käse."; - public int Gewicht => 320; - public string Einheit => "g"; + public override int Id => 2; + public override string Name => "Cheeseburger"; + public override string Description => "Wie der Hamburger, nur mit Käse."; + public override int Gewicht => 320; + public override string Einheit => "g"; public override int HpAmount => 20; } } diff --git a/Server/Inventory/Items/Chickenburger.cs b/Server/Inventory/Items/Chickenburger.cs index 7e51af38..64ec0b2c 100644 --- a/Server/Inventory/Items/Chickenburger.cs +++ b/Server/Inventory/Items/Chickenburger.cs @@ -11,13 +11,13 @@ using System.Text; namespace reallife_gamemode.Server.Inventory.Items { - public class Chickenburger : FoodItem, IItem - { - public int Id => 3; - public string Name => "Chickenburger"; - public string Description => "Hühnchenburger"; - public int Gewicht => 330; - public string Einheit => "g"; + public class Chickenburger : FoodItem + { + public override int Id => 3; + public override string Name => "Chickenburger"; + public override string Description => "Hühnchenburger"; + public override int Gewicht => 330; + public override string Einheit => "g"; public override int HpAmount => 25; } } diff --git a/Server/Inventory/Items/FoodItem.cs b/Server/Inventory/Items/FoodItem.cs index 699ef857..dc3d5651 100644 --- a/Server/Inventory/Items/FoodItem.cs +++ b/Server/Inventory/Items/FoodItem.cs @@ -12,6 +12,11 @@ namespace reallife_gamemode.Server.Inventory.Items public abstract class FoodItem : IUsableItem { public abstract int HpAmount { get; } + public abstract int Id { get; } + public abstract string Name { get; } + public abstract string Description { get; } + public abstract int Gewicht { get; } + public abstract string Einheit { get; } public void Use(UserItem uItem, Client player) { diff --git a/Server/Inventory/Items/Hamburger.cs b/Server/Inventory/Items/Hamburger.cs index be39522b..b7fa2590 100644 --- a/Server/Inventory/Items/Hamburger.cs +++ b/Server/Inventory/Items/Hamburger.cs @@ -11,13 +11,13 @@ using System.Text; namespace reallife_gamemode.Server.Inventory.Items { - public class Hamburger : FoodItem, IItem - { - public int Id => 1; - public string Name => "Hamburger"; - public string Description => "Ein leckerer Hamburger."; - public int Gewicht => 300; - public string Einheit => "g"; + public class Hamburger : FoodItem + { + public override int Id => 1; + public override string Name => "Hamburger"; + public override string Description => "Ein leckerer Hamburger."; + public override int Gewicht => 300; + public override string Einheit => "g"; public override int HpAmount => 20; } } diff --git a/Server/Inventory/Items/Holz.cs b/Server/Inventory/Items/Holz.cs index 947969ad..209f3722 100644 --- a/Server/Inventory/Items/Holz.cs +++ b/Server/Inventory/Items/Holz.cs @@ -10,14 +10,14 @@ using System.Text; */ namespace reallife_gamemode.Server.Inventory.Items -{ - public class Holz : FoodItem, IItem - { - public int Id => 4; - public string Name => "Holz"; - public string Description => "Ich und mein Holz."; - public int Gewicht => 1000; - public string Einheit => "g"; +{ + public class Holz : FoodItem + { + public override int Id => 4; + public override string Name => "Holz"; + public override string Description => "Ich und mein Holz."; + public override int Gewicht => 1000; + public override string Einheit => "g"; public override int HpAmount => 20; } } diff --git a/Server/Inventory/Items/Kraftstoff.cs b/Server/Inventory/Items/Kraftstoff.cs index 7b67b72f..95b83a46 100644 --- a/Server/Inventory/Items/Kraftstoff.cs +++ b/Server/Inventory/Items/Kraftstoff.cs @@ -11,13 +11,13 @@ using System.Text; namespace reallife_gamemode.Server.Inventory.Items { - public class Kraftstoff : FoodItem, IItem - { - public int Id => 5; - public string Name => "Kraftstoff"; - public string Description => "Der Stoff gibt dir Kraft."; - public int Gewicht => 1000; - public string Einheit => "g"; + public class Kraftstoff : FoodItem + { + public override int Id => 5; + public override string Name => "Kraftstoff"; + public override string Description => "Der Stoff gibt dir Kraft."; + public override int Gewicht => 1000; + public override string Einheit => "g"; public override int HpAmount => 20; } }