diff --git a/README.md b/README.md index 6efc986..9385fac 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,9 @@ - [x] credit/replace images - square images that fit in the item slot box - [x] Disk drives scavenge to disks of varying rarity worth $$$ - [x] scavenge rolls can produce nothing? +- [x] balancing recipes +- [ ] sound effects +- [ ] mixed bag random? Submission day: Jan 19th 8AM diff --git a/crafting/scavenges/broken_laptop_scav.tres b/crafting/scavenges/broken_laptop_scav.tres index 9a3aa03..bda9817 100644 --- a/crafting/scavenges/broken_laptop_scav.tres +++ b/crafting/scavenges/broken_laptop_scav.tres @@ -14,7 +14,7 @@ [sub_resource type="Resource" id="Resource_yqdve"] script = ExtResource("2_01qcv") item = ExtResource("3_7kc11") -chance = 4 +chance = 3 metadata/_custom_type_script = "uid://oa5rlx6ttwuj" [sub_resource type="Resource" id="Resource_4mdbd"] diff --git a/crafting/scavenges/gpu_scav.tres b/crafting/scavenges/gpu_scav.tres index 83eac82..379fe4f 100644 --- a/crafting/scavenges/gpu_scav.tres +++ b/crafting/scavenges/gpu_scav.tres @@ -3,30 +3,30 @@ [ext_resource type="Resource" uid="uid://oc57emfpcnm0" path="res://items/gpu.tres" id="1_t0fjb"] [ext_resource type="Script" uid="uid://oa5rlx6ttwuj" path="res://crafting/rollableLoot.gd" id="2_n1ajs"] [ext_resource type="Resource" uid="uid://cnr1k8seffsxb" path="res://items/plastic.tres" id="3_t0fjb"] -[ext_resource type="Resource" uid="uid://bufa63unuppu5" path="res://items/cpu.tres" id="4_3aoas"] [ext_resource type="Script" uid="uid://boqr1fowaqmt0" path="res://crafting/scavenge_recipe.gd" id="4_bmsvv"] [ext_resource type="Resource" uid="uid://c2wbqelme8vy1" path="res://items/ram_item.tres" id="5_fut73"] +[ext_resource type="Resource" uid="uid://bjmledqi51eut" path="res://items/ssd_item.tres" id="6_bmsvv"] [sub_resource type="Resource" id="Resource_wkxe4"] script = ExtResource("2_n1ajs") item = ExtResource("3_t0fjb") -chance = 4 -metadata/_custom_type_script = "uid://oa5rlx6ttwuj" - -[sub_resource type="Resource" id="Resource_aq2uy"] -script = ExtResource("2_n1ajs") -item = ExtResource("4_3aoas") -chance = 1 +chance = 2 metadata/_custom_type_script = "uid://oa5rlx6ttwuj" [sub_resource type="Resource" id="Resource_7lonm"] script = ExtResource("2_n1ajs") item = ExtResource("5_fut73") +chance = 2 +metadata/_custom_type_script = "uid://oa5rlx6ttwuj" + +[sub_resource type="Resource" id="Resource_3aoas"] +script = ExtResource("2_n1ajs") +item = ExtResource("6_bmsvv") chance = 1 metadata/_custom_type_script = "uid://oa5rlx6ttwuj" [resource] script = ExtResource("4_bmsvv") input = ExtResource("1_t0fjb") -loot_pool = Array[ExtResource("2_n1ajs")]([SubResource("Resource_wkxe4"), SubResource("Resource_aq2uy"), SubResource("Resource_7lonm")]) +loot_pool = Array[ExtResource("2_n1ajs")]([SubResource("Resource_wkxe4"), SubResource("Resource_7lonm"), SubResource("Resource_3aoas")]) metadata/_custom_type_script = "uid://boqr1fowaqmt0" diff --git a/music/Godot Wild Jam #89 Demo.flac b/music/Godot Wild Jam #89 Demo.flac deleted file mode 100644 index f791919..0000000 Binary files a/music/Godot Wild Jam #89 Demo.flac and /dev/null differ diff --git a/music/Godot Wild Jam 89 Demo.ogg b/music/Godot Wild Jam 89 Demo.ogg deleted file mode 100644 index cfd66c9..0000000 Binary files a/music/Godot Wild Jam 89 Demo.ogg and /dev/null differ diff --git a/music/Godot Wild Jam 89 Demo.ogg.import b/music/Godot Wild Jam 89 Demo.ogg.import deleted file mode 100644 index 14fddbe..0000000 --- a/music/Godot Wild Jam 89 Demo.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://r5u2un1fds6m" -path="res://.godot/imported/Godot Wild Jam 89 Demo.ogg-9dcd0225c3667337807a990bcf2bd61f.oggvorbisstr" - -[deps] - -source_file="res://music/Godot Wild Jam 89 Demo.ogg" -dest_files=["res://.godot/imported/Godot Wild Jam 89 Demo.ogg-9dcd0225c3667337807a990bcf2bd61f.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/music/hopefully final v342.ogg b/music/hopefully final v342.ogg new file mode 100644 index 0000000..8103781 Binary files /dev/null and b/music/hopefully final v342.ogg differ diff --git a/music/hopefully final v342.ogg.import b/music/hopefully final v342.ogg.import new file mode 100644 index 0000000..1cd9897 --- /dev/null +++ b/music/hopefully final v342.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://8odrkmuwmp1m" +path="res://.godot/imported/hopefully final v342.ogg-b78af00dd7d3154595d959c5f6cb9d7f.oggvorbisstr" + +[deps] + +source_file="res://music/hopefully final v342.ogg" +dest_files=["res://.godot/imported/hopefully final v342.ogg-b78af00dd7d3154595d959c5f6cb9d7f.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/music/music_panel.gd b/music/music_panel.gd index d5b502e..1268ec1 100644 --- a/music/music_panel.gd +++ b/music/music_panel.gd @@ -4,7 +4,7 @@ extends Control # Called when the node enters the scene tree for the first time. func _ready() -> void: - _on_h_slider_value_changed(0.5) + _on_h_slider_value_changed(0.3) pass # Replace with function body. diff --git a/music/music_panel.tscn b/music/music_panel.tscn index 92651e7..7d87cca 100644 --- a/music/music_panel.tscn +++ b/music/music_panel.tscn @@ -2,7 +2,7 @@ [ext_resource type="Texture2D" uid="uid://6es1rrxgg6xs" path="res://assets/icons/volume-up.png" id="1_8ia4e"] [ext_resource type="Script" uid="uid://bjieium3xew23" path="res://music/music_panel.gd" id="1_52dcn"] -[ext_resource type="AudioStream" uid="uid://r5u2un1fds6m" path="res://music/Godot Wild Jam 89 Demo.ogg" id="3_yx23q"] +[ext_resource type="AudioStream" uid="uid://8odrkmuwmp1m" path="res://music/hopefully final v342.ogg" id="3_yx23q"] [node name="MusicPanel" type="Control" node_paths=PackedStringArray("ambient_player")] z_index = 4 @@ -49,7 +49,7 @@ layout_mode = 2 size_flags_vertical = 4 max_value = 1.0 step = 0.0 -value = 0.5 +value = 0.3 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource("3_yx23q") diff --git a/scenes/credits.tscn b/scenes/credits.tscn index 2de9855..b5ca442 100644 --- a/scenes/credits.tscn +++ b/scenes/credits.tscn @@ -143,6 +143,7 @@ alignment = 1 [node name="Kane" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/VBoxContainer/HFlowContainer" instance=ExtResource("9_ih6pn")] layout_mode = 2 +link = "https://kanealex.bandcamp.com/" item = SubResource("Resource_7lgdl") [node name="Label3" type="Label" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/VBoxContainer"] @@ -162,6 +163,7 @@ item = SubResource("Resource_qbfqv") [node name="Kane2" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/VBoxContainer/HFlowContainer2" instance=ExtResource("9_ih6pn")] layout_mode = 2 +link = "https://kanealex.bandcamp.com/" item = SubResource("Resource_x5q3x") [node name="Sarantis" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer/ScrollContainer/VBoxContainer/HFlowContainer2" instance=ExtResource("9_ih6pn")]