From 1e4c8bc17404ab9a22f94a22430c57dbffc354c0 Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sat, 16 Nov 2024 16:38:29 -0600 Subject: add complete fishing minigame --- UI/MousePrompt.png | Bin 0 -> 13309 bytes UI/MousePrompt.png.import | 34 ++++++ UI/MousePrompt.xcf | Bin 0 -> 87260 bytes UI/MousePrompt2.png | Bin 0 -> 13959 bytes UI/MousePrompt2.png.import | 34 ++++++ libs/shake_pivot.gd | 55 +++++++++ scenes/microgames/fishin/Kibbby.png | Bin 0 -> 9264 bytes scenes/microgames/fishin/Kibbby.png.import | 34 ++++++ scenes/microgames/fishin/Kibbby.xcf | Bin 0 -> 90677 bytes scenes/microgames/fishin/Kibbby2.xcf | Bin 0 -> 53157 bytes scenes/microgames/fishin/KibbbyHappy.png | Bin 0 -> 9082 bytes scenes/microgames/fishin/KibbbyHappy.png.import | 34 ++++++ scenes/microgames/fishin/KibbbyPulling.png | Bin 0 -> 13551 bytes scenes/microgames/fishin/KibbbyPulling.png.import | 34 ++++++ scenes/microgames/fishin/KibbbySad.png | Bin 0 -> 9267 bytes scenes/microgames/fishin/KibbbySad.png.import | 34 ++++++ scenes/microgames/fishin/fishin.gd | 112 +++++++++++++++++++ scenes/microgames/fishin/node_2d.tscn | 130 ++++++++++++++++++++++ 18 files changed, 501 insertions(+) create mode 100644 UI/MousePrompt.png create mode 100644 UI/MousePrompt.png.import create mode 100644 UI/MousePrompt.xcf create mode 100644 UI/MousePrompt2.png create mode 100644 UI/MousePrompt2.png.import create mode 100644 libs/shake_pivot.gd create mode 100644 scenes/microgames/fishin/Kibbby.png create mode 100644 scenes/microgames/fishin/Kibbby.png.import create mode 100644 scenes/microgames/fishin/Kibbby.xcf create mode 100644 scenes/microgames/fishin/Kibbby2.xcf create mode 100644 scenes/microgames/fishin/KibbbyHappy.png create mode 100644 scenes/microgames/fishin/KibbbyHappy.png.import create mode 100644 scenes/microgames/fishin/KibbbyPulling.png create mode 100644 scenes/microgames/fishin/KibbbyPulling.png.import create mode 100644 scenes/microgames/fishin/KibbbySad.png create mode 100644 scenes/microgames/fishin/KibbbySad.png.import create mode 100644 scenes/microgames/fishin/fishin.gd create mode 100644 scenes/microgames/fishin/node_2d.tscn diff --git a/UI/MousePrompt.png b/UI/MousePrompt.png new file mode 100644 index 0000000..51265cd Binary files /dev/null and b/UI/MousePrompt.png differ diff --git a/UI/MousePrompt.png.import b/UI/MousePrompt.png.import new file mode 100644 index 0000000..57f457c --- /dev/null +++ b/UI/MousePrompt.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://is20ioxt1vtm" +path="res://.godot/imported/MousePrompt.png-ed9ca78d2e5824537b7a8763755c2eae.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/MousePrompt.png" +dest_files=["res://.godot/imported/MousePrompt.png-ed9ca78d2e5824537b7a8763755c2eae.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/UI/MousePrompt.xcf b/UI/MousePrompt.xcf new file mode 100644 index 0000000..0031fde Binary files /dev/null and b/UI/MousePrompt.xcf differ diff --git a/UI/MousePrompt2.png b/UI/MousePrompt2.png new file mode 100644 index 0000000..636f271 Binary files /dev/null and b/UI/MousePrompt2.png differ diff --git a/UI/MousePrompt2.png.import b/UI/MousePrompt2.png.import new file mode 100644 index 0000000..57e3b88 --- /dev/null +++ b/UI/MousePrompt2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://us0sonuda24u" +path="res://.godot/imported/MousePrompt2.png-c917e8205ae3985a502b0999c84ef600.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://UI/MousePrompt2.png" +dest_files=["res://.godot/imported/MousePrompt2.png-c917e8205ae3985a502b0999c84ef600.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/libs/shake_pivot.gd b/libs/shake_pivot.gd new file mode 100644 index 0000000..5794ca0 --- /dev/null +++ b/libs/shake_pivot.gd @@ -0,0 +1,55 @@ +class_name ShakePivot +extends Node2D +## Shakes on command. Use this node as the parent of a sprite or a camera to make it shake! +## Adapted from https://shaggydev.com/2022/02/23/screen-shake-godot/. + +## How quickly to move through the noise. +@export var NOISE_SHAKE_SPEED: float = 20.0 +## How much to multiply the noise values (which are in the range (-1, 1)) by. +@export var NOISE_SHAKE_STRENGTH: float = 15.0 +## Multiplier for lerping the shake strength to zero. +@export var SHAKE_DECAY_RATE: float = 10.0 + +## Object that creates random noise to make for a nice shaking motion. +@onready var _noise := FastNoiseLite.new() + +## Used to keep track of where we are in the noise so we can smoothly move through it. +var noise_i: float = 0.0 +## Value taken from the noise to calculate the shaking node's position. +var shake_strength: float = 0.0 + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + # Set noise type to simplex, since the tutorial I'm copying (uh I mean taking inspiration from) + # is for an older version of Godot that had a dedicated simplex noise class + _noise.noise_type = FastNoiseLite.TYPE_SIMPLEX + # Randomize the generated noise + _noise.seed = randi() + # Period affects how quickly the noise changes values + _noise.frequency = 0.5 + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + # Fade out the intensity over time + shake_strength = lerp(shake_strength, 0.0, SHAKE_DECAY_RATE * delta) + + # Shake by adjusting position so we can move the object around + position = get_noise_offset(delta) + + +## Uses noise to generate a random 2D vector +func get_noise_offset(delta: float) -> Vector2: + noise_i += delta * NOISE_SHAKE_SPEED + # Set the x values of each call to 'get_noise_2d' to a different value so that our x and y + # vectors will read from unrelated areas of noise + return Vector2( + _noise.get_noise_2d(1, noise_i) * shake_strength, + _noise.get_noise_2d(100, noise_i) * shake_strength + ) + + +## Sets the strength to its initial value. +func shake() -> void: + shake_strength = NOISE_SHAKE_STRENGTH diff --git a/scenes/microgames/fishin/Kibbby.png b/scenes/microgames/fishin/Kibbby.png new file mode 100644 index 0000000..2631003 Binary files /dev/null and b/scenes/microgames/fishin/Kibbby.png differ diff --git a/scenes/microgames/fishin/Kibbby.png.import b/scenes/microgames/fishin/Kibbby.png.import new file mode 100644 index 0000000..d58c2cb --- /dev/null +++ b/scenes/microgames/fishin/Kibbby.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://crpp1qfyk4tv7" +path="res://.godot/imported/Kibbby.png-a5e7e28c8f175ffac07cfcdb8f612803.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/microgames/fishin/Kibbby.png" +dest_files=["res://.godot/imported/Kibbby.png-a5e7e28c8f175ffac07cfcdb8f612803.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/microgames/fishin/Kibbby.xcf b/scenes/microgames/fishin/Kibbby.xcf new file mode 100644 index 0000000..c080cc2 Binary files /dev/null and b/scenes/microgames/fishin/Kibbby.xcf differ diff --git a/scenes/microgames/fishin/Kibbby2.xcf b/scenes/microgames/fishin/Kibbby2.xcf new file mode 100644 index 0000000..9aaf4dc Binary files /dev/null and b/scenes/microgames/fishin/Kibbby2.xcf differ diff --git a/scenes/microgames/fishin/KibbbyHappy.png b/scenes/microgames/fishin/KibbbyHappy.png new file mode 100644 index 0000000..b9756cd Binary files /dev/null and b/scenes/microgames/fishin/KibbbyHappy.png differ diff --git a/scenes/microgames/fishin/KibbbyHappy.png.import b/scenes/microgames/fishin/KibbbyHappy.png.import new file mode 100644 index 0000000..071e612 --- /dev/null +++ b/scenes/microgames/fishin/KibbbyHappy.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dcvie7ynwdfui" +path="res://.godot/imported/KibbbyHappy.png-2f6e79d205df1bdf038b3aa13617c533.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/microgames/fishin/KibbbyHappy.png" +dest_files=["res://.godot/imported/KibbbyHappy.png-2f6e79d205df1bdf038b3aa13617c533.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/microgames/fishin/KibbbyPulling.png b/scenes/microgames/fishin/KibbbyPulling.png new file mode 100644 index 0000000..a6bc22b Binary files /dev/null and b/scenes/microgames/fishin/KibbbyPulling.png differ diff --git a/scenes/microgames/fishin/KibbbyPulling.png.import b/scenes/microgames/fishin/KibbbyPulling.png.import new file mode 100644 index 0000000..dc61ec1 --- /dev/null +++ b/scenes/microgames/fishin/KibbbyPulling.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://br3jiit0v6jes" +path="res://.godot/imported/KibbbyPulling.png-351fdd0a725255d7bbe5dd2e3b228f38.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/microgames/fishin/KibbbyPulling.png" +dest_files=["res://.godot/imported/KibbbyPulling.png-351fdd0a725255d7bbe5dd2e3b228f38.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/microgames/fishin/KibbbySad.png b/scenes/microgames/fishin/KibbbySad.png new file mode 100644 index 0000000..091f77b Binary files /dev/null and b/scenes/microgames/fishin/KibbbySad.png differ diff --git a/scenes/microgames/fishin/KibbbySad.png.import b/scenes/microgames/fishin/KibbbySad.png.import new file mode 100644 index 0000000..2fedff6 --- /dev/null +++ b/scenes/microgames/fishin/KibbbySad.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d4kyih3ivlqqc" +path="res://.godot/imported/KibbbySad.png-583f604f245d5791b483e626ccda4f31.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/microgames/fishin/KibbbySad.png" +dest_files=["res://.godot/imported/KibbbySad.png-583f604f245d5791b483e626ccda4f31.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/microgames/fishin/fishin.gd b/scenes/microgames/fishin/fishin.gd new file mode 100644 index 0000000..7e1ae3c --- /dev/null +++ b/scenes/microgames/fishin/fishin.gd @@ -0,0 +1,112 @@ +extends MicrogameWindow + +const IN_GAME_WAIT_TIME = 10 + +var pulling: Sprite2D +var mash: Label +var you: Sprite2D +var sad: Sprite2D +var happy: Sprite2D +var mouse: Sprite2D +var shake: ShakePivot +var shake2: ShakePivot +var shake3: ShakePivot +var start_game_timer: Timer +var in_game_timer: Timer +var succfail_timer: Timer + +var in_minigame = false +var num_clicks = 0 + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pulling = $ShakePivot/pulling + you = $"you!" + mash = $ShakePivot2/MASH + mouse = $ShakePivot3/Mouse + shake = $ShakePivot + shake2 = $ShakePivot2 + shake3 = $ShakePivot3 + sad = $SAD + happy = $Happy + start_game_timer = $StartGame + in_game_timer = $InGame + succfail_timer = $SuccessFail + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass + + +func _on_texture_button_button_up() -> void: + shake.shake() + shake2.shake() + shake3.shake() + + if in_minigame: + num_clicks -= 1 + + # YOU WIN + if num_clicks == 0: + in_minigame = false + + # hide non-happy cats + pulling.visible = false + mash.visible = false + mouse.visible = false + sad.visible = false + you.visible = false + + # show happy cat + happy.visible = true + + in_game_timer.stop() + in_game_timer.wait_time = IN_GAME_WAIT_TIME + succfail_timer.start() + + +func _on_start_game_timeout() -> void: + if randf() < 0.1: + start_game_timer.stop() + in_game_timer.start() + + in_minigame = true + + # hide passive cats + you.visible = false + sad.visible = false + happy.visible = false + + # show active cat + pulling.visible = true + mash.visible = true + mouse.visible = true + + num_clicks = randi_range(5,20) + + +# YOU LOSE +func _on_in_game_timeout() -> void: + in_minigame = false + + # hide non-sad cats + you.visible = false + happy.visible = false + pulling.visible = false + mash.visible = false + mouse.visible = false + + # show sad cat + sad.visible = true + + in_game_timer.stop() + succfail_timer.start() + + +func _on_success_fail_timeout() -> void: + sad.visible = false + happy.visible = false + you.visible = true + succfail_timer.stop() + start_game_timer.start() diff --git a/scenes/microgames/fishin/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn new file mode 100644 index 0000000..94dbecb --- /dev/null +++ b/scenes/microgames/fishin/node_2d.tscn @@ -0,0 +1,130 @@ +[gd_scene load_steps=14 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"] +[ext_resource type="Texture2D" uid="uid://crpp1qfyk4tv7" path="res://scenes/microgames/fishin/Kibbby.png" id="2_atppo"] +[ext_resource type="Texture2D" uid="uid://br3jiit0v6jes" path="res://scenes/microgames/fishin/KibbbyPulling.png" id="3_don82"] +[ext_resource type="Theme" uid="uid://ve18rbkeiwti" path="res://UI/text.tres" id="5_7qce4"] +[ext_resource type="Texture2D" uid="uid://is20ioxt1vtm" path="res://UI/MousePrompt.png" id="6_7ls0g"] +[ext_resource type="Texture2D" uid="uid://us0sonuda24u" path="res://UI/MousePrompt2.png" id="7_qpcgm"] +[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"] + +[sub_resource type="Animation" id="Animation_fxbt5"] +resource_name = "mash" +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ShakePivot3/Mouse:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0.0333334, 0.466667), +"transitions": PackedFloat32Array(1, 1), +"update": 1, +"values": [ExtResource("6_7ls0g"), ExtResource("7_qpcgm")] +} + +[sub_resource type="Animation" id="Animation_bep6n"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("ShakePivot3/Mouse:texture") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [null] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_7e725"] +_data = { +"RESET": SubResource("Animation_bep6n"), +"mash": SubResource("Animation_fxbt5") +} + +[node name="Node2D" type="Window"] +position = Vector2i(0, 36) +size = Vector2i(930, 560) +unresizable = true +script = ExtResource("1_srw8b") + +[node name="background" type="Sprite2D" parent="."] +modulate = Color(0.42, 0.700333, 1, 1) +position = Vector2(649.75, 362.25) +scale = Vector2(1300.5, 725.5) +texture = ExtResource("1_cxqat") + +[node name="you!" type="Sprite2D" parent="."] +position = Vector2(535, 300) +texture = ExtResource("2_atppo") + +[node name="TextureButton" type="TextureButton" parent="."] +offset_right = 1298.0 +offset_bottom = 728.0 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +libraries = { +"": SubResource("AnimationLibrary_7e725") +} +autoplay = "mash" +speed_scale = 8.0 + +[node name="ShakePivot" type="Node2D" parent="."] +script = ExtResource("7_vnrfy") + +[node name="pulling" type="Sprite2D" parent="ShakePivot"] +visible = false +position = Vector2(535, 300) +texture = ExtResource("3_don82") + +[node name="ShakePivot2" type="Node2D" parent="."] +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 +theme = ExtResource("5_7qce4") +theme_override_colors/font_color = Color(1, 0, 0, 1) +theme_override_font_sizes/font_size = 60 +text = "MASH!!!" + +[node name="ShakePivot3" type="Node2D" parent="."] +script = ExtResource("7_vnrfy") + +[node name="Mouse" type="Sprite2D" parent="ShakePivot3"] +visible = false +position = Vector2(412, 532) +scale = Vector2(0.216276, 0.249769) + +[node name="StartGame" type="Timer" parent="."] +autostart = true + +[node name="InGame" type="Timer" parent="."] +wait_time = 10.0 + +[node name="SAD" type="Sprite2D" parent="."] +visible = false +position = Vector2(535, 300) +texture = ExtResource("9_blola") + +[node name="Happy" type="Sprite2D" parent="."] +visible = false +position = Vector2(535, 300) +texture = ExtResource("10_1il5r") + +[node name="SuccessFail" type="Timer" parent="."] +wait_time = 2.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"] -- cgit v1.2.3 From c92e9a17a8ddb45f3fc3450dce7a6bea68e492b3 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 68bfe8975892971b8e61843c521ffac693608540 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 605873fa388a9b092baa495c3c8bbfee3902719c 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 ab47e086ec819884837c79087d374c94b94fa889 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 e97061b33f517020a3eaf85a5d2aa2500e62aa08 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 9ab6f6e2093038a7f79c6321fda8ad44bd99347b Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 17:09:11 -0600 Subject: Haha bonk I think --- scenes/main.tscn | 2 +- scenes/microgames/fishin/node_2d.tscn | 22 +++++++++++----------- scenes/stockticker/Stock Ticker.tscn | 6 +++++- scenes/stockticker/stonks.gd | 1 + 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/scenes/main.tscn b/scenes/main.tscn index a4504b9..1b5c89f 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.387952 +frame_progress = 0.263904 [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/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn index 94dbecb..7d2ac0a 100644 --- a/scenes/microgames/fishin/node_2d.tscn +++ b/scenes/microgames/fishin/node_2d.tscn @@ -11,9 +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"] -[sub_resource type="Animation" id="Animation_fxbt5"] -resource_name = "mash" -loop_mode = 1 +[sub_resource type="Animation" id="Animation_bep6n"] +length = 0.001 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -21,14 +20,15 @@ tracks/0/path = NodePath("ShakePivot3/Mouse:texture") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0.0333334, 0.466667), -"transitions": PackedFloat32Array(1, 1), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 1, -"values": [ExtResource("6_7ls0g"), ExtResource("7_qpcgm")] +"values": [null] } -[sub_resource type="Animation" id="Animation_bep6n"] -length = 0.001 +[sub_resource type="Animation" id="Animation_fxbt5"] +resource_name = "mash" +loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -36,10 +36,10 @@ tracks/0/path = NodePath("ShakePivot3/Mouse:texture") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0.0333334, 0.466667), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [null] +"values": [ExtResource("6_7ls0g"), ExtResource("7_qpcgm")] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_7e725"] diff --git a/scenes/stockticker/Stock Ticker.tscn b/scenes/stockticker/Stock Ticker.tscn index 6c0e1fb..16e8176 100644 --- a/scenes/stockticker/Stock Ticker.tscn +++ b/scenes/stockticker/Stock Ticker.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://g2veoq55y14i"] +[gd_scene load_steps=12 format=3 uid="uid://g2veoq55y14i"] [ext_resource type="Script" path="res://scenes/stockticker/transactions.gd" id="1_1gmdn"] [ext_resource type="Texture2D" uid="uid://voruypgyi77e" path="res://scenes/stockticker/UI-Background-Colour.png" id="1_wbfee"] @@ -10,6 +10,7 @@ [ext_resource type="Texture2D" uid="uid://b773rtpy6rtx5" path="res://scenes/stockticker/SellButtonPressed.png" id="8_essj7"] [ext_resource type="Theme" path="res://UI/darksouls.tres" id="8_yqn4n"] [ext_resource type="Texture2D" uid="uid://dpp7abs35p6i5" path="res://scenes/stockticker/fishe/gar.png" id="9_bv8iw"] +[ext_resource type="AudioStream" uid="uid://cy3ahp7fec1y2" path="res://funny_sounds/Metal pipe falling sound effect(loud).mp3" id="10_rkl57"] [node name="Node2D" type="Node2D"] script = ExtResource("1_1gmdn") @@ -136,6 +137,9 @@ theme = ExtResource("8_yqn4n") text = "Stock Bankrupt" horizontal_alignment = 1 +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Stonks"] +stream = ExtResource("10_rkl57") + [node name="Sprite2D" type="Sprite2D" parent="."] position = Vector2(1036, 555) scale = Vector2(0.671875, 0.622) diff --git a/scenes/stockticker/stonks.gd b/scenes/stockticker/stonks.gd index 1279382..cb556f4 100644 --- a/scenes/stockticker/stonks.gd +++ b/scenes/stockticker/stonks.gd @@ -135,6 +135,7 @@ func _on_timer_timeout() -> void: new_price = Big.new(0) shares = 0 shares_label.text = "Shares\nHeld:%d" % shares + $AudioStreamPlayer.play() if len(price_history) >= MAX_PRICES: price_history.pop_front() -- cgit v1.2.3 From 98c0e0e97e0f01a28ad55873da44e3aa586c3424 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 17:18:21 -0600 Subject: Make stonk window shake upon bankruptcy --- scenes/stockticker/Stock Ticker.tscn | 18 ++++++++++++------ scenes/stockticker/stonks.gd | 4 +++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/scenes/stockticker/Stock Ticker.tscn b/scenes/stockticker/Stock Ticker.tscn index 16e8176..cdd12c8 100644 --- a/scenes/stockticker/Stock Ticker.tscn +++ b/scenes/stockticker/Stock Ticker.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=12 format=3 uid="uid://g2veoq55y14i"] +[gd_scene load_steps=13 format=3 uid="uid://g2veoq55y14i"] [ext_resource type="Script" path="res://scenes/stockticker/transactions.gd" id="1_1gmdn"] [ext_resource type="Texture2D" uid="uid://voruypgyi77e" path="res://scenes/stockticker/UI-Background-Colour.png" id="1_wbfee"] [ext_resource type="Script" path="res://scenes/stockticker/stonks.gd" id="2_pan4m"] [ext_resource type="Theme" uid="uid://ve18rbkeiwti" path="res://UI/text.tres" id="3_dv3dr"] +[ext_resource type="Script" path="res://libs/shake_pivot.gd" id="4_ofsrv"] [ext_resource type="Texture2D" uid="uid://vie3nmimge1t" path="res://scenes/stockticker/BuyButton.png" id="5_mpf30"] [ext_resource type="Texture2D" uid="uid://dvidbk3clx6dn" path="res://scenes/stockticker/BuyButtonPressed.png" id="6_styy2"] [ext_resource type="Texture2D" uid="uid://dw8wpd47me7wu" path="res://scenes/stockticker/SellButton.png" id="7_h6hir"] @@ -27,6 +28,16 @@ autostart = true [node name="Stonks" type="Node2D" parent="."] script = ExtResource("2_pan4m") +[node name="ShakePivot" type="Node2D" parent="Stonks"] +script = ExtResource("4_ofsrv") +NOISE_SHAKE_STRENGTH = 30.0 +SHAKE_DECAY_RATE = 5.0 + +[node name="StonkWindow" type="Sprite2D" parent="Stonks/ShakePivot"] +position = Vector2(582, 205) +scale = Vector2(1062.25, 337) +texture = ExtResource("1_wbfee") + [node name="SellButton" type="TextureButton" parent="Stonks"] offset_left = 439.0 offset_top = 565.0 @@ -35,11 +46,6 @@ offset_bottom = 694.0 texture_normal = ExtResource("7_h6hir") texture_pressed = ExtResource("8_essj7") -[node name="StonkWindow" type="Sprite2D" parent="Stonks"] -position = Vector2(582, 205) -scale = Vector2(1062.25, 337) -texture = ExtResource("1_wbfee") - [node name="TopLine" type="Line2D" parent="Stonks"] points = PackedVector2Array(50, 60, 1000, 60) width = 1.0 diff --git a/scenes/stockticker/stonks.gd b/scenes/stockticker/stonks.gd index cb556f4..5cb0ab4 100644 --- a/scenes/stockticker/stonks.gd +++ b/scenes/stockticker/stonks.gd @@ -20,7 +20,7 @@ var darksouls_text: Label var price_history = [] var base_pos_mult = 0.5 # no size limit -var base_neg_mult = 0.5 # probably keep this below 1 +var base_neg_mult = 100.5 # probably keep this below 1 var hype_mult = 1.0 var hype_decr = 0.1 @@ -71,6 +71,7 @@ func draw_stonks(minval: Big, maxval: Big) -> void: var pos = Vector2(x_pos, y_pos) stonks.add_point(pos, index) index += 1 + func get_min_price() -> Big: var minval = Big.new(-1) @@ -136,6 +137,7 @@ func _on_timer_timeout() -> void: shares = 0 shares_label.text = "Shares\nHeld:%d" % shares $AudioStreamPlayer.play() + $ShakePivot.shake() if len(price_history) >= MAX_PRICES: price_history.pop_front() -- cgit v1.2.3 From d01f8f1ccec407f656ec3924f424bef66b88142f Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sat, 16 Nov 2024 17:18:30 -0600 Subject: timing --- scenes/microgames/fishin/fishin.gd | 3 ++- scenes/microgames/fishin/node_2d.tscn | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) 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 94dbecb..9042568 100644 --- a/scenes/microgames/fishin/node_2d.tscn +++ b/scenes/microgames/fishin/node_2d.tscn @@ -11,9 +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"] -[sub_resource type="Animation" id="Animation_fxbt5"] -resource_name = "mash" -loop_mode = 1 +[sub_resource type="Animation" id="Animation_bep6n"] +length = 0.001 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -21,14 +20,15 @@ tracks/0/path = NodePath("ShakePivot3/Mouse:texture") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0.0333334, 0.466667), -"transitions": PackedFloat32Array(1, 1), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 1, -"values": [ExtResource("6_7ls0g"), ExtResource("7_qpcgm")] +"values": [null] } -[sub_resource type="Animation" id="Animation_bep6n"] -length = 0.001 +[sub_resource type="Animation" id="Animation_fxbt5"] +resource_name = "mash" +loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -36,10 +36,10 @@ tracks/0/path = NodePath("ShakePivot3/Mouse:texture") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0.0333334, 0.466667), +"transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [null] +"values": [ExtResource("6_7ls0g"), ExtResource("7_qpcgm")] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_7e725"] @@ -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"] -- cgit v1.2.3 From 44e036f8b79ea77c540244875c4f8135a957e6b2 Mon Sep 17 00:00:00 2001 From: Zoey Kitt Date: Sat, 16 Nov 2024 17:26:43 -0600 Subject: Fix Dark Souls text layering --- scenes/stockticker/Stock Ticker.tscn | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/scenes/stockticker/Stock Ticker.tscn b/scenes/stockticker/Stock Ticker.tscn index cdd12c8..f2b2ec6 100644 --- a/scenes/stockticker/Stock Ticker.tscn +++ b/scenes/stockticker/Stock Ticker.tscn @@ -25,6 +25,21 @@ texture = ExtResource("1_wbfee") [node name="Timer" type="Timer" parent="."] autostart = true +[node name="Sprite2D" type="Sprite2D" parent="."] +position = Vector2(1036, 555) +scale = Vector2(0.671875, 0.622) +texture = ExtResource("9_bv8iw") + +[node name="Label" type="Label" parent="."] +offset_left = 823.0 +offset_top = 588.0 +offset_right = 1082.0 +offset_bottom = 785.0 +theme = ExtResource("3_dv3dr") +theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_font_sizes/font_size = 82 +text = "GAR" + [node name="Stonks" type="Node2D" parent="."] script = ExtResource("2_pan4m") @@ -126,6 +141,9 @@ theme = ExtResource("3_dv3dr") text = "Shares Held:" +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Stonks"] +stream = ExtResource("10_rkl57") + [node name="DarkSoulsTextBox" type="Sprite2D" parent="Stonks"] visible = false self_modulate = Color(0, 0, 0, 0.721569) @@ -143,24 +161,6 @@ theme = ExtResource("8_yqn4n") text = "Stock Bankrupt" horizontal_alignment = 1 -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Stonks"] -stream = ExtResource("10_rkl57") - -[node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2(1036, 555) -scale = Vector2(0.671875, 0.622) -texture = ExtResource("9_bv8iw") - -[node name="Label" type="Label" parent="."] -offset_left = 823.0 -offset_top = 588.0 -offset_right = 1082.0 -offset_bottom = 785.0 -theme = ExtResource("3_dv3dr") -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 82 -text = "GAR" - [connection signal="timeout" from="Timer" to="Stonks" method="_on_timer_timeout"] [connection signal="buy" from="Stonks" to="." method="_on_stonks_buy"] [connection signal="sell" from="Stonks" to="." method="_on_stonks_sell"] -- cgit v1.2.3 From 4e7da00304de8bda55f7499186a51154241fa6f3 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 9961be9780edb82021e91d3b1ab75936ccec3c9c 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 2a1cc7ed4628997e5e1b7299868d955ed2f7344d 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 b88ab51901dab2d1389d9407ff1216812b5c3d7f 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 332e3aced7c7d112d6ae04c7a075964f9b211ae8 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