Decouple everything from globals

This commit is contained in:
2026-04-10 01:09:57 +02:00
parent b758803afe
commit f671ab3419
56 changed files with 993 additions and 1291 deletions

View File

@@ -4,7 +4,7 @@
[ext_resource type="Texture2D" uid="uid://cry4arn00kgrt" path="res://docs/gyms/tiny_sword/buildings/castle/Castle.png" id="1_tgvch"]
[ext_resource type="PackedScene" uid="uid://dlidx2x0otpjg" path="res://core/prestige/prestige_panel.tscn" id="3_l7gct"]
[ext_resource type="Script" uid="uid://cpfmctd4xsfho" path="res://docs/gyms/tiny_sword/buildings/castle/test_buff.gd" id="4_l7gct"]
[ext_resource type="Resource" uid="uid://bjc6qmvr7pe12" path="res://docs/gyms/buffs/spawn_worker.tres" id="5_s3a5k"]
[ext_resource type="Resource" uid="uid://bjc6qmvr7pe12" path="res://docs/gyms/tiny_sword/buffs/spawn_worker_buff.tres" id="5_s3a5k"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_tgvch"]
size = Vector2(312, 198)

View File

@@ -1,6 +1,7 @@
extends PanelContainer
@export var buff_data: GeneratorBuffData
@export var game_state: LevelGameState
@onready var _label: Label = $HBoxContainer/Label
@onready var _button: Button = $HBoxContainer/Button
@@ -19,9 +20,10 @@ func _ready() -> void:
_button.disabled = true
_button.pressed.connect(_on_button_pressed)
GameState.buff_level_changed.connect(_on_buff_level_changed)
GameState.buff_unlocked_changed.connect(_on_buff_unlocked_changed)
GameState.currency_changed.connect(_on_currency_changed)
if game_state:
game_state.buff_level_changed.connect(_on_buff_level_changed)
game_state.buff_unlocked_changed.connect(_on_buff_unlocked_changed)
game_state.currency_changed.connect(_on_currency_changed)
_update_ui()
@@ -35,9 +37,9 @@ func _on_button_pressed() -> void:
return
var cost: BigNumber = buff_data.get_cost_for_level(_current_level)
if GameState.spend_currency_by_id(cost_currency_id, cost):
if game_state and game_state.spend_currency_by_id(cost_currency_id, cost):
var next_level: int = _current_level + 1
GameState.set_buff_level(buff_data.id, next_level)
game_state.set_buff_level(buff_data.id, next_level)
_apply_buff_effect(buff_data, next_level)
_current_level = next_level
_update_ui()
@@ -54,15 +56,17 @@ func _apply_buff_effect(buff: GeneratorBuffData, level: int) -> void:
return
var purchased_amount: BigNumber = buff.get_resource_purchase_amount_for_level(level)
if purchased_amount.mantissa > 0.0:
GameState.add_currency_by_id(target_currency_id, purchased_amount)
if purchased_amount.mantissa > 0.0 and game_state:
game_state.add_currency_by_id(target_currency_id, purchased_amount)
func _resolve_buff_target_currency_id(buff: GeneratorBuffData) -> StringName:
if buff.resource_target_currency == null:
return &""
return CurrencyDatabase.get_currency_id(buff.resource_target_currency)
if game_state == null:
return &""
return game_state.get_currency_id(buff.resource_target_currency)
func _on_buff_level_changed(buff_id: StringName, new_level: int) -> void:
@@ -82,7 +86,7 @@ func _update_ui() -> void:
if buff_data == null:
return
if not GameState.is_buff_unlocked(buff_data.id):
if game_state and not game_state.is_buff_unlocked(buff_data.id):
_button.disabled = true
_button.text = "Locked"
return
@@ -93,7 +97,7 @@ func _update_ui() -> void:
var cost_currency_id: StringName = _resolve_buff_cost_currency_id(buff_data)
if cost_currency_id != &"":
var cost: BigNumber = buff_data.get_cost_for_level(_current_level)
var current_amount: BigNumber = GameState.get_currency_amount_by_id(cost_currency_id)
var current_amount: BigNumber = game_state.get_currency_amount_by_id(cost_currency_id) if game_state else BigNumber.from_float(0.0)
can_buy = can_buy and (current_amount.is_greater_than(cost) or current_amount.is_equal_to(cost))
_button.disabled = not can_buy
@@ -109,4 +113,6 @@ func _resolve_buff_cost_currency_id(buff: GeneratorBuffData) -> StringName:
if buff.cost_currency == null:
return &""
return CurrencyDatabase.get_currency_id(buff.cost_currency)
if game_state == null:
return &""
return game_state.get_currency_id(buff.cost_currency)