aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored inventory system

Browse Source
This commit is contained in:
hydrant
2018-12-19 21:14:36 +01:00
parent 98d6ecb01a
commit b16ed270c2
11 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Server/Commands/Admin.cs
View File

@@ -58,7 +58,7 @@ namespace reallife_gamemode.Server.Commands
if(iItem is IUsableItem usableItemObj)
{
usableItemObj.Use(eatItem, player);
usableItemObj.Use(eatItem);
}
}

8
Server/Entities/UserItem.cs
View File

@@ -30,5 +30,13 @@ namespace reallife_gamemode.Server.Entities
public int Amount { get; set; }
public int Slot { get; set; }
public User GetUser()
{
using (var dbContext = new DatabaseContext())
{
return dbContext.Users.FirstOrDefault(u => u.Id == UserId);
}
}
}
}

4
Server/Inventory/Interfaces/IDroppableItem.cs
View File

@@ -12,8 +12,8 @@ using System.Text;
namespace reallife_gamemode.Server.Inventory.Interfaces
{
public interface IDroppableItem : IUsableItem
public interface IDroppableItem : IItem
{
void Drop(UserItem uItem, Client player, int amount);
uint Object { get; }
}
}

1
Server/Inventory/Interfaces/IItem.cs
View File

@@ -17,6 +17,5 @@ namespace reallife_gamemode.Server.Inventory.Interfaces
string Description { get; }
int Gewicht { get; }
string Einheit { get; }
uint Object { get; }
}
}

2
Server/Inventory/Interfaces/IUsableItem.cs
View File

@@ -14,6 +14,6 @@ namespace reallife_gamemode.Server.Inventory.Interfaces
{
public interface IUsableItem : IItem
{
void Use(UserItem uItem, Client player);
void Use(UserItem uItem);
}
}

2
Server/Inventory/Items/Cheeseburger.cs
View File

@@ -11,7 +11,7 @@ using System.Text;
namespace reallife_gamemode.Server.Inventory.Items
{
public class Cheeseburger : DropItem
public class Cheeseburger : FoodItem
{
public override int Id => 2;
public override string Name => "Cheeseburger";

2
Server/Inventory/Items/Chickenburger.cs
View File

@@ -11,7 +11,7 @@ using System.Text;
namespace reallife_gamemode.Server.Inventory.Items
{
public class Chickenburger : DropItem, FoodItem
public class Chickenburger : FoodItem
{
public override int Id => 3;
public override string Name => "Chickenburger";

12
Server/Inventory/Items/FoodItem.cs
View File

@@ -19,9 +19,17 @@ namespace reallife_gamemode.Server.Inventory.Items
public abstract string Einheit { get; }
public abstract uint Object { get; }
public void Use(UserItem uItem, Client player)
public void Use(UserItem uItem)
{
player.Health += HpAmount;
Client player = uItem.GetUser().GetClient();
int amountToAdd = HpAmount;
if(player.Health + amountToAdd > 100)
{
amountToAdd = 100 - player.Health;
}
player.Health += amountToAdd;
player.SendNotification("Du hast ein/einen ~y~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~gegessen.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
}

2
Server/Inventory/Items/Hamburger.cs
View File

@@ -11,7 +11,7 @@ using System.Text;
namespace reallife_gamemode.Server.Inventory.Items
{
public class Hamburger : DropItem
public class Hamburger : FoodItem
{
public override int Id => 1;
public override string Name => "Hamburger";

15
Server/Inventory/Items/Holz.cs
View File

@@ -11,14 +11,13 @@ using System.Text;
namespace reallife_gamemode.Server.Inventory.Items
{
public class Holz : DropItem
public class Holz : IDroppableItem
{
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;
public override uint Object => 1805779401;
public int Id => 4;
public string Name => "Holz";
public string Description => "Ich und mein Holz.";
public int Gewicht => 1000;
public string Einheit => "g";
public uint Object => 1805779401;
}
}

20
Server/Managers/InventoryManager.cs
View File

@@ -226,21 +226,19 @@ namespace reallife_gamemode.Server.Managers
using (var context = new DatabaseContext())
{
UserItem fItem = context.UserItems.FirstOrDefault(j => j.Id == int.Parse(itemId));
IItem iItem = InventoryManager.GetItemById(fItem.ItemId);
List<UserItem> itemList = player.GetUser().GetItems();
UserItem userItem = itemList.FirstOrDefault(i => i.ItemId == iItem.Id);
IItem iItem = GetItemById(fItem.ItemId);
switch (type)
{
case "use":
player.SendChatMessage("use item: " + iItem.Name);
if (iItem == null)
{
player.SendChatMessage("Dieses Essen existiert nicht.");
return;
}
if (userItem == null)
if (fItem == null)
{
player.SendChatMessage("Du hast dieses Item nicht");
return;
@@ -248,9 +246,10 @@ namespace reallife_gamemode.Server.Managers
if (iItem is IUsableItem usableItemObj)
{
usableItemObj.Use(userItem, player);
usableItemObj.Use(fItem);
player.TriggerEvent("removeItem", itemId, amount);
}
else player.SendChatMessage("not useable");
break;
case "drop":
@@ -260,17 +259,18 @@ namespace reallife_gamemode.Server.Managers
return;
}
if (userItem == null)
if (fItem == null)
{
player.SendChatMessage("Du hast dieses Item nicht");
return;
}
if (iItem is IUsableItem usableItemObj2)
if (iItem is IDroppableItem usableItemObj2)
{
Random r = new Random();
//fItem.Amount -= amount;
usableItemObj2.Drop(userItem, player);
NAPI.Object.CreateObject(3777723516, new Vector3(player.Position.X, player.Position.Y, player.Position.Z - 0.8), new Vector3(0, 0, r.Next(0, 360)), 0);
NAPI.TextLabel.CreateTextLabel(iItem.Name + " ~s~(~y~" + amount + "~s~)", new Vector3(player.Position.X, player.Position.Y, player.Position.Z - 0.6), 5, 0.5f, 4, new Color(255, 255, 255), false, 0);
fItem.Amount -= amount;
player.TriggerEvent("removeItem", itemId, amount);
}
break;