diff options
| author | Marcelo Costa <> | 2024-01-27 19:01:12 -0300 |
|---|---|---|
| committer | Marcelo Costa <> | 2024-01-27 19:01:12 -0300 |
| commit | 6d27cc65bb8dae4f542f400534ed8e1ca057d761 (patch) | |
| tree | bac8657e5fcb33a74c0285f800c780ba7f203d7e | |
| parent | 967bc15d39aafbba849a5e5709a58f6a75904b19 (diff) | |
| parent | 9460b17abc52fa054b68f06ad133abb66c07dc0d (diff) | |
| download | gamejam-ggj-2024-6d27cc65bb8dae4f542f400534ed8e1ca057d761.tar.gz gamejam-ggj-2024-6d27cc65bb8dae4f542f400534ed8e1ca057d761.tar.bz2 gamejam-ggj-2024-6d27cc65bb8dae4f542f400534ed8e1ca057d761.zip | |
Merge branch 'main' of https://github.com/henriquelalves/ggj2024
| -rw-r--r-- | game/microgames/find_window/find_window.tscn | 27 | ||||
| -rw-r--r-- | game/microgames/heart_break/heart_break.tscn | 12 |
2 files changed, 34 insertions, 5 deletions
diff --git a/game/microgames/find_window/find_window.tscn b/game/microgames/find_window/find_window.tscn index 705b0b3..f59d0a0 100644 --- a/game/microgames/find_window/find_window.tscn +++ b/game/microgames/find_window/find_window.tscn @@ -4,13 +4,14 @@ [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" uid="uid://dxo3khe6emukf" path="res://game/microgames/find_window/msn_regular.tscn" id="4_t7t3v"] +[ext_resource type="PackedScene" 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) [node name="FindWindow" type="Node"] script = ExtResource("1_167ws") +microgame_control = 1 win_on_timeout = false [node name="ImgBackgroundWindows" type="Sprite2D" parent="."] @@ -102,6 +103,30 @@ 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 2db797b..be0e847 100644 --- a/game/microgames/heart_break/heart_break.tscn +++ b/game/microgames/heart_break/heart_break.tscn @@ -12,6 +12,7 @@ size = Vector2(20, 676) [node name="HeartBreak" type="Node"] script = ExtResource("1_ia77r") +microgame_control = 2 [node name="PlayerHeart" parent="." instance=ExtResource("2_uwtaj")] position = Vector2(553, 317) @@ -43,15 +44,18 @@ position = Vector2(574, 0) shape = SubResource("RectangleShape2D_upktn") [node name="Spiky" parent="." instance=ExtResource("3_dfa23")] -position = Vector2(317, 125) +position = Vector2(182, 188) [node name="Spiky2" parent="." instance=ExtResource("3_dfa23")] -position = Vector2(902, 183) +position = Vector2(964, 218) [node name="Spiky3" parent="." instance=ExtResource("3_dfa23")] -position = Vector2(262, 479) +position = Vector2(235, 481) [node name="Spiky4" parent="." instance=ExtResource("3_dfa23")] -position = Vector2(828, 491) +position = Vector2(845, 496) + +[node name="Spiky5" parent="." instance=ExtResource("3_dfa23")] +position = Vector2(570, 104) [connection signal="body_entered" from="PlayerHeart" to="." method="_on_player_heart_body_entered"] |