diff options
| -rw-r--r-- | scenes/microgames/fishin/node_2d.tscn | 2 | ||||
| -rw-r--r-- | scenes/stockticker/Stock Ticker.tscn | 52 | ||||
| -rw-r--r-- | scenes/stockticker/stonks.gd | 5 |
3 files changed, 36 insertions, 23 deletions
diff --git a/scenes/microgames/fishin/node_2d.tscn b/scenes/microgames/fishin/node_2d.tscn index 9042568..969ec34 100644 --- a/scenes/microgames/fishin/node_2d.tscn +++ b/scenes/microgames/fishin/node_2d.tscn @@ -48,7 +48,7 @@ _data = { "mash": SubResource("Animation_fxbt5") } -[node name="Node2D" type="Window"] +[node name="Node2D2" type="Window"] position = Vector2i(0, 36) size = Vector2i(930, 560) unresizable = true diff --git a/scenes/stockticker/Stock Ticker.tscn b/scenes/stockticker/Stock Ticker.tscn index 6c0e1fb..f2b2ec6 100644 --- a/scenes/stockticker/Stock Ticker.tscn +++ b/scenes/stockticker/Stock Ticker.tscn @@ -1,15 +1,17 @@ -[gd_scene load_steps=11 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"] [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") @@ -23,9 +25,34 @@ 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") +[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 @@ -34,11 +61,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 @@ -119,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) @@ -136,21 +161,6 @@ theme = ExtResource("8_yqn4n") text = "Stock Bankrupt" horizontal_alignment = 1 -[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"] diff --git a/scenes/stockticker/stonks.gd b/scenes/stockticker/stonks.gd index 1279382..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) @@ -135,6 +136,8 @@ func _on_timer_timeout() -> void: new_price = Big.new(0) shares = 0 shares_label.text = "Shares\nHeld:%d" % shares + $AudioStreamPlayer.play() + $ShakePivot.shake() if len(price_history) >= MAX_PRICES: price_history.pop_front() |