Adding Baseball Kiss minigame in the flow and rebalancing Find Window

7 files changed, 20 insertions, 38 deletions

diff --git a/game/main.gd b/game/main.gd
index 4c20e5a..ac05b48 100644
--- a/game/main.gd
+++ b/game/main.gd
@@ -4,6 +4,7 @@ var MICROGAMES = [
 	preload("res://game/microgames/flowers_delivery/flowers_delivery.tscn"),
 	preload("res://game/microgames/heart_break/heart_break.tscn"),
 	preload("res://game/microgames/find_window/find_window.tscn"),
+	preload("res://game/microgames/baseball_kiss/baseball_kiss.tscn")
 	]
 
 @onready var transition: Transition = %Transition
diff --git a/game/microgames/baseball_kiss/baseball_kiss.gd b/game/microgames/baseball_kiss/baseball_kiss.gd
index 85205ed..27c0b15 100644
--- a/game/microgames/baseball_kiss/baseball_kiss.gd
+++ b/game/microgames/baseball_kiss/baseball_kiss.gd
@@ -7,7 +7,7 @@ var path = null
 @onready var kiss = %Kiss 
 
 # Called when the node enters the scene tree for the first time.
-func _ready():
+func _microgame_ready():
 	var paths = $Paths.get_children()
 	var choose_path = randi_range(0, paths.size()-1)
 	print(choose_path)
@@ -34,3 +34,4 @@ func _on_hand_collision_area_shape_entered(area_rid, area, area_shape_index, loc
 		%PepeSprite.play("catch")
 		$BreCharacter.play("win")
 		kiss.queue_free()
+		finished.emit(true)
diff --git a/game/microgames/baseball_kiss/baseball_kiss.tscn b/game/microgames/baseball_kiss/baseball_kiss.tscn
index 60512e9..c2c032f 100644
--- a/game/microgames/baseball_kiss/baseball_kiss.tscn
+++ b/game/microgames/baseball_kiss/baseball_kiss.tscn
@@ -113,6 +113,9 @@ size = Vector2(44.9999, 42.6554)
 
 [node name="BaseballKiss" type="Node"]
 script = ExtResource("1_urxm5")
+microgame_control = 2
+instructions = "Catch the Kiss!"
+win_on_timeout = false
 
 [node name="ImgBackgroundWindows" type="Sprite2D" parent="."]
 position = Vector2(579, 324)
@@ -174,7 +177,7 @@ scale = Vector2(0.3, 0.3)
 curve = SubResource("Curve2D_hb7qp")
 
 [node name="PathFollow2D" type="PathFollow2D" parent="Paths/ParthLeft"]
-position = Vector2(-1751.22, -68.4032)
+position = Vector2(-1751.22, -68.4033)
 rotation = -0.271729
 progress = 3626.66
 
@@ -194,7 +197,7 @@ scale = Vector2(0.3, 0.3)
 curve = SubResource("Curve2D_bnyty")
 
 [node name="PathFollow2D" type="PathFollow2D" parent="Paths/ParthFarRight"]
-position = Vector2(1325.28, -141.12)
+position = Vector2(1325.28, -141.126)
 rotation = 1.51209
 progress = 3626.66
 
@@ -204,12 +207,10 @@ rotation = 0.125908
 scale = Vector2(0.3, 0.3)
 
 [node name="ImgKiss" type="Sprite2D" parent="Kiss"]
-scale = Vector2(1, 1)
 texture = ExtResource("6_j2h3k")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Kiss"]
 position = Vector2(1.44458, -1.86267)
-scale = Vector2(1, 1)
 shape = SubResource("RectangleShape2D_53xmk")
 
 [connection signal="area_shape_entered" from="PepeCharacter/HandCollision" to="." method="_on_hand_collision_area_shape_entered"]
diff --git a/game/microgames/find_window/find_window.gd b/game/microgames/find_window/find_window.gd
index 6bc6e8e..b409d48 100644
--- a/game/microgames/find_window/find_window.gd
+++ b/game/microgames/find_window/find_window.gd
@@ -16,3 +16,4 @@ func _microgame_ready():
 func _on_send_button_button_down():
 	%TextBoxMessage.hide()
 	%ChatMessage.show()
+	finished.emit(true)
diff --git a/game/microgames/find_window/find_window.tscn b/game/microgames/find_window/find_window.tscn
index b04e6c0..705b0b3 100644
--- a/game/microgames/find_window/find_window.tscn
+++ b/game/microgames/find_window/find_window.tscn
@@ -4,7 +4,7 @@
 [ext_resource type="Texture2D" uid="uid://j0btxfrk2q8k" path="res://game/microgames/find_window/assets/Img_background_windows.png" id="1_w06df"]
 [ext_resource type="Texture2D" uid="uid://7h0hokgsxon4" path="res://game/microgames/find_window/assets/Img_MSN_namoradinha.png" id="3_ekh6x"]
 [ext_resource type="Script" path="res://game/microgames/find_window/msn_girlfriend.gd" id="4_ithnb"]
-[ext_resource type="PackedScene" path="res://game/microgames/find_window/msn_regular.tscn" id="4_t7t3v"]
+[ext_resource type="PackedScene" uid="uid://dxo3khe6emukf" path="res://game/microgames/find_window/msn_regular.tscn" id="4_t7t3v"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_csx47"]
 font_color = Color(0.443137, 0.443137, 0.443137, 1)
@@ -102,30 +102,6 @@ offset_top = 162.0
 offset_right = 876.0
 offset_bottom = 620.0
 
-[node name="ImgMsnNormal6" parent="AllWindows" instance=ExtResource("4_t7t3v")]
-visible = false
-layout_mode = 0
-offset_left = 258.0
-offset_top = 162.0
-offset_right = 876.0
-offset_bottom = 620.0
-
-[node name="ImgMsnNormal7" parent="AllWindows" instance=ExtResource("4_t7t3v")]
-visible = false
-layout_mode = 0
-offset_left = 258.0
-offset_top = 162.0
-offset_right = 876.0
-offset_bottom = 620.0
-
-[node name="ImgMsnNormal8" parent="AllWindows" instance=ExtResource("4_t7t3v")]
-visible = false
-layout_mode = 0
-offset_left = 258.0
-offset_top = 162.0
-offset_right = 876.0
-offset_bottom = 620.0
-
 [node name="Timer" type="Timer" parent="."]
 
 [connection signal="button_down" from="AllWindows/ImgMsnNamoradinha/SendButton" to="." method="_on_send_button_button_down"]
diff --git a/game/microgames/heart_break/heart_break.tscn b/game/microgames/heart_break/heart_break.tscn
index b130424..2db797b 100644
--- a/game/microgames/heart_break/heart_break.tscn
+++ b/game/microgames/heart_break/heart_break.tscn
@@ -43,18 +43,15 @@ position = Vector2(574, 0)
 shape = SubResource("RectangleShape2D_upktn")
 
 [node name="Spiky" parent="." instance=ExtResource("3_dfa23")]
-position = Vector2(182, 188)
+position = Vector2(317, 125)
 
 [node name="Spiky2" parent="." instance=ExtResource("3_dfa23")]
-position = Vector2(964, 218)
+position = Vector2(902, 183)
 
 [node name="Spiky3" parent="." instance=ExtResource("3_dfa23")]
-position = Vector2(235, 481)
+position = Vector2(262, 479)
 
 [node name="Spiky4" parent="." instance=ExtResource("3_dfa23")]
-position = Vector2(845, 496)
-
-[node name="Spiky5" parent="." instance=ExtResource("3_dfa23")]
-position = Vector2(570, 104)
+position = Vector2(828, 491)
 
 [connection signal="body_entered" from="PlayerHeart" to="." method="_on_player_heart_body_entered"]
diff --git a/game/microgames/heart_break/player_heart.tscn b/game/microgames/heart_break/player_heart.tscn
index cbb0305..58e84db 100644
--- a/game/microgames/heart_break/player_heart.tscn
+++ b/game/microgames/heart_break/player_heart.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://ce7600yfkpdbq"]
+[gd_scene load_steps=5 format=3 uid="uid://ce7600yfkpdbq"]
 
 [ext_resource type="Script" path="res://game/microgames/heart_break/player_heart.gd" id="1_e40wj"]
 [ext_resource type="SpriteFrames" uid="uid://c5j2ojumuirph" path="res://game/microgames/heart_break/assets/heart_animation.tres" id="1_koysl"]
@@ -6,6 +6,8 @@
 [sub_resource type="CircleShape2D" id="CircleShape2D_sp11c"]
 radius = 57.0088
 
+[sub_resource type="AudioStreamWAV" id="AudioStreamWAV_tervk"]
+
 [node name="PlayerHeart" type="RigidBody2D"]
 gravity_scale = 0.0
 can_sleep = false
@@ -20,3 +22,6 @@ autoplay = "default"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("CircleShape2D_sp11c")
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = SubResource("AudioStreamWAV_tervk")