diff --git a/README.md b/README.md index 2c75226..52fd150 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,21 @@ Submission day: Jan 19th 8AM 3. [ ] Selling the stuff - [ ] send prototype to maxie~ + +## Item Ideas +- [ ] metal/plastic scrap +- [ ] disk drive +- [ ] projector + - [ ] lens +- [ ] docking station + - [ ] IO Ports +- [ ] centrifuge + - [ ] motor +- [ ] 3d printer + - [ ] heating element +- [ ] mouse +- [ ] cables +- [ ] printer +- [ ] cpu, gpu +- [ ] pc / laptop +- [ ] diff --git a/assets/computer.png b/assets/computer.png new file mode 100644 index 0000000..bee6975 Binary files /dev/null and b/assets/computer.png differ diff --git a/assets/computer.png.import b/assets/computer.png.import new file mode 100644 index 0000000..f768ecc --- /dev/null +++ b/assets/computer.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://crdbk8wkw63k0" +path="res://.godot/imported/computer.png-5a2aaacb00eb8d8044a6a7f9284d5600.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/computer.png" +dest_files=["res://.godot/imported/computer.png-5a2aaacb00eb8d8044a6a7f9284d5600.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/battery.webp b/assets/item images/battery.webp similarity index 100% rename from assets/battery.webp rename to assets/item images/battery.webp diff --git a/assets/battery.webp.import b/assets/item images/battery.webp.import similarity index 76% rename from assets/battery.webp.import rename to assets/item images/battery.webp.import index 1032017..1fc43a6 100644 --- a/assets/battery.webp.import +++ b/assets/item images/battery.webp.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b0kddtrrun1tc" -path="res://.godot/imported/battery.webp-29ebbc4ec04c0f993175279e162374d5.ctex" +path="res://.godot/imported/battery.webp-45bca03f643a4a277a05403e925b39f1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/battery.webp" -dest_files=["res://.godot/imported/battery.webp-29ebbc4ec04c0f993175279e162374d5.ctex"] +source_file="res://assets/item images/battery.webp" +dest_files=["res://.godot/imported/battery.webp-45bca03f643a4a277a05403e925b39f1.ctex"] [params] diff --git a/assets/big psu.png b/assets/item images/big psu.png similarity index 100% rename from assets/big psu.png rename to assets/item images/big psu.png diff --git a/assets/big psu.png.import b/assets/item images/big psu.png.import similarity index 77% rename from assets/big psu.png.import rename to assets/item images/big psu.png.import index 1fec712..969d459 100644 --- a/assets/big psu.png.import +++ b/assets/item images/big psu.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dd5u5obr0c61q" -path="res://.godot/imported/big psu.png-d20e94e5a552e1303554bd6972afdc56.ctex" +path="res://.godot/imported/big psu.png-7b10ae74ad953225687dc341986a6bfe.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/big psu.png" -dest_files=["res://.godot/imported/big psu.png-d20e94e5a552e1303554bd6972afdc56.ctex"] +source_file="res://assets/item images/big psu.png" +dest_files=["res://.godot/imported/big psu.png-7b10ae74ad953225687dc341986a6bfe.ctex"] [params] diff --git a/assets/hdd.png b/assets/item images/hdd.png similarity index 100% rename from assets/hdd.png rename to assets/item images/hdd.png diff --git a/assets/hdd.png.import b/assets/item images/hdd.png.import similarity index 78% rename from assets/hdd.png.import rename to assets/item images/hdd.png.import index ff12989..4594d91 100644 --- a/assets/hdd.png.import +++ b/assets/item images/hdd.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c1ja7ug8bkxne" -path="res://.godot/imported/hdd.png-c14328920d63cd2455593c266c0e1877.ctex" +path="res://.godot/imported/hdd.png-824787d9e272d1beb1ec6830b050b33f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/hdd.png" -dest_files=["res://.godot/imported/hdd.png-c14328920d63cd2455593c266c0e1877.ctex"] +source_file="res://assets/item images/hdd.png" +dest_files=["res://.godot/imported/hdd.png-824787d9e272d1beb1ec6830b050b33f.ctex"] [params] diff --git a/assets/ram.png b/assets/item images/ram.png similarity index 100% rename from assets/ram.png rename to assets/item images/ram.png diff --git a/assets/ram.png.import b/assets/item images/ram.png.import similarity index 78% rename from assets/ram.png.import rename to assets/item images/ram.png.import index c62363f..7c6772d 100644 --- a/assets/ram.png.import +++ b/assets/item images/ram.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dquer6m8lapux" -path="res://.godot/imported/ram.png-c6c16747428068ac97ec4acf800fb111.ctex" +path="res://.godot/imported/ram.png-40ed34ea691b6c1c52eebfbad1434427.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/ram.png" -dest_files=["res://.godot/imported/ram.png-c6c16747428068ac97ec4acf800fb111.ctex"] +source_file="res://assets/item images/ram.png" +dest_files=["res://.godot/imported/ram.png-40ed34ea691b6c1c52eebfbad1434427.ctex"] [params] diff --git a/assets/small psu.png b/assets/item images/small psu.png similarity index 100% rename from assets/small psu.png rename to assets/item images/small psu.png diff --git a/assets/small psu.png.import b/assets/item images/small psu.png.import similarity index 76% rename from assets/small psu.png.import rename to assets/item images/small psu.png.import index d6b9510..b3d9d9e 100644 --- a/assets/small psu.png.import +++ b/assets/item images/small psu.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bmstxerbgdq61" -path="res://.godot/imported/small psu.png-8910d553249f30fc51a0f97c315ad4aa.ctex" +path="res://.godot/imported/small psu.png-93e7b3638beba3e3f06d473063fef1bd.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/small psu.png" -dest_files=["res://.godot/imported/small psu.png-8910d553249f30fc51a0f97c315ad4aa.ctex"] +source_file="res://assets/item images/small psu.png" +dest_files=["res://.godot/imported/small psu.png-93e7b3638beba3e3f06d473063fef1bd.ctex"] [params] diff --git a/assets/workshop.png b/assets/workshop.png new file mode 100644 index 0000000..6743383 Binary files /dev/null and b/assets/workshop.png differ diff --git a/assets/workshop.png.import b/assets/workshop.png.import new file mode 100644 index 0000000..2e29352 --- /dev/null +++ b/assets/workshop.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dhyryjblax7sj" +path="res://.godot/imported/workshop.png-e44f18506b28fd4cc34fbf4dd653f3b2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/workshop.png" +dest_files=["res://.godot/imported/workshop.png-e44f18506b28fd4cc34fbf4dd653f3b2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/demo_scene.gd b/demo_scene.gd index 128c588..eeadf6a 100644 --- a/demo_scene.gd +++ b/demo_scene.gd @@ -33,3 +33,7 @@ func _on_loot_button_pressed() -> void: func pick_random_item() -> ItemData: var icount = loot_pool.size() return loot_pool[randi() % icount] + + +func _on_return_button_pressed() -> void: + get_tree().change_scene_to_file("res://scenes/workshop.tscn") diff --git a/inv_system/crafting_panel.gd b/inv_system/crafting_panel.gd index b83d56f..f4046d5 100644 --- a/inv_system/crafting_panel.gd +++ b/inv_system/crafting_panel.gd @@ -13,7 +13,7 @@ extends Inventory # Called when the node enters the scene tree for the first time. func _ready() -> void: super() - style_scavenge() + #style_scavenge() pass # Replace with function body. diff --git a/inv_system/player_inventory.tscn b/inv_system/player_inventory.tscn index 1e63258..4c0577d 100644 --- a/inv_system/player_inventory.tscn +++ b/inv_system/player_inventory.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=3 uid="uid://bkhg56q71vsjv"] +[gd_scene load_steps=4 format=3 uid="uid://bkhg56q71vsjv"] [ext_resource type="Script" uid="uid://jxkjnscuxcyi" path="res://inv_system/player_inventory.gd" id="1_vk2kx"] -[ext_resource type="PackedScene" uid="uid://bar46c75dbi2t" path="res://inv_system/inventory_panel.tscn" id="2_hk4hx"] +[ext_resource type="Script" uid="uid://c6oycdae5wvjf" path="res://inv_system/inventory.gd" id="2_hk4hx"] +[ext_resource type="PackedScene" uid="uid://dgqs20xf7l8c" path="res://inv_system/item_slot.tscn" id="3_8qgtd"] [node name="PlayerInventory" type="Control" node_paths=PackedStringArray("inventory_panel", "button")] z_index = 2 @@ -26,11 +27,128 @@ offset_right = 129.0 grow_vertical = 0 text = "Show Inventory" -[node name="InventoryPanel" parent="." instance=ExtResource("2_hk4hx")] +[node name="InventoryPanel" type="PanelContainer" parent="." node_paths=PackedStringArray("grid", "inv_label")] layout_mode = 0 offset_left = 67.0 offset_top = 79.0 offset_right = 419.0 offset_bottom = 561.0 +script = ExtResource("2_hk4hx") +inventory_name = "Your Inventory" +grid = NodePath("MarginContainer/VBoxContainer/ScrollContainer/GridContainer") +inv_label = NodePath("MarginContainer/VBoxContainer/Label") + +[node name="MarginContainer" type="MarginContainer" parent="InventoryPanel"] +layout_mode = 2 +theme_override_constants/margin_left = 5 +theme_override_constants/margin_top = 5 +theme_override_constants/margin_right = 5 +theme_override_constants/margin_bottom = 5 + +[node name="VBoxContainer" type="VBoxContainer" parent="InventoryPanel/MarginContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="InventoryPanel/MarginContainer/VBoxContainer"] +layout_mode = 2 +text = "Inventory 1" + +[node name="ScrollContainer" type="ScrollContainer" parent="InventoryPanel/MarginContainer/VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 3 + +[node name="GridContainer" type="GridContainer" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer"] +layout_mode = 2 +size_flags_vertical = 3 +columns = 5 + +[node name="ItemSlot" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot2" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot3" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot4" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot5" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot6" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot7" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot8" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot9" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot10" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot11" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot12" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot13" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot14" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot15" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot16" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot17" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot18" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot19" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot20" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot21" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot22" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot23" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot24" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot25" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot26" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot27" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot28" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot29" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 + +[node name="ItemSlot30" parent="InventoryPanel/MarginContainer/VBoxContainer/ScrollContainer/GridContainer" instance=ExtResource("3_8qgtd")] +layout_mode = 2 [connection signal="pressed" from="Button" to="." method="_on_button_pressed"] diff --git a/items/battery_item.tres b/items/battery_item.tres index 6f3333f..d8312a0 100644 --- a/items/battery_item.tres +++ b/items/battery_item.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3 uid="uid://bcteljob51wfj"] -[ext_resource type="Texture2D" uid="uid://b0kddtrrun1tc" path="res://assets/battery.webp" id="1_lh7dq"] +[ext_resource type="Texture2D" uid="uid://b0kddtrrun1tc" path="res://assets/item images/battery.webp" id="1_lh7dq"] [ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="2_4u113"] [resource] diff --git a/items/hdd_item.tres b/items/hdd_item.tres index 0797b40..6c94c77 100644 --- a/items/hdd_item.tres +++ b/items/hdd_item.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3 uid="uid://bepkdyf7dn1y0"] -[ext_resource type="Texture2D" uid="uid://c1ja7ug8bkxne" path="res://assets/hdd.png" id="1_8xwf0"] +[ext_resource type="Texture2D" uid="uid://c1ja7ug8bkxne" path="res://assets/item images/hdd.png" id="1_8xwf0"] [ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="1_r24a6"] [resource] diff --git a/items/large_psu_item.tres b/items/large_psu_item.tres index 2c4b856..b430a9f 100644 --- a/items/large_psu_item.tres +++ b/items/large_psu_item.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3 uid="uid://88v5bcyrgpob"] -[ext_resource type="Texture2D" uid="uid://dd5u5obr0c61q" path="res://assets/big psu.png" id="1_rjw1c"] +[ext_resource type="Texture2D" uid="uid://dd5u5obr0c61q" path="res://assets/item images/big psu.png" id="1_rjw1c"] [ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="2_i66kx"] [resource] diff --git a/items/ram_item.tres b/items/ram_item.tres index 7ce632b..f468e19 100644 --- a/items/ram_item.tres +++ b/items/ram_item.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3 uid="uid://c2wbqelme8vy1"] [ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="1_0t7ph"] -[ext_resource type="Texture2D" uid="uid://dquer6m8lapux" path="res://assets/ram.png" id="1_bfuag"] +[ext_resource type="Texture2D" uid="uid://dquer6m8lapux" path="res://assets/item images/ram.png" id="1_bfuag"] [resource] script = ExtResource("1_0t7ph") diff --git a/items/small_psu_item.tres b/items/small_psu_item.tres index 01a49e0..4146ac4 100644 --- a/items/small_psu_item.tres +++ b/items/small_psu_item.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3 uid="uid://swd1m0hvep4c"] -[ext_resource type="Texture2D" uid="uid://bmstxerbgdq61" path="res://assets/small psu.png" id="1_62foo"] +[ext_resource type="Texture2D" uid="uid://bmstxerbgdq61" path="res://assets/item images/small psu.png" id="1_62foo"] [ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="2_x1n7s"] [resource] diff --git a/project.godot b/project.godot index e07cab4..c09cadd 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="Repurposed Jam" -run/main_scene="uid://dsfal3m4siap2" +run/main_scene="uid://dbxymsdyvbe2p" config/features=PackedStringArray("4.5", "GL Compatibility") config/icon="res://icon.svg" @@ -21,6 +21,10 @@ Tooltip="*res://tooltip.tscn" PlayerInventory="*res://inv_system/player_inventory.tscn" Clock="*res://time_system/clock.tscn" +[display] + +window/stretch/mode="canvas_items" + [editor] movie_writer/video_quality=0.25 diff --git a/scenes/computer.gd b/scenes/computer.gd new file mode 100644 index 0000000..03817f6 --- /dev/null +++ b/scenes/computer.gd @@ -0,0 +1,15 @@ +extends Control + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass + + +func _on_goto_workshop_pressed() -> void: + get_tree().change_scene_to_file("res://scenes/workshop.tscn") diff --git a/scenes/computer.gd.uid b/scenes/computer.gd.uid new file mode 100644 index 0000000..a306668 --- /dev/null +++ b/scenes/computer.gd.uid @@ -0,0 +1 @@ +uid://cq6xhdlib6c50 diff --git a/scenes/computer.tscn b/scenes/computer.tscn new file mode 100644 index 0000000..37c8d3b --- /dev/null +++ b/scenes/computer.tscn @@ -0,0 +1,35 @@ +[gd_scene load_steps=3 format=3 uid="uid://cu2yyw3f2avub"] + +[ext_resource type="Script" uid="uid://cq6xhdlib6c50" path="res://scenes/computer.gd" id="1_8pqrt"] +[ext_resource type="Texture2D" uid="uid://crdbk8wkw63k0" path="res://assets/computer.png" id="1_om4aa"] + +[node name="Computer" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("1_8pqrt") + +[node name="TextureRect" type="TextureRect" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +texture = ExtResource("1_om4aa") +expand_mode = 3 + +[node name="GotoWorkshop" type="Button" parent="."] +layout_mode = 0 +offset_left = 508.0 +offset_top = 591.0 +offset_right = 635.0 +offset_bottom = 622.0 +text = "Goto workshop" + +[connection signal="pressed" from="GotoWorkshop" to="." method="_on_goto_workshop_pressed"] diff --git a/test.tscn b/scenes/ewaste.tscn similarity index 98% rename from test.tscn rename to scenes/ewaste.tscn index 93faa90..0dd8794 100644 --- a/test.tscn +++ b/scenes/ewaste.tscn @@ -140,3 +140,4 @@ grow_vertical = 0 text = "Return to workshop" [connection signal="pressed" from="LootButton" to="." method="_on_loot_button_pressed"] +[connection signal="pressed" from="ReturnButton" to="." method="_on_return_button_pressed"] diff --git a/scenes/workshop.gd b/scenes/workshop.gd new file mode 100644 index 0000000..9b993a5 --- /dev/null +++ b/scenes/workshop.gd @@ -0,0 +1,19 @@ +extends Control + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass + + +func _on_goto_ewaste_pressed() -> void: + get_tree().change_scene_to_file("res://scenes/ewaste.tscn") + + +func _on_goto_computer_pressed() -> void: + get_tree().change_scene_to_file("res://scenes/computer.tscn") diff --git a/scenes/workshop.gd.uid b/scenes/workshop.gd.uid new file mode 100644 index 0000000..9acd767 --- /dev/null +++ b/scenes/workshop.gd.uid @@ -0,0 +1 @@ +uid://bla0gy2tlqwe1 diff --git a/scenes/workshop.tscn b/scenes/workshop.tscn new file mode 100644 index 0000000..686b3d9 --- /dev/null +++ b/scenes/workshop.tscn @@ -0,0 +1,52 @@ +[gd_scene load_steps=4 format=3 uid="uid://dbxymsdyvbe2p"] + +[ext_resource type="Texture2D" uid="uid://dhyryjblax7sj" path="res://assets/workshop.png" id="1_d7fqo"] +[ext_resource type="Script" uid="uid://bla0gy2tlqwe1" path="res://scenes/workshop.gd" id="1_g1tdj"] +[ext_resource type="PackedScene" uid="uid://f06ym5ujhdsc" path="res://inv_system/crafting_panel.tscn" id="2_wwo6w"] + +[node name="Workshop" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +script = ExtResource("1_g1tdj") + +[node name="TextureRect" type="TextureRect" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +texture = ExtResource("1_d7fqo") +expand_mode = 3 + +[node name="GotoEwaste" type="Button" parent="."] +layout_mode = 0 +offset_left = 611.0 +offset_top = 469.0 +offset_right = 757.0 +offset_bottom = 500.0 +text = "Go to ewaste bins" + +[node name="GotoComputer" type="Button" parent="."] +layout_mode = 0 +offset_left = 614.0 +offset_top = 522.0 +offset_right = 760.0 +offset_bottom = 553.0 +text = "Go to computer" + +[node name="CraftingPanel" parent="." instance=ExtResource("2_wwo6w")] +layout_mode = 0 +offset_left = 874.0 +offset_top = 149.0 +offset_right = 1087.0 +offset_bottom = 442.0 + +[connection signal="pressed" from="GotoEwaste" to="." method="_on_goto_ewaste_pressed"] +[connection signal="pressed" from="GotoComputer" to="." method="_on_goto_computer_pressed"] diff --git a/time_system/clock.tscn b/time_system/clock.tscn index 8ef2f5e..3c90ee1 100644 --- a/time_system/clock.tscn +++ b/time_system/clock.tscn @@ -9,6 +9,7 @@ font_size = 32 [node name="Clock" type="Control" node_paths=PackedStringArray("bar", "timer_text")] +z_index = 2 layout_mode = 3 anchors_preset = 15 anchor_right = 1.0