Merge branch 'main-window'

1 files changed, 34 insertions, 28 deletions

diff --git a/scenes/main.tscn b/scenes/main.tscn
index a4504b9..fa0bfb2 100644
--- a/scenes/main.tscn
+++ b/scenes/main.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=48 format=3 uid="uid://d06d1vihf2oqp"]
+[gd_scene load_steps=50 format=3 uid="uid://d06d1vihf2oqp"]
 
 [ext_resource type="Texture2D" uid="uid://b03ygtrwha22g" path="res://taytay/IMG_5199.jpeg" id="1_o2s48"]
 [ext_resource type="Script" path="res://scenes/main.gd" id="1_y7a0r"]
@@ -7,7 +7,9 @@
 [ext_resource type="AudioStream" uid="uid://wtoxhk0tf8ev" path="res://funny_sounds/Cat Meow - Minecraft Sound Effect (HD).mp3" id="3_gatxj"]
 [ext_resource type="PackedScene" uid="uid://g2veoq55y14i" path="res://scenes/stockticker/Stock Ticker.tscn" id="4_0ankd"]
 [ext_resource type="PackedScene" uid="uid://bbg7lnak6kup7" path="res://scenes/LegallyDistinctPaperclipAssistant/window.tscn" id="5_6agvn"]
+[ext_resource type="Script" path="res://scenes/score_window/score_window.gd" id="6_gvoxs"]
 [ext_resource type="Texture2D" uid="uid://dohsqvvi8y64h" path="res://UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png" id="8_oj2tc"]
+[ext_resource type="PackedScene" uid="uid://c4s4pigu4pr48" path="res://scenes/microgames/fishin/node_2d.tscn" id="10_sx2ad"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_uyge7"]
 atlas = ExtResource("8_oj2tc")
@@ -286,51 +288,55 @@ animations = [{
 [node name="Node2D2" type="Node2D"]
 script = ExtResource("1_y7a0r")
 
-[node name="Background" type="Sprite2D" parent="."]
-modulate = Color(0.796078, 0.796078, 0.796078, 1)
-light_mask = 3
-scale = Vector2(1319, 300)
-texture = ExtResource("2_fkfik")
-centered = false
-
 [node name="Sprite2D" type="Sprite2D" parent="."]
 visible = false
 position = Vector2(636.307, 381.672)
 scale = Vector2(0.293995, 0.217148)
 texture = ExtResource("1_o2s48")
 
-[node name="Score" type="Label" parent="."]
-offset_top = 2.0
-offset_right = 83.0
-offset_bottom = 25.0
-theme = ExtResource("3_d7ku7")
-theme_override_colors/font_color = Color(0, 0, 0, 1)
-theme_override_font_sizes/font_size = 62
-text = "Net worth: 
-
-$00000000000000000000"
-
 [node name="Microgame spawn timer" type="Timer" parent="."]
 wait_time = 10.0
-autostart = true
 
 [node name="Meow" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("3_gatxj")
 
-[node name="Stock ticker window" type="Window" parent="."]
-position = Vector2i(1000, 342)
-size = Vector2i(1280, 720)
+[node name="Clippette" parent="." instance=ExtResource("5_6agvn")]
+visible = false
+
+[node name="Score window (real)" type="Window" parent="."]
+visible = false
 
-[node name="Stock ticker" parent="Stock ticker window" instance=ExtResource("4_0ankd")]
+[node name="Score window" type="Node2D" parent="Score window (real)"]
+script = ExtResource("6_gvoxs")
 
-[node name="Clippette" parent="." instance=ExtResource("5_6agvn")]
+[node name="Background" type="Sprite2D" parent="Score window (real)/Score window"]
+modulate = Color(0.796078, 0.796078, 0.796078, 1)
+light_mask = 3
+scale = Vector2(1319, 300)
+texture = ExtResource("2_fkfik")
+centered = false
 
-[node name="Rotating fish" type="AnimatedSprite2D" parent="."]
+[node name="Rotating fish" type="AnimatedSprite2D" parent="Score window (real)/Score window"]
 position = Vector2(1060, 149)
 sprite_frames = SubResource("SpriteFrames_ke268")
 autoplay = "default"
 frame_progress = 0.387952
 
+[node name="Score" type="Label" parent="Score window (real)/Score window"]
+offset_top = 2.0
+offset_right = 1302.0
+offset_bottom = 197.0
+theme = ExtResource("3_d7ku7")
+theme_override_colors/font_color = Color(0, 0, 0, 1)
+theme_override_font_sizes/font_size = 62
+text = "Net worth: 
+
+$00000000000000000000"
+
+[node name="Stock ticker" parent="." instance=ExtResource("4_0ankd")]
+
+[node name="Fishin" parent="." instance=ExtResource("10_sx2ad")]
+position = Vector2(0, 0)
+
 [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"]
-[connection signal="sell" from="Stock ticker window/Stock ticker" to="." method="_on_stock_ticker_sell"]
+[connection signal="win" from="Fishin" to="." method="_on_fishin_win"]