Added sound

This commit is contained in:
JonathanHerrewijnen 2021-06-04 22:57:48 +02:00
parent 73c763343b
commit 52eaa3c498
17 changed files with 105 additions and 38 deletions

View File

@ -0,0 +1,3 @@
source_md5="1afadd3459ddb7b78e6669c526651180"
dest_md5="19e5204b1bb2d917695fd5b339de1fbb"

View File

@ -0,0 +1,3 @@
source_md5="234c50bbca2b4efd5e8f224cac7a97d4"
dest_md5="785da3313ab2007ba05226a847a27b81"

View File

@ -0,0 +1,3 @@
source_md5="e88bd6356e251113c4c2b4474b4bf118"
dest_md5="d968743f7ce8640f84c0a1c69c8e4199"

View File

@ -0,0 +1,3 @@
source_md5="234c50bbca2b4efd5e8f224cac7a97d4"
dest_md5="785da3313ab2007ba05226a847a27b81"

View File

@ -6,4 +6,4 @@ func RenderSpeech(load_on, text):
var speech = preload("res://GameScenes/speech_bubble/Speech.tscn").instance() var speech = preload("res://GameScenes/speech_bubble/Speech.tscn").instance()
speech.bubble_text = text speech.bubble_text = text
speech.set_position(Vector2(0,-40)) speech.set_position(Vector2(0,-40))
load_on.add_child(speech) load_on.add_child(speech)

View File

@ -51,11 +51,13 @@ func InteractWithCell():
Global.AddInventoryItem(plant_cell_mouse/2, 1) 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)) plants_map.set_cell(int(world_position[0] / cell_size.x), int(world_position[1] / cell_size.y), (plant_cell_mouse-1))
AnimationOnInteraction(1) AnimationOnInteraction(1)
SoundOnInteraction()
Global.Save() Global.Save()
elif plant_cell_character > 0 and plant_cell_character % 2 == 0: elif plant_cell_character > 0 and plant_cell_character % 2 == 0:
Global.AddInventoryItem(plant_cell_character/2, 1) 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)) plants_map.set_cell(int(self.position.x / cell_size.x), int(self.position.y / cell_size.y), (plant_cell_character-1))
AnimationOnInteraction(1) AnimationOnInteraction(1)
SoundOnInteraction()
else: else:
#space is now a test function #space is now a test function
GlobalGameFunctions.RenderSpeech(self, "joe") GlobalGameFunctions.RenderSpeech(self, "joe")
@ -77,16 +79,13 @@ func AnimationOnInteraction(Item):
print("Item = ", Item, " Animation") print("Item = ", Item, " Animation")
var itemimage = TextureRect.new() var itemimage = TextureRect.new()
var item = null var item = null
# item = ItemClass.instance()
# item.set("id", self.id) func SoundOnInteraction():
# add_child(item) var CorrectSound = preload("res://Sounds/standard.wav")
# itemimage.texture = load(Global.player_inventory_items[Item].item_id) $AudioStreamPlayer.stream = CorrectSound
$AudioStreamPlayer.play()
# itemimage.texture = load("res://pictures/inventory_iconpictures/food_items/herbs/saffron.png")
# itemimage.set_position(Vector2(randf()*20-40, randf()*40-20)) pass
# add_child(itemimage)
# yield(get_tree().create_timer(1.0), "timeout")
# remove_child(itemimage)
func _ready(): func _ready():
Global.player_inventory_items = Database.GetInventoryItems().duplicate() Global.player_inventory_items = Database.GetInventoryItems().duplicate()

View File

@ -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) 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() var game = load("res://base_tilemap/base_tilemap.tscn").instance()
game.load_scene(game_data) game.load_scene(game_data)
#save this scene to global scenes #save this scene to global scenes
Global.AddScene(self, "menu", false) Global.AddScene(self, "menu", false)

View File

@ -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

BIN
Sounds/standard.wav Normal file

Binary file not shown.

View File

@ -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

View File

@ -91,7 +91,6 @@ rotation = -3.14158
scale = Vector2( 1.22003, 1.11562 ) scale = Vector2( 1.22003, 1.11562 )
z_index = 13 z_index = 13
normal = ExtResource( 11 ) normal = ExtResource( 11 )
action = "settings_button"
[node name="Map" type="TouchScreenButton" parent="Camera2D/Interactive/GameButtons"] [node name="Map" type="TouchScreenButton" parent="Camera2D/Interactive/GameButtons"]
position = Vector2( 88.136, 1376.12 ) position = Vector2( 88.136, 1376.12 )
@ -183,12 +182,11 @@ z_index = 11
shape = SubResource( 2 ) shape = SubResource( 2 )
action = "map_interaction" action = "map_interaction"
[node name="Tween" type="Tween" parent="."] [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Player"]
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
pause_mode = 2 pause_mode = 2
stream = ExtResource( 17 ) 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/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/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/MoveRight" to="Player" method="_on_TouchScreenButton_pressed"]

View File

@ -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="."]
[node name="TileMap" type="TileMap" parent="." index="0"]
mode = 0
tile_set = ExtResource( 1 )
cell_size = Vector2( 50, 50 ) cell_size = Vector2( 50, 50 )
cell_quadrant_size = 16
cell_custom_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) 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 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 ) 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" ]

View File

@ -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