Merge branch 'main' of https://github.com/Edearth/malaga-jam-2024

assets/audio/chistecito.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://b657kow7oflyd"
+path="res://.godot/imported/chistecito.ogg-e8ecde13e9f5324585a55106b0110cc5.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/chistecito.ogg"
+dest_files=["res://.godot/imported/chistecito.ogg-e8ecde13e9f5324585a55106b0110cc5.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/dialogue_1.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://28ruftddbubf"
+path="res://.godot/imported/dialogue_1.ogg-2f4d425ded51582ee03cfd29ab3efabc.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/dialogue_1.ogg"
+dest_files=["res://.godot/imported/dialogue_1.ogg-2f4d425ded51582ee03cfd29ab3efabc.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/dialogue_2.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://fixcqmd5bjj"
+path="res://.godot/imported/dialogue_2.ogg-f4d0fcc1386b982db9b77ef2f8a5aee0.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/dialogue_2.ogg"
+dest_files=["res://.godot/imported/dialogue_2.ogg-f4d0fcc1386b982db9b77ef2f8a5aee0.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/dialogue_3.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://di6xtln4be6y7"
+path="res://.godot/imported/dialogue_3.ogg-2e868061256f57786b94c6849a20bb56.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/dialogue_3.ogg"
+dest_files=["res://.godot/imported/dialogue_3.ogg-2e868061256f57786b94c6849a20bb56.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/dialogue_4.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://b4vcet1vd3k5l"
+path="res://.godot/imported/dialogue_4.ogg-14eebbc952c374a12b331fd199a79e53.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/dialogue_4.ogg"
+dest_files=["res://.godot/imported/dialogue_4.ogg-14eebbc952c374a12b331fd199a79e53.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/wa.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://brsqw8hscy63i"
+path="res://.godot/imported/wa.ogg-1b3f1e8f1a72c96b7fa157da02a563da.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/wa.ogg"
+dest_files=["res://.godot/imported/wa.ogg-1b3f1e8f1a72c96b7fa157da02a563da.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/wa_2.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dxia5estfvfgq"
+path="res://.godot/imported/wa_2.ogg-578db7848956eea1bdcdfacb52255cab.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/wa_2.ogg"
+dest_files=["res://.godot/imported/wa_2.ogg-578db7848956eea1bdcdfacb52255cab.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/wa_3.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dfscejrw8gbvg"
+path="res://.godot/imported/wa_3.ogg-1bed9fb459b2aa2466aeeb465f72843f.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/wa_3.ogg"
+dest_files=["res://.godot/imported/wa_3.ogg-1bed9fb459b2aa2466aeeb465f72843f.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/wa_4.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://gvaxsl1jn63l"
+path="res://.godot/imported/wa_4.ogg-2057994343c6b422a59dbbe5ca139dc7.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/wa_4.ogg"
+dest_files=["res://.godot/imported/wa_4.ogg-2057994343c6b422a59dbbe5ca139dc7.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/wa_5.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://de4m06khc5ek"
+path="res://.godot/imported/wa_5.ogg-997189d68453b513acd4989e704e22a4.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/wa_5.ogg"
+dest_files=["res://.godot/imported/wa_5.ogg-997189d68453b513acd4989e704e22a4.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/wa_6.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://da3lawst4ih50"
+path="res://.godot/imported/wa_6.ogg-a41fe199ff11f3c21673030be707a091.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/wa_6.ogg"
+dest_files=["res://.godot/imported/wa_6.ogg-a41fe199ff11f3c21673030be707a091.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/audio/win.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://bpsmbf14mp08"
+path="res://.godot/imported/win.ogg-dfe7855217cf19f5da224053b9b86db8.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/audio/win.ogg"
+dest_files=["res://.godot/imported/win.ogg-dfe7855217cf19f5da224053b9b86db8.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4

assets/bocadillo_final.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bsa32mec5tk5b"
+path="res://.godot/imported/bocadillo_final.png-ee8222d004f7ae8c7d380cbcc1359a8a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/bocadillo_final.png"
+dest_files=["res://.godot/imported/bocadillo_final.png-ee8222d004f7ae8c7d380cbcc1359a8a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+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/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

assets/final_cinematic/risa_montana_final_1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://eg7q4rshsjts"
+path="res://.godot/imported/risa_montana_final_1.png-d34777bebe277ffe38b8d89bf8f1b10f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/final_cinematic/risa_montana_final_1.png"
+dest_files=["res://.godot/imported/risa_montana_final_1.png-d34777bebe277ffe38b8d89bf8f1b10f.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+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/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

assets/final_cinematic/risa_montana_final_2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bd4afi7u3cevr"
+path="res://.godot/imported/risa_montana_final_2.png-0fb1c76c69621c62c5572a04fb4085cf.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/final_cinematic/risa_montana_final_2.png"
+dest_files=["res://.godot/imported/risa_montana_final_2.png-0fb1c76c69621c62c5572a04fb4085cf.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+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/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

scenes/finial_cinematic/final_cinematic.gd

@@ -1,5 +1,11 @@
 extends Control
 
+const TALK_SOUNDS = [
+	"res://assets/audio/dialogue_1.ogg",
+	"res://assets/audio/dialogue_2.ogg",
+	"res://assets/audio/dialogue_3.ogg",
+	"res://assets/audio/dialogue_4.ogg"
+]
 const DIALOGUES = {
 	0: "[b]Hola bbsita[/b] no te pongas tristona reina",
 	1: "Voy a contarte [b]unos chistecitos[/b] xra k te rias un poco gatita jeje",
@@ -22,10 +28,18 @@ func _ready():
 	await get_tree().create_timer(2).timeout
 	jokes_index = 0
 	$RatText.text = DIALOGUES[0]
+	play_talk_sound()
+
+func play_talk_sound():
+	var audio_clip = TALK_SOUNDS.pick_random()
+	$"../AudioStreamPlayer".stream = load(audio_clip)
+	$"../AudioStreamPlayer".play()
 
 func _input(event):
 	if jokes_index != -1 \
 		and event is InputEventMouseButton and event.pressed:
+
+		play_talk_sound()
 
 		jokes_index += 1
 		var max_jokes = Global.jokes_collected + 2