From 9c9c4c24f567b3678202d15b2310733674dd3430 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 15:27:53 -0600 Subject: Add Clippette to the main scene --- scenes/main.tscn | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index c2c58b1..f6b1d59 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=5 format=3 uid="uid://d06d1vihf2oqp"] +[gd_scene load_steps=6 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"] [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"] [node name="Node2D2" type="Node2D"] script = ExtResource("1_y7a0r") @@ -26,11 +27,13 @@ autostart = true [node name="Meow" type="AudioStreamPlayer" parent="."] stream = ExtResource("3_gatxj") -[node name="Window" type="Window" parent="."] +[node name="Stock ticker window" type="Window" parent="."] size = Vector2i(1280, 720) -[node name="Stock ticker" parent="Window" instance=ExtResource("4_0ankd")] +[node name="Stock ticker" parent="Stock ticker window" instance=ExtResource("4_0ankd")] + +[node name="Clippette" parent="." instance=ExtResource("5_6agvn")] [connection signal="timeout" from="Microgame spawn timer" to="." method="_on_microgame_spawn_timer_timeout"] -[connection signal="buy" from="Window/Stock ticker" to="." method="_on_stock_ticker_buy"] -[connection signal="sell" from="Window/Stock ticker" to="." method="_on_stock_ticker_sell"] +[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"] -- cgit v1.2.3 From ec5c89a7663bfd81743e951eb4f2def146ed47be Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 15:51:49 -0600 Subject: Move the main window under Clipette's text box --- scenes/main.tscn | 1 + 1 file changed, 1 insertion(+) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index f6b1d59..8e96e8b 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -28,6 +28,7 @@ autostart = true stream = ExtResource("3_gatxj") [node name="Stock ticker window" type="Window" parent="."] +position = Vector2i(1000, 1000) size = Vector2i(1280, 720) [node name="Stock ticker" parent="Stock ticker window" instance=ExtResource("4_0ankd")] -- cgit v1.2.3 From f3efe1b3c71667c3a2d83b39f97d5d10bf580521 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 15:58:14 -0600 Subject: Resize main window --- scenes/main.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index 8e96e8b..e4c993c 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -28,7 +28,7 @@ autostart = true stream = ExtResource("3_gatxj") [node name="Stock ticker window" type="Window" parent="."] -position = Vector2i(1000, 1000) +position = Vector2i(1000, 538) size = Vector2i(1280, 720) [node name="Stock ticker" parent="Stock ticker window" instance=ExtResource("4_0ankd")] -- cgit v1.2.3 From 24d047838221c5086ee6a0f41a7dbfb0b080e0a7 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 16:19:17 -0600 Subject: Yeah that looks nice enough --- scenes/main.tscn | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index e4c993c..ec7091b 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=6 format=3 uid="uid://d06d1vihf2oqp"] +[gd_scene load_steps=8 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"] +[ext_resource type="Texture2D" uid="uid://voruypgyi77e" path="res://scenes/stockticker/UI-Background-Colour.png" id="2_fkfik"] +[ext_resource type="Theme" uid="uid://ve18rbkeiwti" path="res://UI/text.tres" id="3_d7ku7"] [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"] @@ -9,7 +11,15 @@ [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") @@ -18,7 +28,12 @@ texture = ExtResource("1_o2s48") offset_top = 2.0 offset_right = 83.0 offset_bottom = 25.0 -text = "Net worth: $" +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 -- cgit v1.2.3 From a4a7851542db91d93b75bd42aa1c1df0edca0e90 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 16:35:46 -0600 Subject: 3D rotating fish gif!!! --- scenes/main.tscn | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 283 insertions(+), 2 deletions(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index ec7091b..a4504b9 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=3 uid="uid://d06d1vihf2oqp"] +[gd_scene load_steps=48 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,6 +7,281 @@ [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="Texture2D" uid="uid://dohsqvvi8y64h" path="res://UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png" id="8_oj2tc"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_uyge7"] +atlas = ExtResource("8_oj2tc") +region = Rect2(1440, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_q361v"] +atlas = ExtResource("8_oj2tc") +region = Rect2(1920, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_xg08o"] +atlas = ExtResource("8_oj2tc") +region = Rect2(2400, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_5wrxk"] +atlas = ExtResource("8_oj2tc") +region = Rect2(2880, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_sqk41"] +atlas = ExtResource("8_oj2tc") +region = Rect2(3360, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_v7jwr"] +atlas = ExtResource("8_oj2tc") +region = Rect2(3840, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7b85l"] +atlas = ExtResource("8_oj2tc") +region = Rect2(4320, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_pm4lk"] +atlas = ExtResource("8_oj2tc") +region = Rect2(4800, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_gb3cd"] +atlas = ExtResource("8_oj2tc") +region = Rect2(5280, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_aujti"] +atlas = ExtResource("8_oj2tc") +region = Rect2(5760, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_kssee"] +atlas = ExtResource("8_oj2tc") +region = Rect2(6240, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_awsou"] +atlas = ExtResource("8_oj2tc") +region = Rect2(6720, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_dqry7"] +atlas = ExtResource("8_oj2tc") +region = Rect2(7200, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_l2edp"] +atlas = ExtResource("8_oj2tc") +region = Rect2(7680, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_06kk0"] +atlas = ExtResource("8_oj2tc") +region = Rect2(8160, 540, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_wyica"] +atlas = ExtResource("8_oj2tc") +region = Rect2(0, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_bl2fa"] +atlas = ExtResource("8_oj2tc") +region = Rect2(480, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ljnbe"] +atlas = ExtResource("8_oj2tc") +region = Rect2(960, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_48vwo"] +atlas = ExtResource("8_oj2tc") +region = Rect2(1440, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_0ffer"] +atlas = ExtResource("8_oj2tc") +region = Rect2(1920, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_pmw51"] +atlas = ExtResource("8_oj2tc") +region = Rect2(2400, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_h13o4"] +atlas = ExtResource("8_oj2tc") +region = Rect2(2880, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_i5rca"] +atlas = ExtResource("8_oj2tc") +region = Rect2(3360, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1w2n4"] +atlas = ExtResource("8_oj2tc") +region = Rect2(3840, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_t4ovh"] +atlas = ExtResource("8_oj2tc") +region = Rect2(4320, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_3ykvn"] +atlas = ExtResource("8_oj2tc") +region = Rect2(4800, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_j2usu"] +atlas = ExtResource("8_oj2tc") +region = Rect2(5280, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qwxmp"] +atlas = ExtResource("8_oj2tc") +region = Rect2(5760, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_muy25"] +atlas = ExtResource("8_oj2tc") +region = Rect2(6240, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_3fnw4"] +atlas = ExtResource("8_oj2tc") +region = Rect2(6720, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_teehr"] +atlas = ExtResource("8_oj2tc") +region = Rect2(7200, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_mflgh"] +atlas = ExtResource("8_oj2tc") +region = Rect2(7680, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_vy71g"] +atlas = ExtResource("8_oj2tc") +region = Rect2(8160, 810, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_vhs7i"] +atlas = ExtResource("8_oj2tc") +region = Rect2(0, 1080, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_50ge1"] +atlas = ExtResource("8_oj2tc") +region = Rect2(480, 1080, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_16ov1"] +atlas = ExtResource("8_oj2tc") +region = Rect2(960, 1080, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_epju2"] +atlas = ExtResource("8_oj2tc") +region = Rect2(1440, 1080, 480, 270) + +[sub_resource type="AtlasTexture" id="AtlasTexture_vpon3"] +atlas = ExtResource("8_oj2tc") +region = Rect2(1920, 1080, 480, 270) + +[sub_resource type="SpriteFrames" id="SpriteFrames_ke268"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_uyge7") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_q361v") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_xg08o") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_5wrxk") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_sqk41") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_v7jwr") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_7b85l") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_pm4lk") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_gb3cd") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_aujti") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_kssee") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_awsou") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_dqry7") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_l2edp") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_06kk0") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_wyica") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_bl2fa") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ljnbe") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_48vwo") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_0ffer") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_pmw51") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_h13o4") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_i5rca") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_1w2n4") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_t4ovh") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_3ykvn") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_j2usu") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qwxmp") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_muy25") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_3fnw4") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_teehr") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_mflgh") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_vy71g") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_vhs7i") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_50ge1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_16ov1") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_epju2") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_vpon3") +}], +"loop": true, +"name": &"default", +"speed": 36.0 +}] [node name="Node2D2" type="Node2D"] script = ExtResource("1_y7a0r") @@ -43,13 +318,19 @@ autostart = true stream = ExtResource("3_gatxj") [node name="Stock ticker window" type="Window" parent="."] -position = Vector2i(1000, 538) +position = Vector2i(1000, 342) size = Vector2i(1280, 720) [node name="Stock ticker" parent="Stock ticker window" instance=ExtResource("4_0ankd")] [node name="Clippette" parent="." instance=ExtResource("5_6agvn")] +[node name="Rotating fish" type="AnimatedSprite2D" parent="."] +position = Vector2(1060, 149) +sprite_frames = SubResource("SpriteFrames_ke268") +autoplay = "default" +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"] [connection signal="sell" from="Stock ticker window/Stock ticker" to="." method="_on_stock_ticker_sell"] -- cgit v1.2.3 From 7546c31057cbdec92c08e5d2ed3b59b5910a0956 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 17:37:18 -0600 Subject: Move score window to a separate node, theoretically --- scenes/main.tscn | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index a4504b9..98fd364 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -286,30 +286,12 @@ 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 @@ -325,12 +307,32 @@ size = Vector2i(1280, 720) [node name="Clippette" parent="." instance=ExtResource("5_6agvn")] -[node name="Rotating fish" type="AnimatedSprite2D" parent="."] +[node name="Score window" type="Node2D" parent="."] + +[node name="Background" type="Sprite2D" parent="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="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"] +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" + [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"] -- cgit v1.2.3 From 21609e84f29ca7461d548915dc5b0acef0b82bf1 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 17:46:13 -0600 Subject: Finish migration I think? I got distracted --- scenes/main.tscn | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index 98fd364..c8332e0 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=49 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,6 +7,7 @@ [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"] [sub_resource type="AtlasTexture" id="AtlasTexture_uyge7"] @@ -308,6 +309,7 @@ size = Vector2i(1280, 720) [node name="Clippette" parent="." instance=ExtResource("5_6agvn")] [node name="Score window" type="Node2D" parent="."] +script = ExtResource("6_gvoxs") [node name="Background" type="Sprite2D" parent="Score window"] modulate = Color(0.796078, 0.796078, 0.796078, 1) @@ -334,5 +336,5 @@ text = "Net worth: $00000000000000000000" [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="buy" from="Stock ticker window/Stock ticker" to="Score window" method="_on_stock_ticker_buy"] +[connection signal="sell" from="Stock ticker window/Stock ticker" to="Score window" method="_on_stock_ticker_sell"] -- cgit v1.2.3 From 518fa16866161c569f941ea6d25e2ecbf7a41e4c Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 18:26:50 -0600 Subject: Fiiiiiiine I'll just make Clippette visible instead of instantiating her --- scenes/main.tscn | 1 + 1 file changed, 1 insertion(+) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index c8332e0..af7a6d2 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -307,6 +307,7 @@ size = Vector2i(1280, 720) [node name="Stock ticker" parent="Stock ticker window" instance=ExtResource("4_0ankd")] [node name="Clippette" parent="." instance=ExtResource("5_6agvn")] +visible = false [node name="Score window" type="Node2D" parent="."] script = ExtResource("6_gvoxs") -- cgit v1.2.3 From 977521849bd7efa82152e0f3d3676c300e559bde Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 18:33:37 -0600 Subject: Make the main window just be a stock ticker --- scenes/main.tscn | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index af7a6d2..053fd5d 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -300,32 +300,31 @@ 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="Stock ticker" parent="Stock ticker window" instance=ExtResource("4_0ankd")] +[node name="Stock ticker" parent="." instance=ExtResource("4_0ankd")] [node name="Clippette" parent="." instance=ExtResource("5_6agvn")] visible = false -[node name="Score window" type="Node2D" parent="."] +[node name="Score window (real)" type="Window" parent="."] +visible = false + +[node name="Score window" type="Node2D" parent="Score window (real)"] script = ExtResource("6_gvoxs") -[node name="Background" type="Sprite2D" parent="Score window"] +[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="Score window"] +[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"] +[node name="Score" type="Label" parent="Score window (real)/Score window"] offset_top = 2.0 offset_right = 1302.0 offset_bottom = 197.0 @@ -337,5 +336,5 @@ text = "Net worth: $00000000000000000000" [connection signal="timeout" from="Microgame spawn timer" to="." method="_on_microgame_spawn_timer_timeout"] -[connection signal="buy" from="Stock ticker window/Stock ticker" to="Score window" method="_on_stock_ticker_buy"] -[connection signal="sell" from="Stock ticker window/Stock ticker" to="Score window" method="_on_stock_ticker_sell"] +[connection signal="buy" from="Stock ticker" to="Score window (real)/Score window" method="_on_stock_ticker_buy"] +[connection signal="sell" from="Stock ticker" to="Score window (real)/Score window" method="_on_stock_ticker_sell"] -- cgit v1.2.3 From 271eb69e5052c131519b08f0df22618d4881ef77 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 18:36:52 -0600 Subject: Disable microgame spawning :( (It gets worse before it gets a lot worse) --- scenes/main.tscn | 1 - 1 file changed, 1 deletion(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index 053fd5d..8878ce0 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -295,7 +295,6 @@ texture = ExtResource("1_o2s48") [node name="Microgame spawn timer" type="Timer" parent="."] wait_time = 10.0 -autostart = true [node name="Meow" type="AudioStreamPlayer" parent="."] stream = ExtResource("3_gatxj") -- cgit v1.2.3 From d74ecb966b03b46bed0e1720ef2ed029c3be99a1 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 18:43:05 -0600 Subject: Oh my god now it's actually just a fishing game --- scenes/main.tscn | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index 8878ce0..637f3a4 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -5,10 +5,10 @@ [ext_resource type="Texture2D" uid="uid://voruypgyi77e" path="res://scenes/stockticker/UI-Background-Colour.png" id="2_fkfik"] [ext_resource type="Theme" uid="uid://ve18rbkeiwti" path="res://UI/text.tres" id="3_d7ku7"] [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") @@ -299,8 +299,6 @@ wait_time = 10.0 [node name="Meow" type="AudioStreamPlayer" parent="."] stream = ExtResource("3_gatxj") -[node name="Stock ticker" parent="." instance=ExtResource("4_0ankd")] - [node name="Clippette" parent="." instance=ExtResource("5_6agvn")] visible = false @@ -334,6 +332,7 @@ text = "Net worth: $00000000000000000000" +[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" to="Score window (real)/Score window" method="_on_stock_ticker_buy"] -[connection signal="sell" from="Stock ticker" to="Score window (real)/Score window" method="_on_stock_ticker_sell"] -- cgit v1.2.3 From 162f6ba656c3ed050526df7e0aa31d8e284b640c Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 19:05:07 -0600 Subject: You caught GAR! --- scenes/main.tscn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index 637f3a4..1a7ded1 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=49 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"] [ext_resource type="Texture2D" uid="uid://voruypgyi77e" path="res://scenes/stockticker/UI-Background-Colour.png" id="2_fkfik"] [ext_resource type="Theme" uid="uid://ve18rbkeiwti" path="res://UI/text.tres" id="3_d7ku7"] [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"] @@ -335,4 +336,7 @@ $00000000000000000000" [node name="Fishin" parent="." instance=ExtResource("10_sx2ad")] position = Vector2(0, 0) +[node name="Stock ticker" parent="." instance=ExtResource("4_0ankd")] +visible = false + [connection signal="timeout" from="Microgame spawn timer" to="." method="_on_microgame_spawn_timer_timeout"] -- cgit v1.2.3 From a472a321179268710722232ee61aa04b369c627c Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 19:38:06 -0600 Subject: Make the fishing minigame transition into stonks --- scenes/main.tscn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index 1a7ded1..fa0bfb2 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -333,10 +333,10 @@ 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) -[node name="Stock ticker" parent="." instance=ExtResource("4_0ankd")] -visible = false - [connection signal="timeout" from="Microgame spawn timer" to="." method="_on_microgame_spawn_timer_timeout"] +[connection signal="win" from="Fishin" to="." method="_on_fishin_win"] -- cgit v1.2.3