woofmeow/straywild
woofmeow/straywild
3
5
Fork 2
Code Issues 40 Projects 1 Releases 43 Packages Wiki Activity Actions

Show fishcoin balance beside calendar

Browse source
This commit is contained in:
Alexander Sellite 2026-08-21 21:33:06 -04:00
parent bb1942a057
commit 24d91b37e5
2 changed files with 76 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tests/world_time_multiplayer_validation.gd
View file

@ -132,8 +132,14 @@ func _run_client() -> void:
var calendar_panel := (
chat_ui.get_node("WorldCalendarPanel") as PanelContainer
)
var calendar_row := (
calendar_panel.get_node("WorldCalendarRow") as HBoxContainer
)
var calendar_label := (
calendar_panel.get_node("WorldCalendarLabel") as Label
calendar_row.get_node("WorldCalendarLabel") as Label
)
var calendar_balance := (
calendar_row.get_node("WorldCalendarBalance") as CurrencyAmount
)
var weather_icon := chat_ui.get_node("WorldWeatherIcon") as WeatherIcon
var chat_panel := chat_ui.get_node("ChatPanel") as PanelContainer
@ -143,6 +149,15 @@ func _run_client() -> void:
assert(calendar_panel.visible)
assert(calendar_label.text == world_time.get_calendar_text())
assert(not calendar_label.text.is_empty())
assert(
calendar_label.horizontal_alignment
== HORIZONTAL_ALIGNMENT_LEFT
)
assert(calendar_label.size_flags_horizontal == Control.SIZE_EXPAND_FILL)
var player := chat_ui.get("_player") as Player
assert(calendar_balance.amount == player.wallet.get_balance())
assert(player.wallet.credit(1))
assert(calendar_balance.amount == player.wallet.get_balance())
assert(weather_icon.visible)
assert(weather_icon.get_weather() == WorldWeatherService.Weather.RAINY)
assert(is_equal_approx(clock_panel.position.y, 10.0))

62
ui/chat_ui.gd
View file

@ -43,6 +43,9 @@ const CALENDAR_SIZE := Vector2(
28.0,
)
const CALENDAR_FONT_SIZE: int = 16
const CALENDAR_BALANCE_FONT_SIZE: int = 14
const CALENDAR_BALANCE_ICON_SIZE: float = 14.0
const CALENDAR_CONTENT_GAP: int = 6
const CALENDAR_TOP_GAP: float = 4.0
const EXPANDED_CHAT_TOP_GAP: float = 12.0
const EXPANDED_TOP_MARGIN: float = (
@ -77,6 +80,9 @@ const WorldWeatherServiceType = preload(
const WeatherIconType = preload("res://ui/weather_icon.gd")
const ItemCatalogType = preload("res://items/item_catalog.gd")
const ItemDataType = preload("res://items/item_data.gd")
const CurrencyPresentationType = preload(
"res://ui/currency_presentation.gd"
)
const TypewriterRevealType = preload("res://ui/typewriter_reveal.gd")
const AnimaleseVoiceType = preload("res://ui/animalese_voice.gd")
@ -112,7 +118,9 @@ var _animalese_voice: AnimaleseVoiceType
var _clock_panel: PanelContainer
var _clock_label: Label
var _calendar_panel: PanelContainer
var _calendar_row: HBoxContainer
var _calendar_label: Label
var _calendar_balance: CurrencyAmount
var _weather_icon: WeatherIconType
var _status_effect_column: VBoxContainer
var _status_effect_icons: Dictionary[StringName, TextureRect] = {}
@ -174,6 +182,15 @@ func setup(
_world_weather = world_weather
_item_effects = item_effects
_item_catalog = item_catalog
if (
_player != null
and _player.wallet != null
and not _player.wallet.balance_changed.is_connected(
_on_wallet_balance_changed
)
):
_player.wallet.balance_changed.connect(_on_wallet_balance_changed)
_refresh_wallet_balance()
_rebuild_status_effect_icons()
if (
_fishing_spot != null
@ -510,9 +527,17 @@ func _build_ui() -> void:
"panel", _calendar_panel_style()
)
add_child(_calendar_panel)
_calendar_row = HBoxContainer.new()
_calendar_row.name = "WorldCalendarRow"
_calendar_row.mouse_filter = Control.MOUSE_FILTER_IGNORE
_calendar_row.add_theme_constant_override(
"separation", CALENDAR_CONTENT_GAP
)
_calendar_panel.add_child(_calendar_row)
_calendar_label = Label.new()
_calendar_label.name = "WorldCalendarLabel"
_calendar_label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
_calendar_label.size_flags_horizontal = Control.SIZE_EXPAND_FILL
_calendar_label.horizontal_alignment = HORIZONTAL_ALIGNMENT_LEFT
_calendar_label.vertical_alignment = VERTICAL_ALIGNMENT_CENTER
_calendar_label.mouse_filter = Control.MOUSE_FILTER_IGNORE
_calendar_label.add_theme_font_override(
@ -525,7 +550,25 @@ func _build_ui() -> void:
"font_color", UtilityPageStyle.OCEAN_TEXT_PRIMARY
)
_calendar_label.text_overrun_behavior = TextServer.OVERRUN_TRIM_ELLIPSIS
_calendar_panel.add_child(_calendar_label)
_calendar_row.add_child(_calendar_label)
_calendar_balance = CurrencyPresentationType.instantiate_amount(
0, CALENDAR_BALANCE_ICON_SIZE
)
_calendar_balance.name = "WorldCalendarBalance"
_calendar_balance.size_flags_horizontal = Control.SIZE_SHRINK_END
_calendar_balance.alignment = BoxContainer.ALIGNMENT_END
_calendar_balance.add_theme_constant_override("separation", 2)
var balance_label: Label = _calendar_balance.get_amount_label()
balance_label.add_theme_font_override(
"font", UtilityPageStyle.TuffyFont
)
balance_label.add_theme_font_size_override(
"font_size", CALENDAR_BALANCE_FONT_SIZE
)
balance_label.add_theme_color_override(
"font_color", UtilityPageStyle.OCEAN_TEXT_PRIMARY
)
_calendar_row.add_child(_calendar_balance)
_status_effect_column = VBoxContainer.new()
_status_effect_column.name = "StatusEffectColumn"
_status_effect_column.mouse_filter = Control.MOUSE_FILTER_IGNORE
@ -1808,6 +1851,21 @@ func _on_world_calendar_date_changed(_date_id: String) -> void:
)
func _on_wallet_balance_changed(new_balance: int, _delta: int) -> void:
if _calendar_balance != null:
_calendar_balance.set_amount(new_balance)
func _refresh_wallet_balance() -> void:
if _calendar_balance == null:
return
_calendar_balance.set_amount(
_player.wallet.get_balance()
if _player != null and _player.wallet != null
else 0
)
func _on_world_weather_changed(
weather: WorldWeatherService.Weather,
_seconds_remaining: float,