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

formatted code

Browse Source
This commit is contained in:
Lennart Kampshoff
2019-05-05 17:59:11 +02:00
parent a34c03eae9
commit a88d5256a8
54 changed files with 290 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ReallifeGamemode.Server/Inventory/GroundItem.cs
View File

@@ -28,7 +28,7 @@ namespace ReallifeGamemode.Server.Inventory
public static void PickUpGroundItem(Client player)
{
GroundItem nearest = GroundItems.FirstOrDefault(d => d.Position.DistanceTo(player.Position) <= 1.2);
GroundItem nearest = GroundItems.FirstOrDefault(d => d.Position.DistanceTo(player.Position) <= 1.2);
if (nearest != null)
{
var invWeight = InventoryManager.GetUserInventoryWeight(player);
@@ -40,9 +40,9 @@ namespace ReallifeGamemode.Server.Inventory
var user = player.GetUser();
if (nearestItem.Gewicht * nearest.Amount + invWeight > 40000)
{
for(var i = 1; i <= nearest.Amount; i++)
{
if(invWeight + (i * nearestItem.Gewicht) > 40000)
for (var i = 1; i <= nearest.Amount; i++)
{
if (invWeight + (i * nearestItem.Gewicht) > 40000)
{
break;
}
@@ -51,13 +51,13 @@ namespace ReallifeGamemode.Server.Inventory
itemsToAdd = i;
}
}
if(itemsToAdd < 1)
if (itemsToAdd < 1)
{
player.SendNotification("~r~Du hast keinen Platz im Inventar!", false);
}
else
{
if(existingItem != null)
if (existingItem != null)
{
using (var context = new DatabaseContext())
{
@@ -69,7 +69,7 @@ namespace ReallifeGamemode.Server.Inventory
else
{
UserItem newItem = new UserItem { ItemId = nearest.ItemId, UserId = user.Id, Amount = nearest.Amount };
InventoryManager.AddItemToInventory(player, newItem);
InventoryManager.AddItemToInventory(player, newItem);
}
nearest.Amount -= itemsToAdd;
nearestTextLabel.Text = nearestItem.Name + " ~s~(~y~" + nearest.Amount + "~s~)";
@@ -84,17 +84,17 @@ namespace ReallifeGamemode.Server.Inventory
{
UserItem existingUserItem = context.UserItems.FirstOrDefault(i => i.Id == existingItem.Id && i.UserId == user.Id);
existingUserItem.Amount += nearest.Amount;
context.SaveChanges();
context.SaveChanges();
}
}
else
{
UserItem item = new UserItem() { ItemId = nearest.ItemId, UserId = user.Id, Amount = nearest.Amount };
InventoryManager.AddItemToInventory(player, item);
InventoryManager.AddItemToInventory(player, item);
}
RemoveGroundItem(nearest, nearestObject, nearestTextLabel);
player.SendNotification("Du hast ~g~" + nearest.Amount + " ~y~" + nearestItem.Name + " ~s~aufgehoben.");
}
}
}
}
@@ -103,8 +103,8 @@ namespace ReallifeGamemode.Server.Inventory
GroundItems.Remove(grndItem);
NAPI.Entity.DeleteEntity(grndObject);
NAPI.Entity.DeleteEntity(grndTextLabel);
GroundObjects.Remove(grndObject);
GroundTextLabels.Remove(grndTextLabel);
GroundObjects.Remove(grndObject);
GroundTextLabels.Remove(grndTextLabel);
}
}
}

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

@@ -12,7 +12,7 @@ using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{
public class Cheeseburger : FoodItem
{
{
public override int Id => 2;
public override string Name => "Cheeseburger";
public override string Description => "Wie der Hamburger, nur mit Käse.";

2
ReallifeGamemode.Server/Inventory/Items/FoodItem.cs
View File

@@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
Client player = uItem.GetUser().Client;
int amountToAdd = HpAmount;
if(player.Health + amountToAdd > 100)
if (player.Health + amountToAdd > 100)
{
amountToAdd = 100 - player.Health;
}

2
ReallifeGamemode.Server/Inventory/Items/Holz.cs
View File

@@ -10,7 +10,7 @@ using System.Text;
*/
namespace ReallifeGamemode.Server.Inventory.Items
{
{
public class Holz : IDroppableItem
{
public int Id => 4;