From f1c476b3f1bf2ed0e1e64a45e21a8d3918ca5354 Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 17 Nov 2024 15:25:49 -0600 Subject: score insanity --- scenes/main.tscn | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index 9191200..7b6d467 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=52 format=3 uid="uid://d06d1vihf2oqp"] +[gd_scene load_steps=53 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"] @@ -9,6 +9,7 @@ [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="Script" path="res://libs/shake_pivot.gd" id="9_t2vd4"] [ext_resource type="PackedScene" uid="uid://c4s4pigu4pr48" path="res://scenes/microgames/fishin/node_2d.tscn" id="10_sx2ad"] [ext_resource type="AudioStream" uid="uid://di3mxkflh6a3o" path="res://funny_sounds/gamblecore.mp3" id="11_33353"] [ext_resource type="AudioStream" uid="uid://b45557wwianh8" path="res://funny_sounds/Super Mario 64 (Waaah) - Sound effect.mp3" id="12_xycxa"] @@ -306,7 +307,10 @@ stream = ExtResource("3_gatxj") visible = false [node name="Score window (real)" type="Window" parent="."] +position = Vector2i(0, 36) +size = Vector2i(1319, 300) visible = false +unresizable = true [node name="Score window" type="Node2D" parent="Score window (real)"] script = ExtResource("6_gvoxs") @@ -324,7 +328,28 @@ sprite_frames = SubResource("SpriteFrames_ke268") autoplay = "default" frame_progress = 0.387952 -[node name="Score" type="Label" parent="Score window (real)/Score window"] +[node name="ShakePivot" type="Node2D" parent="Score window (real)/Score window"] +visible = false +script = ExtResource("9_t2vd4") +NOISE_SHAKE_STRENGTH = 37.0 + +[node name="Label" type="Label" parent="Score window (real)/Score window/ShakePivot"] +offset_left = 24.45 +offset_top = 218.85 +offset_right = 448.45 +offset_bottom = 272.85 +theme = ExtResource("3_d7ku7") +theme_override_font_sizes/font_size = 53 +text = "+$100000" + +[node name="Timer" type="Timer" parent="Score window (real)/Score window/ShakePivot"] +wait_time = 0.5 + +[node name="ShakePivot2" type="Node2D" parent="Score window (real)/Score window"] +script = ExtResource("9_t2vd4") +NOISE_SHAKE_STRENGTH = 37.0 + +[node name="Score" type="Label" parent="Score window (real)/Score window/ShakePivot2"] offset_top = 2.0 offset_right = 1302.0 offset_bottom = 197.0 @@ -350,6 +375,7 @@ stream = ExtResource("12_xycxa") [connection signal="timeout" from="Microgame spawn timer" to="." method="_on_microgame_spawn_timer_timeout"] [connection signal="intro_finished" from="Clippette" to="." method="_on_clippette_intro_finished"] [connection signal="donezo" from="Score window (real)/Score window" to="." method="_on_score_window_donezo"] +[connection signal="timeout" from="Score window (real)/Score window/ShakePivot/Timer" to="Score window (real)/Score window" method="_on_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"] [connection signal="fish_chosen" from="Fishin" to="Stock ticker" method="_on_fishin_fish_chosen"] -- cgit v1.2.3 From 8a14702e10d576833ef6aa0f38df67660e945393 Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 17 Nov 2024 15:30:55 -0600 Subject: undo skew --- scenes/main.tscn | 1 + 1 file changed, 1 insertion(+) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index 7b6d467..252839a 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -289,6 +289,7 @@ animations = [{ }] [node name="Node2D2" type="Node2D"] +skew = 0.122173 script = ExtResource("1_y7a0r") [node name="Sprite2D" type="Sprite2D" parent="."] -- cgit v1.2.3 From 67371be0130f40cd9108ea50a65092d390c7d305 Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sun, 17 Nov 2024 15:32:50 -0600 Subject: fix for real this time --- scenes/main.tscn | 1 - 1 file changed, 1 deletion(-) (limited to 'scenes/main.tscn') diff --git a/scenes/main.tscn b/scenes/main.tscn index 252839a..7b6d467 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -289,7 +289,6 @@ animations = [{ }] [node name="Node2D2" type="Node2D"] -skew = 0.122173 script = ExtResource("1_y7a0r") [node name="Sprite2D" type="Sprite2D" parent="."] -- cgit v1.2.3