Inventories (#61)

* Bully the fuck out of inventory shit
Inventory Stuff
Inventories technically work
It works technicaly speaking
Yeah this part too
Lets do it!
Inventories completed
Motherfucker

* Remove unnecessary usings and fix one thing

* Submodule update

* Adds a bunch of various clothing prototypes for each current inventory slot
This commit is contained in:
clusterfack
2018-04-25 06:42:35 -05:00
committed by Pieter-Jan Briers
parent ea05c593aa
commit c33c227d95
37 changed files with 1205 additions and 395 deletions

View File

@@ -1,21 +1,160 @@
- type: entity
parent: BaseItem
name: "Clothing"
id: Clothing
components:
- type: Transform
- type: Clothing
Size: 5
- type: Clickable
- type: BoundingBox
- type: Physics
mass: 5
- type: entity
parent: Clothing
id: ShoesItem
name: Shoes
components:
- type: Sprite
sprite: Items/shoes.png
- type: Icon
icon: Items/shoes.png
- type: Clothing
Slots:
- shoes
- type: entity
parent: BaseItem
id: JanitorUniformItem
parent: Clothing
id: JanitorUniform
name: Janitor Jumpsuit
components:
- type: Sprite
sprite: Items/janitorsuit.png
- type: Icon
icon: Items/janitorsuit.png
- type: Clothing
Slots:
- innerclothing
- type: entity
parent: Clothing
id: SecurityVestClothing
name: Security Vest
components:
- type: Sprite
sprite: Clothing/armorvest.png
- type: Icon
icon: Clothing/armorvest.png
- type: Clothing
Slots:
- outerclothing
- type: entity
parent: Clothing
id: UtilityBeltClothing
name: Utility Belt
components:
- type: Sprite
sprite: Clothing/belt_utility.png
- type: Icon
icon: Clothing/belt_utility.png
Size: 30
- type: Clothing
Slots:
- belt
- type: Storage
Capacity: 30
- type: entity
parent: Clothing
id: BackpackClothing
name: Backpack
components:
- type: Sprite
sprite: Clothing/backpack.png
- type: Icon
icon: Clothing/backpack.png
Size: 9999
- type: Clothing
Slots:
- back
- type: Storage
Capacity: 100
- type: entity
parent: Clothing
id: MesonGlasses
name: Mesons
components:
- type: Sprite
sprite: Clothing/glasses_meson.png
- type: Icon
icon: Clothing/glasses_meson.png
- type: Clothing
Slots:
- eyes
- type: entity
parent: Clothing
id: YellowGloves
name: Insulated Gloves
components:
- type: Sprite
sprite: Clothing/gloves_yellow.png
- type: Icon
icon: Clothing/gloves_yellow.png
- type: Clothing
Slots:
- gloves
- type: entity
parent: Clothing
id: HelmetSecurity
name: Security Helmet
components:
- type: Sprite
sprite: Clothing/helmet_sec.png
- type: Icon
icon: Clothing/helmet_sec.png
- type: Clothing
Slots:
- head
- type: entity
parent: Clothing
id: GasMaskClothing
name: Gas Mask
components:
- type: Sprite
sprite: Clothing/gasmask.png
- type: Icon
icon: Clothing/gasmask.png
- type: Clothing
Slots:
- mask
- type: entity
parent: Clothing
id: IDCardStandard
name: Identification Card
components:
- type: Sprite
sprite: Clothing/idcard_standard.png
- type: Icon
icon: Clothing/idcard_standard.png
- type: Clothing
Slots:
- idcard
- type: entity
parent: Clothing
id: RadioHeadsetEars
name: Headset Radio
components:
- type: Sprite
sprite: Clothing/ears_headset.png
- type: Icon
icon: Clothing/ears_headset.png
- type: Clothing
Slots:
- ears

View File

@@ -0,0 +1,79 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Scenes/SS14Window/SS14Window.tscn" type="PackedScene" id=1]
[node name="SS14Window" index="0" instance=ExtResource( 1 )]
margin_right = 403.0
rect_clip_content = false
[node name="Contents" parent="." index="0"]
rect_clip_content = false
[node name="PanelContainer" type="PanelContainer" parent="Contents" index="0"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 1.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 3
size_flags_vertical = 3
_sections_unfolded = [ "Anchor", "Grow Direction", "Margin", "Mouse", "Rect", "Size Flags", "Theme" ]
[node name="CenterContainer" type="CenterContainer" parent="Contents/PanelContainer" index="0"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 7.0
margin_top = 7.0
margin_right = 276.0
margin_bottom = 424.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
use_top_left = false
_sections_unfolded = [ "Anchor", "Focus", "Grow Direction", "Hint", "Margin", "Mouse", "Rect", "Size Flags", "Theme" ]
[node name="GridContainer" type="GridContainer" parent="Contents/PanelContainer/CenterContainer" index="0"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 134.0
margin_top = 208.0
margin_right = 134.0
margin_bottom = 208.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
columns = 3
_sections_unfolded = [ "Anchor", "Focus", "Grow Direction", "Hint", "Margin", "Material", "Mouse", "Rect", "Size Flags", "Theme", "custom_constants" ]
[node name="Header" parent="." index="1"]
rect_clip_content = false
[node name="Header Text" parent="Header" index="0"]
rect_clip_content = false
text = "I dont how to not use a window"
[node name="CloseButton" parent="Header" index="1"]
rect_clip_content = false

View File

@@ -0,0 +1,31 @@
[gd_resource type="StyleBoxFlat" format=2]
[resource]
content_margin_left = -1.0
content_margin_right = -1.0
content_margin_top = -1.0
content_margin_bottom = -1.0
bg_color = Color( 0.746094, 0.0320587, 0.0320587, 0.519333 )
draw_center = true
border_width_left = 1
border_width_top = 1
border_width_right = 1
border_width_bottom = 1
border_color = Color( 0.8, 0.8, 0.8, 1 )
border_blend = false
corner_radius_top_left = 2
corner_radius_top_right = 2
corner_radius_bottom_right = 2
corner_radius_bottom_left = 2
corner_detail = 8
expand_margin_left = 0.0
expand_margin_right = 0.0
expand_margin_top = 0.0
expand_margin_bottom = 0.0
shadow_color = Color( 0, 0, 0, 0.6 )
shadow_size = 0
anti_aliasing = false
anti_aliasing_size = 1
_sections_unfolded = [ "Anti Aliasing", "Border", "Border Width", "Corner Radius", "Expand Margin", "Shadow" ]

View File

@@ -0,0 +1,89 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Scenes/Inventory/StorageSlot.tres" type="StyleBox" id=1]
[node name="PanelContainer" type="PanelContainer" index="0"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_right = -974.0
margin_bottom = -550.0
rect_min_size = Vector2( 50, 50 )
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = true
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
custom_styles/panel = ExtResource( 1 )
_sections_unfolded = [ "Anchor", "Focus", "Grow Direction", "Hint", "Material", "Mouse", "Rect", "Visibility", "custom_styles" ]
[node name="Button" type="Button" parent="." index="0"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 1.0
margin_top = 1.0
margin_right = 49.0
margin_bottom = 49.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
toggle_mode = false
action_mode = 0
enabled_focus_mode = 2
shortcut = null
group = null
text = "Slut"
flat = true
clip_text = true
align = 1
_sections_unfolded = [ "Anchor", "Focus", "Grow Direction", "Hint", "Margin", "Mouse", "Rect", "Size Flags", "Theme", "custom_colors", "custom_constants", "custom_fonts", "custom_styles" ]
[node name="CenterContainer" type="CenterContainer" parent="." index="1"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 1.0
margin_top = 1.0
margin_right = 49.0
margin_bottom = 49.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
use_top_left = false
_sections_unfolded = [ "Mouse" ]
[node name="TextureRect" type="TextureRect" parent="CenterContainer" index="0"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 24.0
margin_top = 24.0
margin_right = 24.0
margin_bottom = 24.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
stretch_mode = 0
_sections_unfolded = [ "Mouse" ]

Binary file not shown.

After

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 241 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 581 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 650 B