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(-) 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.gd | 2 ++ scenes/main.tscn | 1 + 2 files changed, 3 insertions(+) diff --git a/scenes/main.gd b/scenes/main.gd index c984f43..1d9c503 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -6,6 +6,8 @@ var net_worth: Big func _ready() -> void: _on_microgame_spawn_timer_timeout() net_worth = Big.new(1000) + + get_window().position = Vector2(450, 360) # Called every frame. 'delta' is the elapsed time since the previous frame. 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 --- project.godot | 1 - scenes/main.gd | 5 +++-- scenes/main.tscn | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project.godot b/project.godot index 84cd446..b52b5df 100644 --- a/project.godot +++ b/project.godot @@ -20,7 +20,6 @@ config/icon="res://icon.svg" window/size/viewport_width=1280 window/size/viewport_height=720 window/subwindows/embed_subwindows=false -window/stretch/mode="canvas_items" window/per_pixel_transparency/allowed=true [input] diff --git a/scenes/main.gd b/scenes/main.gd index 1d9c503..b20524b 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -7,8 +7,9 @@ func _ready() -> void: _on_microgame_spawn_timer_timeout() net_worth = Big.new(1000) - get_window().position = Vector2(450, 360) - + var window = get_window() + window.position = Vector2(450, 360) + window.size = Vector2(500, 300) # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: 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 --- project.godot | 2 -- scenes/main.gd | 4 ++-- scenes/main.tscn | 19 +++++++++++++++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/project.godot b/project.godot index b52b5df..d7d2121 100644 --- a/project.godot +++ b/project.godot @@ -17,8 +17,6 @@ config/icon="res://icon.svg" [display] -window/size/viewport_width=1280 -window/size/viewport_height=720 window/subwindows/embed_subwindows=false window/per_pixel_transparency/allowed=true diff --git a/scenes/main.gd b/scenes/main.gd index b20524b..4f1c67f 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -9,7 +9,7 @@ func _ready() -> void: var window = get_window() window.position = Vector2(450, 360) - window.size = Vector2(500, 300) + window.size = Vector2(1319, 300) # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: @@ -17,7 +17,7 @@ func _process(delta: float) -> void: if Input.is_action_just_pressed("G"): $Meow.play() - $Score.text = "Net worth: $%s" % net_worth.toString() + $Score.text = "Net worth: \n$%s" % net_worth.toString() func _on_microgame_spawn_timer_timeout() -> void: 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!!! --- ...-spinning-ezgif.com-gif-to-sprite-converter.png | Bin 0 -> 2135001 bytes ...ng-ezgif.com-gif-to-sprite-converter.png.import | 34 +++ scenes/main.tscn | 285 ++++++++++++++++++++- 3 files changed, 317 insertions(+), 2 deletions(-) create mode 100644 UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png create mode 100644 UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png.import diff --git a/UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png b/UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png new file mode 100644 index 0000000..cc58504 Binary files /dev/null and b/UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png differ diff --git a/UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png.import b/UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png.import new file mode 100644 index 0000000..b721ec7 --- /dev/null +++ b/UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dohsqvvi8y64h" +path="res://.godot/imported/fish-spinning-ezgif.com-gif-to-sprite-converter.png-9f4f03ed9d748b98ff7121419e844127.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png" +dest_files=["res://.godot/imported/fish-spinning-ezgif.com-gif-to-sprite-converter.png-9f4f03ed9d748b98ff7121419e844127.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 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.gd | 2 +- scenes/main.tscn | 40 +++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/scenes/main.gd b/scenes/main.gd index 4f1c67f..7025386 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -17,7 +17,7 @@ func _process(delta: float) -> void: if Input.is_action_just_pressed("G"): $Meow.play() - $Score.text = "Net worth: \n$%s" % net_worth.toString() + #$Score.text = "Net worth: \n$%s" % net_worth.toString() func _on_microgame_spawn_timer_timeout() -> void: 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.gd | 17 ----------------- scenes/main.tscn | 8 +++++--- scenes/score_window/score_window.gd | 24 ++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 scenes/score_window/score_window.gd diff --git a/scenes/main.gd b/scenes/main.gd index 7025386..dbfcd65 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -1,23 +1,14 @@ extends Node2D -var net_worth: Big - # Called when the node enters the scene tree for the first time. func _ready() -> void: _on_microgame_spawn_timer_timeout() - net_worth = Big.new(1000) - - var window = get_window() - window.position = Vector2(450, 360) - window.size = Vector2(1319, 300) # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: # The most important functionality if Input.is_action_just_pressed("G"): $Meow.play() - - #$Score.text = "Net worth: \n$%s" % net_worth.toString() func _on_microgame_spawn_timer_timeout() -> void: @@ -40,11 +31,3 @@ func _on_microgame_spawn_timer_timeout() -> void: func _on_microgame_win(window: MicrogameWindow): print("yay") - - -func _on_stock_ticker_buy(amount: Variant) -> void: - net_worth = net_worth.minus(amount) - - -func _on_stock_ticker_sell(amount: Variant) -> void: - net_worth = net_worth.plus(amount) 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"] diff --git a/scenes/score_window/score_window.gd b/scenes/score_window/score_window.gd new file mode 100644 index 0000000..f4159af --- /dev/null +++ b/scenes/score_window/score_window.gd @@ -0,0 +1,24 @@ +extends Node2D + +var net_worth: Big + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + net_worth = Big.new(1000) + + var window = get_window() + window.position = Vector2(450, 360) + window.size = Vector2(1319, 300) + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + $Score.text = "Net worth: \n$%s" % net_worth.toString() + + +func _on_stock_ticker_buy(amount: Variant) -> void: + net_worth = net_worth.minus(amount) + + +func _on_stock_ticker_sell(amount: Variant) -> void: + net_worth = net_worth.plus(amount) -- 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.gd | 7 +++++++ scenes/main.tscn | 1 + 2 files changed, 8 insertions(+) diff --git a/scenes/main.gd b/scenes/main.gd index dbfcd65..7e65562 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -3,6 +3,10 @@ extends Node2D # Called when the node enters the scene tree for the first time. func _ready() -> void: _on_microgame_spawn_timer_timeout() + + # Spawn Clippette??? + $Clippette.visible = true + # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: @@ -17,6 +21,9 @@ func _on_microgame_spawn_timer_timeout() -> void: # Spawn a microgame window var window_scene = preload("res://scenes/microgames/ad/ad_window.tscn") var window_instance = window_scene.instantiate() + + print(type_string(typeof(window_instance))) + add_child(window_instance) # Randomize window position 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 --- project.godot | 2 ++ scenes/main.gd | 3 --- scenes/main.tscn | 21 ++++++++++----------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/project.godot b/project.godot index d7d2121..b52b5df 100644 --- a/project.godot +++ b/project.godot @@ -17,6 +17,8 @@ config/icon="res://icon.svg" [display] +window/size/viewport_width=1280 +window/size/viewport_height=720 window/subwindows/embed_subwindows=false window/per_pixel_transparency/allowed=true diff --git a/scenes/main.gd b/scenes/main.gd index 7e65562..2c9cda5 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -4,9 +4,6 @@ extends Node2D func _ready() -> void: _on_microgame_spawn_timer_timeout() - # Spawn Clippette??? - $Clippette.visible = true - # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: 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.gd | 2 +- scenes/main.tscn | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scenes/main.gd b/scenes/main.gd index 2c9cda5..6949a8c 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -2,7 +2,7 @@ extends Node2D # Called when the node enters the scene tree for the first time. func _ready() -> void: - _on_microgame_spawn_timer_timeout() + pass # Called every frame. 'delta' is the elapsed time since the previous frame. 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 ++++----- scenes/microgames/fishin/fishin.gd | 4 ++-- scenes/microgames/fishin/node_2d.tscn | 6 ++---- 3 files changed, 8 insertions(+), 11 deletions(-) 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"] diff --git a/scenes/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd index 44b60db..c6f62d9 100644 --- a/scenes/microgames/fishin/fishin.gd +++ b/scenes/microgames/fishin/fishin.gd @@ -1,4 +1,4 @@ -extends MicrogameWindow +extends Node2D const IN_GAME_WAIT_TIME = 10 @@ -84,7 +84,7 @@ func _on_start_game_timeout() -> void: mouse.visible = true num_clicks = randi_range(5,21) - num_clicks = 21 + #num_clicks = 21 # YOU LOSE diff --git a/scenes/microgames/fishin/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn index 969ec34..c763777 100644 --- a/scenes/microgames/fishin/node_2d.tscn +++ b/scenes/microgames/fishin/node_2d.tscn @@ -48,10 +48,8 @@ _data = { "mash": SubResource("Animation_fxbt5") } -[node name="Node2D2" type="Window"] -position = Vector2i(0, 36) -size = Vector2i(930, 560) -unresizable = true +[node name="Fishin" type="Node2D"] +position = Vector2(0, 36) script = ExtResource("1_srw8b") [node name="background" type="Sprite2D" parent="."] -- 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 +++++- scenes/microgames/fishin/node_2d.tscn | 35 +++++++++++++++++++++++++---------- scenes/stockticker/Stock Ticker.tscn | 2 +- 3 files changed, 31 insertions(+), 12 deletions(-) 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"] diff --git a/scenes/microgames/fishin/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn index c763777..932fb56 100644 --- a/scenes/microgames/fishin/node_2d.tscn +++ b/scenes/microgames/fishin/node_2d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=3 uid="uid://c4s4pigu4pr48"] +[gd_scene load_steps=15 format=3 uid="uid://c4s4pigu4pr48"] [ext_resource type="Texture2D" uid="uid://voruypgyi77e" path="res://scenes/stockticker/UI-Background-Colour.png" id="1_cxqat"] [ext_resource type="Script" path="res://scenes/microgames/fishin/fishin.gd" id="1_srw8b"] @@ -10,6 +10,7 @@ [ext_resource type="Script" path="res://libs/shake_pivot.gd" id="7_vnrfy"] [ext_resource type="Texture2D" uid="uid://d4kyih3ivlqqc" path="res://scenes/microgames/fishin/KibbbySad.png" id="9_blola"] [ext_resource type="Texture2D" uid="uid://dcvie7ynwdfui" path="res://scenes/microgames/fishin/KibbbyHappy.png" id="10_1il5r"] +[ext_resource type="Texture2D" uid="uid://dpp7abs35p6i5" path="res://scenes/stockticker/fishe/gar.png" id="11_gjj1w"] [sub_resource type="Animation" id="Animation_bep6n"] length = 0.001 @@ -59,7 +60,7 @@ scale = Vector2(1300.5, 725.5) texture = ExtResource("1_cxqat") [node name="you!" type="Sprite2D" parent="."] -position = Vector2(535, 300) +position = Vector2(665, 458) texture = ExtResource("2_atppo") [node name="TextureButton" type="TextureButton" parent="."] @@ -78,7 +79,7 @@ script = ExtResource("7_vnrfy") [node name="pulling" type="Sprite2D" parent="ShakePivot"] visible = false -position = Vector2(535, 300) +position = Vector2(665, 458) texture = ExtResource("3_don82") [node name="ShakePivot2" type="Node2D" parent="."] @@ -86,10 +87,10 @@ script = ExtResource("7_vnrfy") [node name="MASH" type="Label" parent="ShakePivot2"] visible = false -offset_left = 150.0 -offset_top = 358.0 -offset_right = 570.0 -offset_bottom = 598.0 +offset_left = 286.0 +offset_top = 463.0 +offset_right = 706.0 +offset_bottom = 703.0 theme = ExtResource("5_7qce4") theme_override_colors/font_color = Color(1, 0, 0, 1) theme_override_font_sizes/font_size = 60 @@ -100,7 +101,7 @@ script = ExtResource("7_vnrfy") [node name="Mouse" type="Sprite2D" parent="ShakePivot3"] visible = false -position = Vector2(412, 532) +position = Vector2(548, 637) scale = Vector2(0.216276, 0.249769) [node name="StartGame" type="Timer" parent="."] @@ -111,14 +112,28 @@ wait_time = 3.0 [node name="SAD" type="Sprite2D" parent="."] visible = false -position = Vector2(535, 300) +position = Vector2(665, 458) texture = ExtResource("9_blola") [node name="Happy" type="Sprite2D" parent="."] visible = false -position = Vector2(535, 300) +position = Vector2(665, 458) texture = ExtResource("10_1il5r") +[node name="Catch" type="Sprite2D" parent="Happy"] +position = Vector2(-385, 50) +scale = Vector2(0.475, 0.492) +texture = ExtResource("11_gjj1w") + +[node name="Victory message" type="Label" parent="Happy"] +offset_left = -479.0 +offset_top = -398.0 +offset_right = 481.0 +offset_bottom = -334.0 +theme = ExtResource("5_7qce4") +theme_override_font_sizes/font_size = 64 +text = "You caught GAR!" + [node name="SuccessFail" type="Timer" parent="."] wait_time = 3.0 diff --git a/scenes/stockticker/Stock Ticker.tscn b/scenes/stockticker/Stock Ticker.tscn index f2b2ec6..ed94339 100644 --- a/scenes/stockticker/Stock Ticker.tscn +++ b/scenes/stockticker/Stock Ticker.tscn @@ -19,7 +19,7 @@ script = ExtResource("1_1gmdn") [node name="Background" type="Sprite2D" parent="."] modulate = Color(0.796078, 0.796078, 0.796078, 1) position = Vector2(639.75, 359.75) -scale = Vector2(1280.5, 720.5) +scale = Vector2(1280, 720) texture = ExtResource("1_wbfee") [node name="Timer" type="Timer" parent="."] -- 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.gd | 5 +++++ scenes/main.tscn | 6 +++--- scenes/microgames/fishin/fishin.gd | 13 +++++++++++-- scenes/microgames/fishin/node_2d.tscn | 4 ++++ scenes/stockticker/Stock Ticker.tscn | 1 - scenes/stockticker/transactions.gd | 4 ++++ 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/scenes/main.gd b/scenes/main.gd index 6949a8c..5349cf4 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -35,3 +35,8 @@ func _on_microgame_spawn_timer_timeout() -> void: func _on_microgame_win(window: MicrogameWindow): print("yay") + + +func _on_fishin_win() -> void: + $Fishin.visible = false + $"Stock ticker".start() 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"] diff --git a/scenes/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd index c6f62d9..6d53964 100644 --- a/scenes/microgames/fishin/fishin.gd +++ b/scenes/microgames/fishin/fishin.gd @@ -1,5 +1,7 @@ extends Node2D +signal win + const IN_GAME_WAIT_TIME = 10 var pulling: Sprite2D @@ -13,7 +15,9 @@ var shake2: ShakePivot var shake3: ShakePivot var start_game_timer: Timer var in_game_timer: Timer -var succfail_timer: Timer +# This used to mean "success/failure" but now means "you succ, failure" +var succfail_timer: Timer +var success_timer: Timer var in_minigame = false var num_clicks = 0 @@ -32,6 +36,7 @@ func _ready() -> void: start_game_timer = $StartGame in_game_timer = $InGame succfail_timer = $SuccessFail + success_timer = $Success # Called every frame. 'delta' is the elapsed time since the previous frame. @@ -63,7 +68,7 @@ func _on_texture_button_button_up() -> void: in_game_timer.stop() in_game_timer.wait_time = IN_GAME_WAIT_TIME - succfail_timer.start() + success_timer.start() func _on_start_game_timeout() -> void: @@ -111,3 +116,7 @@ func _on_success_fail_timeout() -> void: you.visible = true succfail_timer.stop() start_game_timer.start() + + +func _on_success_timeout() -> void: + win.emit() diff --git a/scenes/microgames/fishin/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn index 932fb56..e98b040 100644 --- a/scenes/microgames/fishin/node_2d.tscn +++ b/scenes/microgames/fishin/node_2d.tscn @@ -137,7 +137,11 @@ text = "You caught GAR!" [node name="SuccessFail" type="Timer" parent="."] wait_time = 3.0 +[node name="Success" type="Timer" parent="."] +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"] [connection signal="timeout" from="InGame" to="." method="_on_in_game_timeout"] [connection signal="timeout" from="SuccessFail" to="." method="_on_success_fail_timeout"] +[connection signal="timeout" from="Success" to="." method="_on_success_timeout"] diff --git a/scenes/stockticker/Stock Ticker.tscn b/scenes/stockticker/Stock Ticker.tscn index ed94339..6afa1af 100644 --- a/scenes/stockticker/Stock Ticker.tscn +++ b/scenes/stockticker/Stock Ticker.tscn @@ -23,7 +23,6 @@ scale = Vector2(1280, 720) texture = ExtResource("1_wbfee") [node name="Timer" type="Timer" parent="."] -autostart = true [node name="Sprite2D" type="Sprite2D" parent="."] position = Vector2(1036, 555) diff --git a/scenes/stockticker/transactions.gd b/scenes/stockticker/transactions.gd index daff901..39e25b9 100644 --- a/scenes/stockticker/transactions.gd +++ b/scenes/stockticker/transactions.gd @@ -15,3 +15,7 @@ func _on_stonks_sell(amount: Variant) -> void: print("+$%s" % amount.toString()) sell.emit(amount) + +# Scope creep! +func start(): + $Timer.start() -- cgit v1.2.3 From 760420412d591155c319f17d1a01d7edf7e5c01b Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 19:49:31 -0600 Subject: Add ROBLOX_OOF.MP3 --- funny_sounds/ROBLOX Oof Sound Effect.mp3 | Bin 0 -> 105148 bytes funny_sounds/ROBLOX Oof Sound Effect.mp3.import | 19 +++++++++++++++++++ scenes/microgames/fishin/fishin.gd | 2 ++ scenes/microgames/fishin/node_2d.tscn | 10 +++++++++- 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 funny_sounds/ROBLOX Oof Sound Effect.mp3 create mode 100644 funny_sounds/ROBLOX Oof Sound Effect.mp3.import diff --git a/funny_sounds/ROBLOX Oof Sound Effect.mp3 b/funny_sounds/ROBLOX Oof Sound Effect.mp3 new file mode 100644 index 0000000..a6fd66f Binary files /dev/null and b/funny_sounds/ROBLOX Oof Sound Effect.mp3 differ diff --git a/funny_sounds/ROBLOX Oof Sound Effect.mp3.import b/funny_sounds/ROBLOX Oof Sound Effect.mp3.import new file mode 100644 index 0000000..8a24f88 --- /dev/null +++ b/funny_sounds/ROBLOX Oof Sound Effect.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://beunakwyi8i82" +path="res://.godot/imported/ROBLOX Oof Sound Effect.mp3-8624320351dd8252c06c13358f68da4e.mp3str" + +[deps] + +source_file="res://funny_sounds/ROBLOX Oof Sound Effect.mp3" +dest_files=["res://.godot/imported/ROBLOX Oof Sound Effect.mp3-8624320351dd8252c06c13358f68da4e.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/scenes/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd index 6d53964..3a7a704 100644 --- a/scenes/microgames/fishin/fishin.gd +++ b/scenes/microgames/fishin/fishin.gd @@ -69,6 +69,7 @@ func _on_texture_button_button_up() -> void: in_game_timer.stop() in_game_timer.wait_time = IN_GAME_WAIT_TIME success_timer.start() + $"Yippee!".play() func _on_start_game_timeout() -> void: @@ -108,6 +109,7 @@ func _on_in_game_timeout() -> void: in_game_timer.stop() succfail_timer.start() + $"Fart".play() func _on_success_fail_timeout() -> void: diff --git a/scenes/microgames/fishin/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn index e98b040..5dc8da7 100644 --- a/scenes/microgames/fishin/node_2d.tscn +++ b/scenes/microgames/fishin/node_2d.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=3 uid="uid://c4s4pigu4pr48"] +[gd_scene load_steps=17 format=3 uid="uid://c4s4pigu4pr48"] [ext_resource type="Texture2D" uid="uid://voruypgyi77e" path="res://scenes/stockticker/UI-Background-Colour.png" id="1_cxqat"] [ext_resource type="Script" path="res://scenes/microgames/fishin/fishin.gd" id="1_srw8b"] @@ -11,6 +11,8 @@ [ext_resource type="Texture2D" uid="uid://d4kyih3ivlqqc" path="res://scenes/microgames/fishin/KibbbySad.png" id="9_blola"] [ext_resource type="Texture2D" uid="uid://dcvie7ynwdfui" path="res://scenes/microgames/fishin/KibbbyHappy.png" id="10_1il5r"] [ext_resource type="Texture2D" uid="uid://dpp7abs35p6i5" path="res://scenes/stockticker/fishe/gar.png" id="11_gjj1w"] +[ext_resource type="AudioStream" uid="uid://c6021mckr08w5" path="res://funny_sounds/Yippee - Meme Sound Effect.mp3" id="12_4oxp1"] +[ext_resource type="AudioStream" uid="uid://beunakwyi8i82" path="res://funny_sounds/ROBLOX Oof Sound Effect.mp3" id="13_kxv5l"] [sub_resource type="Animation" id="Animation_bep6n"] length = 0.001 @@ -140,6 +142,12 @@ wait_time = 3.0 [node name="Success" type="Timer" parent="."] wait_time = 3.0 +[node name="Yippee!" type="AudioStreamPlayer" parent="."] +stream = ExtResource("12_4oxp1") + +[node name="Fart" type="AudioStreamPlayer" parent="."] +stream = ExtResource("13_kxv5l") + [connection signal="button_up" from="TextureButton" to="." method="_on_texture_button_button_up"] [connection signal="timeout" from="StartGame" to="." method="_on_start_game_timeout"] [connection signal="timeout" from="InGame" to="." method="_on_in_game_timeout"] -- cgit v1.2.3 From 47c6fcc3b0ae7d79c29f1a4bfbfc5f12d44d3254 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 19:56:44 -0600 Subject: Restart the silliness after winning fishing --- scenes/main.gd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scenes/main.gd b/scenes/main.gd index 5349cf4..7ab90d5 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -40,3 +40,6 @@ func _on_microgame_win(window: MicrogameWindow): func _on_fishin_win() -> void: $Fishin.visible = false $"Stock ticker".start() + $"Microgame spawn timer".start() + $Clippette.visible = true + $"Score window (real)".visible = true -- cgit v1.2.3