diff --git a/.import/SpeachBubbleBoarder.png-0786cb6596266c43c2897b48768509b4.md5 b/.import/SpeachBubbleBoarder.png-0786cb6596266c43c2897b48768509b4.md5 new file mode 100644 index 0000000..31e5fdc --- /dev/null +++ b/.import/SpeachBubbleBoarder.png-0786cb6596266c43c2897b48768509b4.md5 @@ -0,0 +1,3 @@ +source_md5="1afadd3459ddb7b78e6669c526651180" +dest_md5="19e5204b1bb2d917695fd5b339de1fbb" + diff --git a/.import/SpeachBubbleBoarder.png-0786cb6596266c43c2897b48768509b4.stex b/.import/SpeachBubbleBoarder.png-0786cb6596266c43c2897b48768509b4.stex new file mode 100644 index 0000000..1924ead Binary files /dev/null and b/.import/SpeachBubbleBoarder.png-0786cb6596266c43c2897b48768509b4.stex differ diff --git a/.import/audiomass-output.wav-21e30f277c6810056ae2ac69d18a8505.md5 b/.import/audiomass-output.wav-21e30f277c6810056ae2ac69d18a8505.md5 new file mode 100644 index 0000000..9759e0d --- /dev/null +++ b/.import/audiomass-output.wav-21e30f277c6810056ae2ac69d18a8505.md5 @@ -0,0 +1,3 @@ +source_md5="234c50bbca2b4efd5e8f224cac7a97d4" +dest_md5="785da3313ab2007ba05226a847a27b81" + diff --git a/.import/audiomass-output.wav-21e30f277c6810056ae2ac69d18a8505.sample b/.import/audiomass-output.wav-21e30f277c6810056ae2ac69d18a8505.sample new file mode 100644 index 0000000..df8fe32 Binary files /dev/null and b/.import/audiomass-output.wav-21e30f277c6810056ae2ac69d18a8505.sample differ diff --git a/.import/johns stuff.png-9553cc5c7efecf673119bbf1f8c618ad.md5 b/.import/johns stuff.png-9553cc5c7efecf673119bbf1f8c618ad.md5 new file mode 100644 index 0000000..2e571ef --- /dev/null +++ b/.import/johns stuff.png-9553cc5c7efecf673119bbf1f8c618ad.md5 @@ -0,0 +1,3 @@ +source_md5="e88bd6356e251113c4c2b4474b4bf118" +dest_md5="d968743f7ce8640f84c0a1c69c8e4199" + diff --git a/.import/johns stuff.png-9553cc5c7efecf673119bbf1f8c618ad.stex b/.import/johns stuff.png-9553cc5c7efecf673119bbf1f8c618ad.stex new file mode 100644 index 0000000..93c24d5 Binary files /dev/null and b/.import/johns stuff.png-9553cc5c7efecf673119bbf1f8c618ad.stex differ diff --git a/.import/standard.wav-6cbb1d720a44f344dac3627128720328.md5 b/.import/standard.wav-6cbb1d720a44f344dac3627128720328.md5 new file mode 100644 index 0000000..9759e0d --- /dev/null +++ b/.import/standard.wav-6cbb1d720a44f344dac3627128720328.md5 @@ -0,0 +1,3 @@ +source_md5="234c50bbca2b4efd5e8f224cac7a97d4" +dest_md5="785da3313ab2007ba05226a847a27b81" + diff --git a/.import/standard.wav-6cbb1d720a44f344dac3627128720328.sample b/.import/standard.wav-6cbb1d720a44f344dac3627128720328.sample new file mode 100644 index 0000000..df8fe32 Binary files /dev/null and b/.import/standard.wav-6cbb1d720a44f344dac3627128720328.sample differ diff --git a/Global_Game.gd b/Global_Game.gd index 6429d05..cfd4df0 100644 --- a/Global_Game.gd +++ b/Global_Game.gd @@ -6,4 +6,4 @@ func RenderSpeech(load_on, text): var speech = preload("res://GameScenes/speech_bubble/Speech.tscn").instance() speech.bubble_text = text speech.set_position(Vector2(0,-40)) - load_on.add_child(speech) \ No newline at end of file + load_on.add_child(speech) diff --git a/MiscCodes/KinematicBody2D.gd b/MiscCodes/KinematicBody2D.gd index 7e3eb66..897487c 100644 --- a/MiscCodes/KinematicBody2D.gd +++ b/MiscCodes/KinematicBody2D.gd @@ -51,11 +51,13 @@ func InteractWithCell(): Global.AddInventoryItem(plant_cell_mouse/2, 1) plants_map.set_cell(int(world_position[0] / cell_size.x), int(world_position[1] / cell_size.y), (plant_cell_mouse-1)) AnimationOnInteraction(1) + SoundOnInteraction() Global.Save() elif plant_cell_character > 0 and plant_cell_character % 2 == 0: Global.AddInventoryItem(plant_cell_character/2, 1) plants_map.set_cell(int(self.position.x / cell_size.x), int(self.position.y / cell_size.y), (plant_cell_character-1)) AnimationOnInteraction(1) + SoundOnInteraction() else: #space is now a test function GlobalGameFunctions.RenderSpeech(self, "joe") @@ -77,16 +79,13 @@ func AnimationOnInteraction(Item): print("Item = ", Item, " Animation") var itemimage = TextureRect.new() var item = null -# item = ItemClass.instance() -# item.set("id", self.id) -# add_child(item) -# itemimage.texture = load(Global.player_inventory_items[Item].item_id) - -# itemimage.texture = load("res://pictures/inventory_iconpictures/food_items/herbs/saffron.png") -# itemimage.set_position(Vector2(randf()*20-40, randf()*40-20)) -# add_child(itemimage) -# yield(get_tree().create_timer(1.0), "timeout") -# remove_child(itemimage) + +func SoundOnInteraction(): + var CorrectSound = preload("res://Sounds/standard.wav") + $AudioStreamPlayer.stream = CorrectSound + $AudioStreamPlayer.play() + + pass func _ready(): Global.player_inventory_items = Database.GetInventoryItems().duplicate() diff --git a/MiscCodes/Menu.gd b/MiscCodes/Menu.gd index 248d695..3d08818 100644 --- a/MiscCodes/Menu.gd +++ b/MiscCodes/Menu.gd @@ -18,6 +18,7 @@ func _on_Btn_PlayGame_pressed(): game_data.init_map(150, 150, "res://omgeving/Floor.tres",map_data, "res://omgeving/Floor.tres", map_data, "res://omgeving/Floor.tres", map_data, "res://omgeving/Floor.tres", map_data) var game = load("res://base_tilemap/base_tilemap.tscn").instance() game.load_scene(game_data) + #save this scene to global scenes Global.AddScene(self, "menu", false) diff --git a/Sounds/audiomass-output.wav.import b/Sounds/audiomass-output.wav.import new file mode 100644 index 0000000..8bd12b9 --- /dev/null +++ b/Sounds/audiomass-output.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/audiomass-output.wav-21e30f277c6810056ae2ac69d18a8505.sample" + +[deps] + +source_file="res://Sounds/audiomass-output.wav" +dest_files=[ "res://.import/audiomass-output.wav-21e30f277c6810056ae2ac69d18a8505.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/Sounds/standard.wav b/Sounds/standard.wav new file mode 100644 index 0000000..be404c5 Binary files /dev/null and b/Sounds/standard.wav differ diff --git a/Sounds/standard.wav.import b/Sounds/standard.wav.import new file mode 100644 index 0000000..71104e5 --- /dev/null +++ b/Sounds/standard.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/standard.wav-6cbb1d720a44f344dac3627128720328.sample" + +[deps] + +source_file="res://Sounds/standard.wav" +dest_files=[ "res://.import/standard.wav-6cbb1d720a44f344dac3627128720328.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/base_tilemap/base_tilemap.tscn b/base_tilemap/base_tilemap.tscn index 0bf90ef..77bf8d7 100644 --- a/base_tilemap/base_tilemap.tscn +++ b/base_tilemap/base_tilemap.tscn @@ -91,7 +91,6 @@ rotation = -3.14158 scale = Vector2( 1.22003, 1.11562 ) z_index = 13 normal = ExtResource( 11 ) -action = "settings_button" [node name="Map" type="TouchScreenButton" parent="Camera2D/Interactive/GameButtons"] position = Vector2( 88.136, 1376.12 ) @@ -183,12 +182,11 @@ z_index = 11 shape = SubResource( 2 ) action = "map_interaction" -[node name="Tween" type="Tween" parent="."] - -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Player"] pause_mode = 2 stream = ExtResource( 17 ) -autoplay = true + +[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/MoveDown" to="Player" method="_on_TouchScreenButton_pressed"] [connection signal="pressed" from="Camera2D/Interactive/GameButtons/MoveRight" to="Player" method="_on_TouchScreenButton_pressed"] diff --git a/kbscene/map.tscn b/kbscene/map.tscn index 217ea76..29f04fc 100644 --- a/kbscene/map.tscn +++ b/kbscene/map.tscn @@ -1,28 +1,9 @@ -[gd_scene load_steps=2 format=2] +[gd_scene format=2] -[ext_resource path="res://tileset.res" type="TileSet" id=1] +[node name="Node" type="Node"] -[node name="Node" type="Node" index="0"] - -[node name="TileMap" type="TileMap" parent="." index="0"] - -mode = 0 -tile_set = ExtResource( 1 ) +[node name="TileMap" type="TileMap" parent="."] cell_size = Vector2( 50, 50 ) -cell_quadrant_size = 16 cell_custom_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -cell_half_offset = 2 -cell_tile_origin = 0 -cell_y_sort = false -cell_clip_uv = false -collision_use_kinematic = false -collision_friction = 1.0 -collision_bounce = 0.0 -collision_layer = 1 -collision_mask = 1 -occluder_light_mask = 1 format = 1 tile_data = PoolIntArray( 0, 0, 0, 65536, 0, 0, 131072, 0, 0, 196608, 0, 0, 196612, 2, 0, 196613, 1, 0, 196614, 1, 0, 196615, 3, 0, 262144, 0, 0, 262145, 1, 0, 262146, 1, 0, 262147, 1, 0, 262148, 0, 0, 262149, 0, 0, 262150, 0, 0, 262151, 0, 0, 262152, 1, 0, 262153, 1, 0 ) -_sections_unfolded = [ "Cell" ] - - diff --git a/omgeving/vloer32x32/johns stuff.png.import b/omgeving/vloer32x32/johns stuff.png.import new file mode 100644 index 0000000..e71d07c --- /dev/null +++ b/omgeving/vloer32x32/johns stuff.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/johns stuff.png-9553cc5c7efecf673119bbf1f8c618ad.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://omgeving/vloer32x32/johns stuff.png" +dest_files=[ "res://.import/johns stuff.png-9553cc5c7efecf673119bbf1f8c618ad.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0