diff options
| author | Zoey Kitt <zoey.kitt@outlook.com> | 2024-11-16 17:30:09 -0600 |
|---|---|---|
| committer | Zoey Kitt <zoey.kitt@outlook.com> | 2024-11-16 17:30:09 -0600 |
| commit | 0806d809557c4c1bff35707b825e3475c816d0e6 (patch) | |
| tree | 5b2ece4559b2cdc6cbb39a704aee1960c1a08e65 | |
| parent | 44e036f8b79ea77c540244875c4f8135a957e6b2 (diff) | |
| parent | 332e3aced7c7d112d6ae04c7a075964f9b211ae8 (diff) | |
Merge branch 'main' into bonk
| -rw-r--r-- | scenes/main.tscn | 2 | ||||
| -rw-r--r-- | scenes/microgames/fishin/fishin.gd | 3 | ||||
| -rw-r--r-- | scenes/microgames/fishin/node_2d.tscn | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/scenes/main.tscn b/scenes/main.tscn index 1b5c89f..a4504b9 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -329,7 +329,7 @@ size = Vector2i(1280, 720) position = Vector2(1060, 149) sprite_frames = SubResource("SpriteFrames_ke268") autoplay = "default" -frame_progress = 0.263904 +frame_progress = 0.387952 [connection signal="timeout" from="Microgame spawn timer" to="." method="_on_microgame_spawn_timer_timeout"] [connection signal="buy" from="Stock ticker window/Stock ticker" to="." method="_on_stock_ticker_buy"] diff --git a/scenes/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd index 7e1ae3c..44b60db 100644 --- a/scenes/microgames/fishin/fishin.gd +++ b/scenes/microgames/fishin/fishin.gd @@ -83,7 +83,8 @@ func _on_start_game_timeout() -> void: mash.visible = true mouse.visible = true - num_clicks = randi_range(5,20) + num_clicks = randi_range(5,21) + num_clicks = 21 # YOU LOSE diff --git a/scenes/microgames/fishin/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn index 7d2ac0a..969ec34 100644 --- a/scenes/microgames/fishin/node_2d.tscn +++ b/scenes/microgames/fishin/node_2d.tscn @@ -48,7 +48,7 @@ _data = { "mash": SubResource("Animation_fxbt5") } -[node name="Node2D" type="Window"] +[node name="Node2D2" type="Window"] position = Vector2i(0, 36) size = Vector2i(930, 560) unresizable = true @@ -109,7 +109,7 @@ scale = Vector2(0.216276, 0.249769) autostart = true [node name="InGame" type="Timer" parent="."] -wait_time = 10.0 +wait_time = 3.0 [node name="SAD" type="Sprite2D" parent="."] visible = false @@ -122,7 +122,7 @@ position = Vector2(535, 300) texture = ExtResource("10_1il5r") [node name="SuccessFail" type="Timer" parent="."] -wait_time = 2.0 +wait_time = 3.0 [connection signal="button_up" from="TextureButton" to="." method="_on_texture_button_button_up"] [connection signal="timeout" from="StartGame" to="." method="_on_start_game_timeout"] |