From 99e546b6178c7845a2fd3f89f7828929ba6f75ed Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Tue, 9 Feb 2021 18:02:29 +0100 Subject: [PATCH] new Items --- .../html/inventory/img/inventory/100.svg | 1 + .../html/inventory/img/inventory/101.svg | 60 ++++++++++++ .../html/inventory/img/inventory/102.svg | 95 +++++++++++++++++++ .../img/inventory/{27.svg => 103.svg} | 0 .../Inventory/Items/Apfel.cs | 18 ++++ .../Inventory/Items/Bier.cs | 18 ++++ .../Inventory/Items/Cheeseburger.cs | 4 +- .../Inventory/Items/Chips.cs | 18 ++++ 8 files changed, 212 insertions(+), 2 deletions(-) create mode 100644 ReallifeGamemode.Client/assets/html/inventory/img/inventory/100.svg create mode 100644 ReallifeGamemode.Client/assets/html/inventory/img/inventory/101.svg create mode 100644 ReallifeGamemode.Client/assets/html/inventory/img/inventory/102.svg rename ReallifeGamemode.Client/assets/html/inventory/img/inventory/{27.svg => 103.svg} (100%) create mode 100644 ReallifeGamemode.Server/Inventory/Items/Apfel.cs create mode 100644 ReallifeGamemode.Server/Inventory/Items/Bier.cs create mode 100644 ReallifeGamemode.Server/Inventory/Items/Chips.cs diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/100.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/100.svg new file mode 100644 index 00000000..4092e036 --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/100.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/101.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/101.svg new file mode 100644 index 00000000..c4b09473 --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/101.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/102.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/102.svg new file mode 100644 index 00000000..5e32d612 --- /dev/null +++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/102.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/27.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/103.svg similarity index 100% rename from ReallifeGamemode.Client/assets/html/inventory/img/inventory/27.svg rename to ReallifeGamemode.Client/assets/html/inventory/img/inventory/103.svg diff --git a/ReallifeGamemode.Server/Inventory/Items/Apfel.cs b/ReallifeGamemode.Server/Inventory/Items/Apfel.cs new file mode 100644 index 00000000..b81fa4f7 --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/Apfel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class Apfel : FoodItem + { + public override int Id => 101; + public override string Name => "Apfel"; + public override string Description => "Ein Apfel"; + public override int Gewicht => 10; + public override string Einheit => "g"; + public override int HpAmount => 10; + public override uint Object => 2240524752; + public override int Price => 20; + } +} diff --git a/ReallifeGamemode.Server/Inventory/Items/Bier.cs b/ReallifeGamemode.Server/Inventory/Items/Bier.cs new file mode 100644 index 00000000..9be57f94 --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/Bier.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class Bier : FoodItem + { + public override int Id => 102; + public override string Name => "Bier"; + public override string Description => "Ein Bier"; + public override int Gewicht => 10; + public override string Einheit => "g"; + public override int HpAmount => 10; + public override uint Object => 2240524752; + public override int Price => 20; + } +} diff --git a/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs b/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs index 731d9303..74298618 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs @@ -8,10 +8,10 @@ namespace ReallifeGamemode.Server.Inventory.Items { public class Cheeseburger : FoodItem { - public override int Id => 27; + public override int Id => 103; public override string Name => "Cheeseburger"; public override string Description => "Ein Burger"; - public override int Gewicht => 300; + public override int Gewicht => 50; public override string Einheit => "g"; public override int HpAmount => 20; public override uint Object => 2240524752; diff --git a/ReallifeGamemode.Server/Inventory/Items/Chips.cs b/ReallifeGamemode.Server/Inventory/Items/Chips.cs new file mode 100644 index 00000000..c2610440 --- /dev/null +++ b/ReallifeGamemode.Server/Inventory/Items/Chips.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace ReallifeGamemode.Server.Inventory.Items +{ + class Chips : FoodItem + { + public override int Id => 100; + public override string Name => "Chips"; + public override string Description => "Eine tüte Chips"; + public override int Gewicht => 10; + public override string Einheit => "g"; + public override int HpAmount => 10; + public override uint Object => 2240524752; + public override int Price => 20; + } +}