diff --git a/assets/item images/computer.png b/assets/item images/computer.png new file mode 100644 index 0000000..75d5548 Binary files /dev/null and b/assets/item images/computer.png differ diff --git a/assets/item images/computer.png.import b/assets/item images/computer.png.import new file mode 100644 index 0000000..b5f27ff --- /dev/null +++ b/assets/item images/computer.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b2vn26davyrou" +path="res://.godot/imported/computer.png-56a6c9d41c622b370669e31b733b295f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/item images/computer.png" +dest_files=["res://.godot/imported/computer.png-56a6c9d41c622b370669e31b733b295f.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/item images/cpu.png b/assets/item images/cpu.png new file mode 100644 index 0000000..332c17d Binary files /dev/null and b/assets/item images/cpu.png differ diff --git a/assets/item images/cpu.png.import b/assets/item images/cpu.png.import new file mode 100644 index 0000000..63ae52e --- /dev/null +++ b/assets/item images/cpu.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dsbbhu2l7gmwf" +path="res://.godot/imported/cpu.png-229e4889e2add3acc7e36f3d5ce30c64.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/item images/cpu.png" +dest_files=["res://.godot/imported/cpu.png-229e4889e2add3acc7e36f3d5ce30c64.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/item images/dvd drive.png b/assets/item images/dvd drive.png new file mode 100644 index 0000000..266b3e8 Binary files /dev/null and b/assets/item images/dvd drive.png differ diff --git a/assets/item images/dvd drive.png.import b/assets/item images/dvd drive.png.import new file mode 100644 index 0000000..906c634 --- /dev/null +++ b/assets/item images/dvd drive.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dqbf4cmu0wm77" +path="res://.godot/imported/dvd drive.png-740a18b2da69134cc5d6381a5dcb5902.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/item images/dvd drive.png" +dest_files=["res://.godot/imported/dvd drive.png-740a18b2da69134cc5d6381a5dcb5902.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/item images/gpu.png b/assets/item images/gpu.png new file mode 100644 index 0000000..6a694e3 Binary files /dev/null and b/assets/item images/gpu.png differ diff --git a/assets/item images/gpu.png.import b/assets/item images/gpu.png.import new file mode 100644 index 0000000..baee884 --- /dev/null +++ b/assets/item images/gpu.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://8qvirlis0y5t" +path="res://.godot/imported/gpu.png-5eef8d40a91667eef0607c665ef08271.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/item images/gpu.png" +dest_files=["res://.godot/imported/gpu.png-5eef8d40a91667eef0607c665ef08271.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/item images/plastic.avif b/assets/item images/plastic.avif new file mode 100644 index 0000000..2d1bb40 Binary files /dev/null and b/assets/item images/plastic.avif differ diff --git a/assets/item images/plastic.png b/assets/item images/plastic.png new file mode 100644 index 0000000..c46f395 Binary files /dev/null and b/assets/item images/plastic.png differ diff --git a/assets/item images/plastic.png.import b/assets/item images/plastic.png.import new file mode 100644 index 0000000..2cc4b58 --- /dev/null +++ b/assets/item images/plastic.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b7tii4smwcurc" +path="res://.godot/imported/plastic.png-9500087059861bc8aae43ba8e496ab9a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/item images/plastic.png" +dest_files=["res://.godot/imported/plastic.png-9500087059861bc8aae43ba8e496ab9a.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/crafting/crafts/computer_craft.tres b/crafting/crafts/computer_craft.tres index f7c86b9..3f14ce2 100644 --- a/crafting/crafts/computer_craft.tres +++ b/crafting/crafts/computer_craft.tres @@ -1,13 +1,17 @@ -[gd_resource type="Resource" script_class="CraftRecipe" load_steps=6 format=3 uid="uid://dp4hnei3ur6oe"] +[gd_resource type="Resource" script_class="CraftRecipe" load_steps=10 format=3 uid="uid://dp4hnei3ur6oe"] [ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="1_ayiw2"] [ext_resource type="Script" uid="uid://b4iu5xrdf0evs" path="res://crafting/craft_recipe.gd" id="2_2p7jb"] +[ext_resource type="Resource" uid="uid://cnr1k8seffsxb" path="res://items/plastic.tres" id="2_ccdvw"] [ext_resource type="Resource" uid="uid://88v5bcyrgpob" path="res://items/large_psu_item.tres" id="2_egxug"] [ext_resource type="Resource" uid="uid://bepkdyf7dn1y0" path="res://items/hdd_item.tres" id="3_ccdvw"] [ext_resource type="Resource" uid="uid://c2wbqelme8vy1" path="res://items/ram_item.tres" id="4_tkhhn"] +[ext_resource type="Resource" uid="uid://bufa63unuppu5" path="res://items/cpu.tres" id="5_tkhhn"] +[ext_resource type="Resource" uid="uid://oc57emfpcnm0" path="res://items/gpu.tres" id="6_r0qw7"] +[ext_resource type="Resource" uid="uid://8vw85c1qrypm" path="res://items/computer.tres" id="8_uomls"] [resource] script = ExtResource("2_2p7jb") -ingredients = Array[ExtResource("1_ayiw2")]([ExtResource("2_egxug"), ExtResource("4_tkhhn"), ExtResource("3_ccdvw"), null, null, null, null, null, null]) -output = ExtResource("4_tkhhn") +ingredients = Array[ExtResource("1_ayiw2")]([ExtResource("2_ccdvw"), ExtResource("4_tkhhn"), ExtResource("2_ccdvw"), ExtResource("3_ccdvw"), ExtResource("5_tkhhn"), ExtResource("6_r0qw7"), ExtResource("2_ccdvw"), ExtResource("2_egxug"), ExtResource("2_ccdvw")]) +output = ExtResource("8_uomls") metadata/_custom_type_script = "uid://b4iu5xrdf0evs" diff --git a/crafting/scavenges/testScavenge.tres b/crafting/scavenges/large_psu_scav.tres similarity index 70% rename from crafting/scavenges/testScavenge.tres rename to crafting/scavenges/large_psu_scav.tres index fac0af4..52e810f 100644 --- a/crafting/scavenges/testScavenge.tres +++ b/crafting/scavenges/large_psu_scav.tres @@ -1,9 +1,10 @@ -[gd_resource type="Resource" script_class="ScavengeRecipe" load_steps=6 format=3 uid="uid://deohei5avmspt"] +[gd_resource type="Resource" script_class="ScavengeRecipe" load_steps=8 format=3 uid="uid://deohei5avmspt"] [ext_resource type="Resource" uid="uid://88v5bcyrgpob" path="res://items/large_psu_item.tres" id="1_20hhf"] [ext_resource type="Script" uid="uid://boqr1fowaqmt0" path="res://crafting/scavenge_recipe.gd" id="2_20hhf"] [ext_resource type="Script" uid="uid://oa5rlx6ttwuj" path="res://crafting/rollableLoot.gd" id="2_i5wfm"] [ext_resource type="Resource" uid="uid://swd1m0hvep4c" path="res://items/small_psu_item.tres" id="3_svciw"] +[ext_resource type="Resource" uid="uid://cnr1k8seffsxb" path="res://items/plastic.tres" id="4_svciw"] [sub_resource type="Resource" id="Resource_rhaxb"] script = ExtResource("2_i5wfm") @@ -11,9 +12,15 @@ item = ExtResource("3_svciw") chance = 1 metadata/_custom_type_script = "uid://oa5rlx6ttwuj" +[sub_resource type="Resource" id="Resource_wkxe4"] +script = ExtResource("2_i5wfm") +item = ExtResource("4_svciw") +chance = 3 +metadata/_custom_type_script = "uid://oa5rlx6ttwuj" + [resource] script = ExtResource("2_20hhf") input = ExtResource("1_20hhf") rolls = 2 -loot_pool = Array[ExtResource("2_i5wfm")]([SubResource("Resource_rhaxb")]) +loot_pool = Array[ExtResource("2_i5wfm")]([SubResource("Resource_rhaxb"), SubResource("Resource_wkxe4")]) metadata/_custom_type_script = "uid://boqr1fowaqmt0" diff --git a/crafting/scavenges/small_psu_scav.tres b/crafting/scavenges/small_psu_scav.tres new file mode 100644 index 0000000..23cbba4 --- /dev/null +++ b/crafting/scavenges/small_psu_scav.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="ScavengeRecipe" load_steps=6 format=3 uid="uid://dpnp3xlwhla4h"] + +[ext_resource type="Script" uid="uid://oa5rlx6ttwuj" path="res://crafting/rollableLoot.gd" id="2_r41g5"] +[ext_resource type="Resource" uid="uid://swd1m0hvep4c" path="res://items/small_psu_item.tres" id="3_klubo"] +[ext_resource type="Resource" uid="uid://cnr1k8seffsxb" path="res://items/plastic.tres" id="4_vxo6p"] +[ext_resource type="Script" uid="uid://boqr1fowaqmt0" path="res://crafting/scavenge_recipe.gd" id="5_ewtie"] + +[sub_resource type="Resource" id="Resource_wkxe4"] +script = ExtResource("2_r41g5") +item = ExtResource("4_vxo6p") +chance = 3 +metadata/_custom_type_script = "uid://oa5rlx6ttwuj" + +[resource] +script = ExtResource("5_ewtie") +input = ExtResource("3_klubo") +rolls = 1 +loot_pool = Array[ExtResource("2_r41g5")]([SubResource("Resource_wkxe4")]) +metadata/_custom_type_script = "uid://boqr1fowaqmt0" diff --git a/inv_system/crafting_panel.tscn b/inv_system/crafting_panel.tscn index cbd56bb..6c94a31 100644 --- a/inv_system/crafting_panel.tscn +++ b/inv_system/crafting_panel.tscn @@ -1,11 +1,12 @@ -[gd_scene load_steps=11 format=3 uid="uid://f06ym5ujhdsc"] +[gd_scene load_steps=12 format=3 uid="uid://f06ym5ujhdsc"] [ext_resource type="Script" uid="uid://br4fgimf7nygr" path="res://inv_system/crafting_panel.gd" id="1_441s3"] [ext_resource type="PackedScene" uid="uid://dgqs20xf7l8c" path="res://inv_system/item_slot.tscn" id="2_h0v0h"] [ext_resource type="Script" uid="uid://b4iu5xrdf0evs" path="res://crafting/craft_recipe.gd" id="2_ytbts"] [ext_resource type="Resource" uid="uid://dp4hnei3ur6oe" path="res://crafting/crafts/computer_craft.tres" id="3_4h4i0"] [ext_resource type="Script" uid="uid://boqr1fowaqmt0" path="res://crafting/scavenge_recipe.gd" id="4_qjage"] -[ext_resource type="Resource" uid="uid://deohei5avmspt" path="res://crafting/scavenges/testScavenge.tres" id="5_8c40c"] +[ext_resource type="Resource" uid="uid://deohei5avmspt" path="res://crafting/scavenges/large_psu_scav.tres" id="5_8c40c"] +[ext_resource type="Resource" uid="uid://dpnp3xlwhla4h" path="res://crafting/scavenges/small_psu_scav.tres" id="6_8c40c"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_h0v0h"] content_margin_left = 0.0 @@ -87,7 +88,7 @@ offset_bottom = 382.0 script = ExtResource("1_441s3") action_button = NodePath("MarginContainer/VBoxContainer/ActionButton") craft_recipes = Array[ExtResource("2_ytbts")]([ExtResource("3_4h4i0")]) -scavenge_recipes = Array[ExtResource("4_qjage")]([ExtResource("5_8c40c")]) +scavenge_recipes = Array[ExtResource("4_qjage")]([ExtResource("5_8c40c"), ExtResource("6_8c40c")]) assemble_style = SubResource("StyleBoxFlat_h0v0h") assemble_style_hover = SubResource("StyleBoxFlat_441s3") assemble_style_pressed = SubResource("StyleBoxFlat_h0v0h") diff --git a/items/computer.tres b/items/computer.tres new file mode 100644 index 0000000..df072c7 --- /dev/null +++ b/items/computer.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3 uid="uid://8vw85c1qrypm"] + +[ext_resource type="Texture2D" uid="uid://b2vn26davyrou" path="res://assets/item images/computer.png" id="1_e0dbh"] +[ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="2_x7wm3"] + +[resource] +script = ExtResource("2_x7wm3") +item_name = "Computer" +icon = ExtResource("1_e0dbh") +metadata/_custom_type_script = "uid://dccraom7a7e8d" diff --git a/items/cpu.tres b/items/cpu.tres new file mode 100644 index 0000000..7a325ed --- /dev/null +++ b/items/cpu.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3 uid="uid://bufa63unuppu5"] + +[ext_resource type="Texture2D" uid="uid://dsbbhu2l7gmwf" path="res://assets/item images/cpu.png" id="1_mh86d"] +[ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="2_pbx7r"] + +[resource] +script = ExtResource("2_pbx7r") +item_name = "CPU" +icon = ExtResource("1_mh86d") +metadata/_custom_type_script = "uid://dccraom7a7e8d" diff --git a/items/gpu.tres b/items/gpu.tres new file mode 100644 index 0000000..05c82bb --- /dev/null +++ b/items/gpu.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3 uid="uid://oc57emfpcnm0"] + +[ext_resource type="Texture2D" uid="uid://8qvirlis0y5t" path="res://assets/item images/gpu.png" id="1_p14l2"] +[ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="2_jiyv5"] + +[resource] +script = ExtResource("2_jiyv5") +item_name = "GPU" +icon = ExtResource("1_p14l2") +metadata/_custom_type_script = "uid://dccraom7a7e8d" diff --git a/items/plastic.tres b/items/plastic.tres new file mode 100644 index 0000000..d5eb6a3 --- /dev/null +++ b/items/plastic.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3 uid="uid://cnr1k8seffsxb"] + +[ext_resource type="Texture2D" uid="uid://b7tii4smwcurc" path="res://assets/item images/plastic.png" id="1_2haha"] +[ext_resource type="Script" uid="uid://dccraom7a7e8d" path="res://inv_system/item_data.gd" id="2_31pxd"] + +[resource] +script = ExtResource("2_31pxd") +item_name = "Plastic Scrap" +icon = ExtResource("1_2haha") +metadata/_custom_type_script = "uid://dccraom7a7e8d" diff --git a/scenes/ewaste.tscn b/scenes/ewaste.tscn index 6b26845..fef7489 100644 --- a/scenes/ewaste.tscn +++ b/scenes/ewaste.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://dsfal3m4siap2"] +[gd_scene load_steps=14 format=3 uid="uid://dsfal3m4siap2"] [ext_resource type="Script" uid="uid://c6oycdae5wvjf" path="res://inv_system/inventory.gd" id="1_6uqi0"] [ext_resource type="Texture2D" uid="uid://dj487wauiay6i" path="res://assets/ewase bins.png" id="1_g14j6"] @@ -10,6 +10,8 @@ [ext_resource type="Resource" uid="uid://88v5bcyrgpob" path="res://items/large_psu_item.tres" id="6_77dp3"] [ext_resource type="Resource" uid="uid://swd1m0hvep4c" path="res://items/small_psu_item.tres" id="7_5tkv4"] [ext_resource type="PackedScene" uid="uid://dgqs20xf7l8c" path="res://inv_system/item_slot.tscn" id="7_xersf"] +[ext_resource type="Resource" uid="uid://bufa63unuppu5" path="res://items/cpu.tres" id="8_6pgwd"] +[ext_resource type="Resource" uid="uid://oc57emfpcnm0" path="res://items/gpu.tres" id="9_p1n6o"] [sub_resource type="LabelSettings" id="LabelSettings_00tp4"] font_color = Color(1, 0, 0, 0.5764706) @@ -25,7 +27,7 @@ mouse_filter = 2 script = ExtResource("1_vbegm") bin_inventory = NodePath("BinPanel") loot_button = NodePath("LootButton") -loot_pool = Array[ExtResource("2_ehkex")]([ExtResource("3_ykrsh"), ExtResource("5_g14j6"), ExtResource("5_00tp4"), ExtResource("6_77dp3"), ExtResource("7_5tkv4")]) +loot_pool = Array[ExtResource("2_ehkex")]([ExtResource("3_ykrsh"), ExtResource("5_g14j6"), ExtResource("5_00tp4"), ExtResource("6_77dp3"), ExtResource("7_5tkv4"), ExtResource("8_6pgwd"), ExtResource("9_p1n6o")]) [node name="TextureRect" type="TextureRect" parent="."] z_index = -3