diff --git a/.import/armor slot.png-28fb9a34be0da7964e205e6aa5dd858e.md5 b/.import/armor slot.png-28fb9a34be0da7964e205e6aa5dd858e.md5 new file mode 100644 index 0000000..f06adf4 --- /dev/null +++ b/.import/armor slot.png-28fb9a34be0da7964e205e6aa5dd858e.md5 @@ -0,0 +1,3 @@ +source_md5="8ee3e5ac670b22f92308f7b2ab4bd20a" +dest_md5="34c187d4000533ead67e2e58d24e524a" + diff --git a/.import/armor slot.png-28fb9a34be0da7964e205e6aa5dd858e.stex b/.import/armor slot.png-28fb9a34be0da7964e205e6aa5dd858e.stex new file mode 100644 index 0000000..b25283b Binary files /dev/null and b/.import/armor slot.png-28fb9a34be0da7964e205e6aa5dd858e.stex differ diff --git a/.import/background_ts.png-a5363f63cd6ab350fb8a575c008fe06e.md5 b/.import/background_ts.png-a5363f63cd6ab350fb8a575c008fe06e.md5 new file mode 100644 index 0000000..7a90153 --- /dev/null +++ b/.import/background_ts.png-a5363f63cd6ab350fb8a575c008fe06e.md5 @@ -0,0 +1,3 @@ +source_md5="6f0a2c3ecf6f7d3e9d5f30dcb4b55e7d" +dest_md5="eff13f3a41ea92a86a6b54eafb0933fe" + diff --git a/.import/background_ts.png-a5363f63cd6ab350fb8a575c008fe06e.stex b/.import/background_ts.png-a5363f63cd6ab350fb8a575c008fe06e.stex new file mode 100644 index 0000000..fa84058 Binary files /dev/null and b/.import/background_ts.png-a5363f63cd6ab350fb8a575c008fe06e.stex differ diff --git a/.import/berries.png-a098b38cace86f4a86643ba45a8a4cc2.md5 b/.import/berries.png-a098b38cace86f4a86643ba45a8a4cc2.md5 new file mode 100644 index 0000000..2679d19 --- /dev/null +++ b/.import/berries.png-a098b38cace86f4a86643ba45a8a4cc2.md5 @@ -0,0 +1,3 @@ +source_md5="2c113916a065741d0cc642d26cd8a04d" +dest_md5="8e438554a0d21bd5136ce2983442e25b" + diff --git a/.import/berries.png-a098b38cace86f4a86643ba45a8a4cc2.stex b/.import/berries.png-a098b38cace86f4a86643ba45a8a4cc2.stex new file mode 100644 index 0000000..b4f6233 Binary files /dev/null and b/.import/berries.png-a098b38cace86f4a86643ba45a8a4cc2.stex differ diff --git a/.import/boots slot.png-7c742e4b543df7469a75d3167872cefa.md5 b/.import/boots slot.png-7c742e4b543df7469a75d3167872cefa.md5 new file mode 100644 index 0000000..d6ec539 --- /dev/null +++ b/.import/boots slot.png-7c742e4b543df7469a75d3167872cefa.md5 @@ -0,0 +1,3 @@ +source_md5="802301342e892d17337e54334fd32420" +dest_md5="cecbceb6af35c5d179bd45f8a37e5813" + diff --git a/.import/boots slot.png-7c742e4b543df7469a75d3167872cefa.stex b/.import/boots slot.png-7c742e4b543df7469a75d3167872cefa.stex new file mode 100644 index 0000000..1b012b3 Binary files /dev/null and b/.import/boots slot.png-7c742e4b543df7469a75d3167872cefa.stex differ diff --git a/.import/helmet slot.png-ef09a2068fc26f0f078ea66987bcb7d2.md5 b/.import/helmet slot.png-ef09a2068fc26f0f078ea66987bcb7d2.md5 new file mode 100644 index 0000000..ed10ee7 --- /dev/null +++ b/.import/helmet slot.png-ef09a2068fc26f0f078ea66987bcb7d2.md5 @@ -0,0 +1,3 @@ +source_md5="6d1512338894f88448629735f5c73943" +dest_md5="e2ba1338fcf95b95d2dd10699303686d" + diff --git a/.import/helmet slot.png-ef09a2068fc26f0f078ea66987bcb7d2.stex b/.import/helmet slot.png-ef09a2068fc26f0f078ea66987bcb7d2.stex new file mode 100644 index 0000000..00f8300 Binary files /dev/null and b/.import/helmet slot.png-ef09a2068fc26f0f078ea66987bcb7d2.stex differ diff --git a/.import/leggings armor slot.png-efa6a4f3577b4a9d887c37c942883a01.md5 b/.import/leggings armor slot.png-efa6a4f3577b4a9d887c37c942883a01.md5 new file mode 100644 index 0000000..78741ed --- /dev/null +++ b/.import/leggings armor slot.png-efa6a4f3577b4a9d887c37c942883a01.md5 @@ -0,0 +1,3 @@ +source_md5="7dc4693cecb2f009651600079d58ae55" +dest_md5="005a87c00bec05842ddd94af62f78bf6" + diff --git a/.import/leggings armor slot.png-efa6a4f3577b4a9d887c37c942883a01.stex b/.import/leggings armor slot.png-efa6a4f3577b4a9d887c37c942883a01.stex new file mode 100644 index 0000000..df94667 Binary files /dev/null and b/.import/leggings armor slot.png-efa6a4f3577b4a9d887c37c942883a01.stex differ diff --git a/.import/night-chip.ogg-59475e6acfe3b53eba80c571db7db40c.md5 b/.import/night-chip.ogg-59475e6acfe3b53eba80c571db7db40c.md5 new file mode 100644 index 0000000..86e8e59 --- /dev/null +++ b/.import/night-chip.ogg-59475e6acfe3b53eba80c571db7db40c.md5 @@ -0,0 +1,3 @@ +source_md5="8a0a19789fac6a62e0e3288f2690fe9c" +dest_md5="ec9ac24fdf46184de2e1ae3987fa4f50" + diff --git a/.import/night-chip.ogg-59475e6acfe3b53eba80c571db7db40c.oggstr b/.import/night-chip.ogg-59475e6acfe3b53eba80c571db7db40c.oggstr new file mode 100644 index 0000000..0b9a5f7 Binary files /dev/null and b/.import/night-chip.ogg-59475e6acfe3b53eba80c571db7db40c.oggstr differ diff --git a/.import/shield slot.png-e8399ddc6f593dc7dbde3da4b9477732.md5 b/.import/shield slot.png-e8399ddc6f593dc7dbde3da4b9477732.md5 new file mode 100644 index 0000000..f5e763f --- /dev/null +++ b/.import/shield slot.png-e8399ddc6f593dc7dbde3da4b9477732.md5 @@ -0,0 +1,3 @@ +source_md5="fadf490880f8b390d85bc4107ef7997a" +dest_md5="7ff7db2442e1370866eacc4c80ce4c3f" + diff --git a/.import/shield slot.png-e8399ddc6f593dc7dbde3da4b9477732.stex b/.import/shield slot.png-e8399ddc6f593dc7dbde3da4b9477732.stex new file mode 100644 index 0000000..ec01b43 Binary files /dev/null and b/.import/shield slot.png-e8399ddc6f593dc7dbde3da4b9477732.stex differ diff --git a/.import/weapon slot primary.png-b62a0add76c37418893e1ac1a5fe2383.md5 b/.import/weapon slot primary.png-b62a0add76c37418893e1ac1a5fe2383.md5 new file mode 100644 index 0000000..850119b --- /dev/null +++ b/.import/weapon slot primary.png-b62a0add76c37418893e1ac1a5fe2383.md5 @@ -0,0 +1,3 @@ +source_md5="9b5e2de66ba740a182c441db619e2799" +dest_md5="e5ca79bc4cbdf685ecd8ad27fb9d94b2" + diff --git a/.import/weapon slot primary.png-b62a0add76c37418893e1ac1a5fe2383.stex b/.import/weapon slot primary.png-b62a0add76c37418893e1ac1a5fe2383.stex new file mode 100644 index 0000000..297219c Binary files /dev/null and b/.import/weapon slot primary.png-b62a0add76c37418893e1ac1a5fe2383.stex differ diff --git a/.import/wood_log.png-f6d5101b0118d43e396e1614cb788936.md5 b/.import/wood_log.png-f6d5101b0118d43e396e1614cb788936.md5 new file mode 100644 index 0000000..cc1c5d1 --- /dev/null +++ b/.import/wood_log.png-f6d5101b0118d43e396e1614cb788936.md5 @@ -0,0 +1,3 @@ +source_md5="df703cbc8863fe8b13664c73f5ccad47" +dest_md5="54ab1004b08e741af7d4865e3bffcafb" + diff --git a/.import/wood_log.png-f6d5101b0118d43e396e1614cb788936.stex b/.import/wood_log.png-f6d5101b0118d43e396e1614cb788936.stex new file mode 100644 index 0000000..1af8e4e Binary files /dev/null and b/.import/wood_log.png-f6d5101b0118d43e396e1614cb788936.stex differ diff --git a/MiscCodes/KinematicBody2D.gd b/MiscCodes/KinematicBody2D.gd index a632915..84633ec 100644 --- a/MiscCodes/KinematicBody2D.gd +++ b/MiscCodes/KinematicBody2D.gd @@ -8,6 +8,7 @@ onready var player = get_node("/root/base_scene/Player") onready var cell_size = background_map._get_cell_size() onready var plants_map = get_node("/root/base_scene/interaction_map") onready var interaction = get_node("/root/base_scene/player_interaction") +onready var sound = get_node("../AudioStreamPlayer") var velocity = Vector2() var world_position @@ -85,4 +86,3 @@ func AnimationOnInteraction(Item): func _ready(): Global.player_inventory_items = Database.GetInventoryItems().duplicate() - diff --git a/MiscCodes/background_script.gd b/MiscCodes/background_script.gd index 95d6b97..8dc5c98 100644 --- a/MiscCodes/background_script.gd +++ b/MiscCodes/background_script.gd @@ -17,6 +17,7 @@ func _unhandled_input(event): if(pl_tile != -1): set_cellv(pl_pos_tile, -1) +# for some obscure reason, this function only works on the background script, but not on the e.g. player script or Camera2D script. May have something to do with loading/scripts being active? func _on_Inventory_pressed(): var inventory_screen = preload("res://MiscScenes/Inventory.tscn").instance() Global.AddScene(inventory_screen, "inventory_screen", true) diff --git a/Savegames/storage.db b/Savegames/storage.db index ffab058..4d2a6d0 100644 Binary files a/Savegames/storage.db and b/Savegames/storage.db differ diff --git a/Sounds/night-chip.ogg b/Sounds/night-chip.ogg new file mode 100644 index 0000000..40eb57e Binary files /dev/null and b/Sounds/night-chip.ogg differ diff --git a/Sounds/night-chip.ogg.import b/Sounds/night-chip.ogg.import new file mode 100644 index 0000000..81eb9cf --- /dev/null +++ b/Sounds/night-chip.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/night-chip.ogg-59475e6acfe3b53eba80c571db7db40c.oggstr" + +[deps] + +source_file="res://Sounds/night-chip.ogg" +dest_files=[ "res://.import/night-chip.ogg-59475e6acfe3b53eba80c571db7db40c.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/addons/thejustinwalsh.castledb/thejustinwalsh.castledb_importer.gd b/addons/thejustinwalsh.castledb/thejustinwalsh.castledb_importer.gd index 68693e5..e6067ce 100644 --- a/addons/thejustinwalsh.castledb/thejustinwalsh.castledb_importer.gd +++ b/addons/thejustinwalsh.castledb/thejustinwalsh.castledb_importer.gd @@ -12,4 +12,4 @@ func _enter_tree(): func _exit_tree(): remove_import_plugin(import_plugin) - import_plugin = null \ No newline at end of file + import_plugin = null diff --git a/base_tilemap/base_tilemap.tscn b/base_tilemap/base_tilemap.tscn index 8c20f58..d083ceb 100644 --- a/base_tilemap/base_tilemap.tscn +++ b/base_tilemap/base_tilemap.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=20 format=2] [ext_resource path="res://MiscCodes/background_script.gd" type="Script" id=1] [ext_resource path="res://MiscCodes/Tilemap_CameraView.gd" type="Script" id=2] @@ -16,6 +16,7 @@ [ext_resource path="res://pictures/gui/buttons/LeftButtonPressed.png" type="Texture" id=14] [ext_resource path="res://pictures/gui/buttons/quick_item_button.png" type="Texture" id=15] [ext_resource path="res://base_tilemap/init.gd" type="Script" id=16] +[ext_resource path="res://Sounds/night-chip.ogg" type="AudioStream" id=17] [sub_resource type="CapsuleShape2D" id=1] radius = 20.0 @@ -182,6 +183,11 @@ shape = SubResource( 2 ) action = "map_interaction" [node name="Tween" type="Tween" parent="."] + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +pause_mode = 2 +stream = ExtResource( 17 ) +autoplay = true [connection signal="pressed" from="Camera2D/Interactive/GameButtons/Inventory" to="background" method="_on_Inventory_pressed"] [connection signal="pressed" from="Camera2D/Interactive/GameButtons/MoveDown" to="Player" method="_on_TouchScreenButton_pressed"] [connection signal="pressed" from="Camera2D/Interactive/GameButtons/MoveRight" to="Player" method="_on_TouchScreenButton_pressed"] diff --git a/river_intersection_home2.tscn b/river_intersection_home2.tscn index 4d9cdd4..f624704 100644 --- a/river_intersection_home2.tscn +++ b/river_intersection_home2.tscn @@ -292,6 +292,7 @@ visibility_mode = 1 script = ExtResource( 6 ) [node name="dev_statistics" type="MarginContainer" parent="Camera2D"] +visible = false margin_left = -615.0 margin_top = -300.0 margin_right = 614.0 @@ -327,6 +328,7 @@ action = "map_interaction" [node name="Tween" type="Tween" parent="."] [connection signal="pressed" from="Camera2D/Interactive/GameButtons/Inventory" to="background" method="_on_Inventory_pressed"] +[connection signal="pressed" from="Camera2D/Interactive/GameButtons/Inventory" to="Player" method="_on_Inventory_pressed"] [connection signal="pressed" from="Camera2D/Interactive/GameButtons/MoveDown" to="Player" method="_on_TouchScreenButton_pressed"] [connection signal="pressed" from="Camera2D/Interactive/GameButtons/MoveRight" to="Player" method="_on_TouchScreenButton_pressed"] [connection signal="pressed" from="Camera2D/Interactive/GameButtons/MoveUp" to="Player" method="_on_TouchScreenButton_pressed"]