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/stockticker/Stock Ticker.tscn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scenes/stockticker/Stock Ticker.tscn') 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) -- 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 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'scenes/stockticker/Stock Ticker.tscn') 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 -- 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(-) (limited to 'scenes/stockticker/Stock Ticker.tscn') 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