diff options
| -rw-r--r-- | scenes/main.tscn | 2 | ||||
| -rw-r--r-- | scenes/microgames/fishin/node_2d.tscn | 22 | ||||
| -rw-r--r-- | scenes/stockticker/Stock Ticker.tscn | 6 | ||||
| -rw-r--r-- | 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() |