tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds neck UI slot and rearranges inventory UI. (#1130)

Browse Source 
* UI Icon

* It worked?

* Reorganized UI

* converted the bedsheet/cloak sprites

* backpacks go over cloaks now

* Added a couple more neck clothing

* Milk Ape
This commit is contained in:
Swept
2020-06-21 20:02:18 +00:00
committed by GitHub
parent 0e92a0c88c
commit 7b98f37f9a
129 changed files with 662 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs
View File

@@ -35,6 +35,7 @@ namespace Content.Shared.GameObjects.Components.Inventory
MASK,
OUTERCLOTHING,
INNERCLOTHING,
NECK,
BACKPACK,
BELT,
GLOVES,
@@ -69,17 +70,18 @@ namespace Content.Shared.GameObjects.Components.Inventory
MASK = 1 << 4,
OUTERCLOTHING = 1 << 5,
INNERCLOTHING = 1 << 6,
BACK = 1 << 7,
BACKPACK = 1 << 7,
BELT = 1 << 8,
GLOVES = 1 << 9,
HAND = 1 << 9,
IDCARD = 1 << 10,
POCKET = 1 << 11,
LEGS = 1 << 12,
SHOES = 1 << 13,
FEET = 1 << 13,
EXOSUITSTORAGE = 1 << 14
NECK = 1 << 7,
BACK = 1 << 8,
BACKPACK = 1 << 8,
BELT = 1 << 9,
GLOVES = 1 << 10,
HAND = 1 << 10,
IDCARD = 1 << 11,
POCKET = 1 << 12,
LEGS = 1 << 13,
SHOES = 1 << 14,
FEET = 1 << 14,
EXOSUITSTORAGE = 1 << 15
}
public static readonly IReadOnlyDictionary<Slots, string> SlotNames = new Dictionary<Slots, string>()
@@ -90,6 +92,7 @@ namespace Content.Shared.GameObjects.Components.Inventory
{Slots.MASK, "Mask"},
{Slots.OUTERCLOTHING, "Outer Clothing"},
{Slots.INNERCLOTHING, "Inner Clothing"},
{Slots.NECK, "Neck"},
{Slots.BACKPACK, "Backpack"},
{Slots.BELT, "Belt"},
{Slots.GLOVES, "Gloves"},
@@ -117,6 +120,7 @@ namespace Content.Shared.GameObjects.Components.Inventory
{Slots.MASK, SlotFlags.MASK},
{Slots.OUTERCLOTHING, SlotFlags.OUTERCLOTHING},
{Slots.INNERCLOTHING, SlotFlags.INNERCLOTHING},
{Slots.NECK, SlotFlags.NECK},
{Slots.BACKPACK, SlotFlags.BACK},
{Slots.BELT, SlotFlags.BELT},
{Slots.GLOVES, SlotFlags.GLOVES},
@@ -140,6 +144,7 @@ namespace Content.Shared.GameObjects.Components.Inventory
"Inventory_MASK",
"Inventory_OUTERCLOTHING",
"Inventory_INNERCLOTHING",
"Inventory_NECK",
"Inventory_BACKPACK",
"Inventory_BELT",
"Inventory_GLOVES",

16
Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs
View File

@@ -28,11 +28,12 @@ namespace Content.Shared.GameObjects
private static readonly Dictionary<Slots, int> _slotDrawingOrder = new Dictionary<Slots, int>
{
{Slots.POCKET1, 12},
{Slots.POCKET2, 11},
{Slots.HEAD, 10},
{Slots.MASK, 9},
{Slots.EARS, 8},
{Slots.POCKET1, 13},
{Slots.POCKET2, 12},
{Slots.HEAD, 11},
{Slots.MASK, 10},
{Slots.EARS, 9},
{Slots.NECK, 8},
{Slots.BACKPACK, 7},
{Slots.EYES, 6},
{Slots.OUTERCLOTHING, 5},
@@ -46,9 +47,10 @@ namespace Content.Shared.GameObjects
public override IReadOnlyList<Slots> SlotMasks { get; } = new List<Slots>()
{
Slots.EYES, Slots.HEAD, Slots.EARS,
Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING,
Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING,
Slots.BACKPACK, Slots.BELT, Slots.GLOVES,
Slots.NONE, Slots.SHOES, Slots.IDCARD, Slots.POCKET1, Slots.POCKET2
Slots.NONE, Slots.SHOES, Slots.IDCARD, Slots.POCKET1, Slots.POCKET2,
Slots.NECK
};
public override int SlotDrawingOrder(Slots slot)