Create an initial representation of temperature anomaly and display it in the app bar.

telrikk · telrikk · commit cda1350b9790 · 2025-03-13T20:12:50.000-07:00
diff --git a/entities/components/temperature_component.gd b/entities/components/temperature_component.gd
@@ -0,0 +1,18 @@
+extends Node
+
+@onready var view_model = TemperatureViewModel.new()
+
+@export var time_component: TimeComponent
+
+# TODO: Currently sourced from https://climate.nasa.gov/vital-signs/global-temperature/?intent=121. 
+# This should be based on the actual start date of the game.
+var temperature_anomaly_celsius = 1.28
+
+func _ready() -> void:
+	ViewModelRegistry.register(ViewModelRegistry.Keys.TEMPERATURE, view_model)
+	time_component.on_new_day.connect(_handle_new_day)
+	
+func _handle_new_day(new_temperature_anomaly: int) -> void:
+	# TODO: this is a large increase for testing. it should be based on the state of the world.
+	temperature_anomaly_celsius += .01
+	view_model.set_temperature_anomaly(temperature_anomaly_celsius)
diff --git a/entities/components/temperature_component.tscn b/entities/components/temperature_component.tscn
@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://cxdm1p8x2yt7d"]
+
+[ext_resource type="Script" path="res://entities/components/temperature_component.gd" id="1_gnlrf"]
+
+[node name="TemperatureComponent" type="Node"]
+script = ExtResource("1_gnlrf")
diff --git a/entities/time_component.gd b/entities/time_component.gd
@@ -7,6 +7,8 @@ class_name TimeComponent
 @export var default_speed: float = 1
 @export var fast_speed: float = 3
 
+signal on_new_day (new_timestamp: int)
+
 var time_since_last_update: float = 0
 var time: float = Time.get_unix_time_from_system()
 var is_paused: bool = false
@@ -24,6 +26,7 @@ func _process(delta: float):
 	if time_since_last_update > (day_update_interval_seconds / speed):
 		time_since_last_update = 0
 		time += 86400 # seconds in a day
+		on_new_day.emit(time)
 		view_model.set_time(time)
 
 func toggle_paused():
diff --git a/locale/en.mo b/locale/en.mo
diff --git a/locale/en.po b/locale/en.po
@@ -1,5 +1,6 @@
 # LANGUAGE translation for project-evergreen for the following files:
 # res://entities/countries/usa.gd
+# res://ui/widgets/top_app_bar.tscn
 #
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -20,3 +21,7 @@ msgstr ""
 #: entities/countries/usa.gd
 msgid "COUNTRY_USA_NAME"
 msgstr "United States of America"
+
+#: ui/widgets/top_app_bar.tscn
+msgid "TEMPERATURE_ANOMALY_DESCRIPTION"
+msgstr "Temperature Anomaly"
diff --git a/locale/tra.pot b/locale/tra.pot
@@ -1,5 +1,6 @@
 # LANGUAGE translation for project-evergreen for the following files:
 # res://entities/countries/usa.gd
+# res://ui/widgets/top_app_bar.tscn
 #
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -14,3 +15,7 @@ msgstr ""
 #: entities/countries/usa.gd
 msgid "COUNTRY_USA_NAME"
 msgstr ""
+
+#: ui/widgets/top_app_bar.tscn
+msgid "TEMPERATURE_ANOMALY_DESCRIPTION"
+msgstr ""
diff --git a/locale/zh_TW.mo b/locale/zh_TW.mo
diff --git a/locale/zh_TW.po b/locale/zh_TW.po
diff --git a/project.godot b/project.godot
@@ -66,4 +66,4 @@ select={
 [internationalization]
 
 locale/translations=PackedStringArray("res://locale/en.mo", "res://locale/zh_TW.mo")
-locale/translations_pot_files=PackedStringArray("res://entities/countries/usa.gd")
+locale/translations_pot_files=PackedStringArray("res://entities/countries/usa.gd", "res://ui/widgets/top_app_bar.tscn")
diff --git a/scenes/main/main.tscn b/scenes/main/main.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=8 format=3 uid="uid://d3nj6rt0cm53e"]
+[gd_scene load_steps=9 format=3 uid="uid://d3nj6rt0cm53e"]
 
 [ext_resource type="PackedScene" uid="uid://xlfbl7fowoic" path="res://scenes/worldmap/world_map.tscn" id="1_cjno1"]
 [ext_resource type="PackedScene" uid="uid://qjjw8mvvjabt" path="res://ui/viewmodels/vm_countries.tscn" id="1_grghp"]
@@ -7,6 +7,7 @@
 [ext_resource type="PackedScene" uid="uid://dap6c80qsg2ip" path="res://entities/music_player_component.tscn" id="3_l6axm"]
 [ext_resource type="PackedScene" uid="uid://dcnty7qxod06" path="res://scenes/components/camera_component.tscn" id="4_xha1d"]
 [ext_resource type="PackedScene" uid="uid://b1x0140gst6wf" path="res://entities/time_component.tscn" id="5_6js18"]
+[ext_resource type="PackedScene" uid="uid://cxdm1p8x2yt7d" path="res://entities/components/temperature_component.tscn" id="5_p0y26"]
 
 [node name="World" type="Node2D"]
 
@@ -22,6 +23,9 @@
 
 [node name="MusicPlayerComponent" parent="Components" instance=ExtResource("3_l6axm")]
 
+[node name="TemperatureComponent" parent="Components" node_paths=PackedStringArray("time_component") instance=ExtResource("5_p0y26")]
+time_component = NodePath("../TimeComponent")
+
 [node name="WorldMap" parent="." instance=ExtResource("1_cjno1")]
 position = Vector2(0, 1)
 
diff --git a/ui/viewmodels/vm_registry.gd b/ui/viewmodels/vm_registry.gd
@@ -1,7 +1,7 @@
 extends Node
 class_name ViewModelRegistry
 
-enum Keys { TIMER, COUNTRIES }
+enum Keys { TIMER, COUNTRIES, TEMPERATURE }
 static var registry = {}
 
 static func register(key: Keys, view_model: ViewModelBase):
diff --git a/ui/viewmodels/vm_temperature.gd b/ui/viewmodels/vm_temperature.gd
@@ -0,0 +1,8 @@
+extends ViewModelBase
+class_name TemperatureViewModel
+
+signal on_temperature_anomaly_changed (new_temperature_anomaly: float)
+
+func set_temperature_anomaly(temperature_anomaly: float):
+	on_temperature_anomaly_changed.emit(temperature_anomaly)
+	
diff --git a/ui/widgets/top_app_bar.gd b/ui/widgets/top_app_bar.gd
@@ -1,22 +1,30 @@
 extends Control
 
-var view_model: TimerViewModel
+var timer_view_model: TimerViewModel
 
 @export var date_label: Label
 @export var pause_button: TextureButton
 @export var speed_up_button: TextureButton
+@export var temperature_anomaly_label: Label
 
 func _ready() -> void:
-	view_model = ViewModelRegistry.retrieve(ViewModelRegistry.Keys.TIMER) as TimerViewModel
-	view_model.on_formatted_time_updated.connect(_handle_formatted_datetime_changed)
+	timer_view_model = ViewModelRegistry.retrieve(ViewModelRegistry.Keys.TIMER) as TimerViewModel
+	if timer_view_model:
+		timer_view_model.on_formatted_time_updated.connect(_handle_formatted_datetime_changed)
 	pause_button.toggled.connect(_handle_pause_button_clicked)
 	speed_up_button.toggled.connect(_handle_speed_up_button_clicked)
+	var temperature_view_model = ViewModelRegistry.retrieve(ViewModelRegistry.Keys.TEMPERATURE) as TemperatureViewModel
+	if temperature_view_model:
+		temperature_view_model.on_temperature_anomaly_changed.connect(_on_temperature_anomaly_changed)
 	
 func _handle_formatted_datetime_changed(new_datetime: String):
 	date_label.text = new_datetime
 	
 func _handle_pause_button_clicked(_is_toggled: bool):
-	view_model.toggle_paused()
+	timer_view_model.toggle_paused()
 
 func _handle_speed_up_button_clicked(_is_toggled: bool):
-	view_model.toggle_speed_up()
+	timer_view_model.toggle_speed_up()
+
+func _on_temperature_anomaly_changed(new_temperature_anomaly: float):
+	temperature_anomaly_label.text = str(new_temperature_anomaly)
diff --git a/ui/widgets/top_app_bar.tscn b/ui/widgets/top_app_bar.tscn
@@ -8,16 +8,17 @@
 [ext_resource type="Texture2D" uid="uid://sjhcl4wxcwkn" path="res://vendor/kenney_game-icons/PNG/White/1x/fastForward.png" id="6_bwov5"]
 [ext_resource type="Texture2D" uid="uid://cqs1r264rxtpc" path="res://vendor/kenney_game-icons/PNG/Black/1x/fastForward.png" id="7_tcu34"]
 
-[node name="TopAppBar" type="Control" node_paths=PackedStringArray("date_label", "pause_button", "speed_up_button")]
+[node name="TopAppBar" type="Control" node_paths=PackedStringArray("date_label", "pause_button", "speed_up_button", "temperature_anomaly_label")]
 layout_mode = 3
 anchors_preset = 10
 anchor_right = 1.0
 grow_horizontal = 2
 mouse_filter = 2
 script = ExtResource("1_7s546")
-date_label = NodePath("HBoxContainer/GameTimeLabel")
-pause_button = NodePath("HBoxContainer/PauseButton")
-speed_up_button = NodePath("HBoxContainer/SpeedUpButton")
+date_label = NodePath("AppBarHBox/TimeHBox/GameTimeLabel")
+pause_button = NodePath("AppBarHBox/TimeHBox/PauseButton")
+speed_up_button = NodePath("AppBarHBox/TimeHBox/SpeedUpButton")
+temperature_anomaly_label = NodePath("AppBarHBox/TemperatureHBox/TemperatureAnomalyAmount")
 
 [node name="Background" type="NinePatchRect" parent="."]
 layout_mode = 1
@@ -31,30 +32,53 @@ patch_margin_top = 11
 patch_margin_right = 11
 patch_margin_bottom = 11
 
-[node name="HBoxContainer" type="HBoxContainer" parent="."]
+[node name="AppBarHBox" type="HBoxContainer" parent="."]
 layout_mode = 1
-anchors_preset = -1
+anchors_preset = 1
 anchor_left = 1.0
 anchor_right = 1.0
-offset_left = -189.0
-offset_right = -15.0
+offset_left = -263.0
 offset_bottom = 50.0
 grow_horizontal = 0
+theme_override_constants/separation = 100
+
+[node name="TemperatureHBox" type="HBoxContainer" parent="AppBarHBox"]
+layout_mode = 2
+
+[node name="TemperatureDescriptionLabel" type="Label" parent="AppBarHBox/TemperatureHBox"]
+layout_mode = 2
+theme = ExtResource("2_7qrg5")
+text = "TEMPERATURE_ANOMALY_DESCRIPTION"
+
+[node name="TemperatureAnomalyAmount" type="Label" parent="AppBarHBox/TemperatureHBox"]
+auto_translate_mode = 2
+layout_mode = 2
+theme = ExtResource("2_7qrg5")
+
+[node name="TemperatureAnomalyUnit" type="Label" parent="AppBarHBox/TemperatureHBox"]
+auto_translate_mode = 2
+layout_mode = 2
+theme = ExtResource("2_7qrg5")
+text = "°C"
+
+[node name="TimeHBox" type="HBoxContainer" parent="AppBarHBox"]
+layout_mode = 2
 mouse_filter = 2
 
-[node name="GameTimeLabel" type="Label" parent="HBoxContainer"]
+[node name="GameTimeLabel" type="Label" parent="AppBarHBox/TimeHBox"]
+auto_translate_mode = 2
 layout_mode = 2
 theme = ExtResource("2_7qrg5")
 text = "January 1st, 2022"
 
-[node name="PauseButton" type="TextureButton" parent="HBoxContainer"]
+[node name="PauseButton" type="TextureButton" parent="AppBarHBox/TimeHBox"]
 layout_mode = 2
 mouse_filter = 1
 toggle_mode = true
 texture_normal = ExtResource("4_vima0")
 texture_pressed = ExtResource("5_cqa4u")
 
-[node name="SpeedUpButton" type="TextureButton" parent="HBoxContainer"]
+[node name="SpeedUpButton" type="TextureButton" parent="AppBarHBox/TimeHBox"]
 layout_mode = 2
 mouse_filter = 1
 toggle_mode = true

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`# LANGUAGE translation for project-evergreen for the following files:`
`2`	`2`	`# res://entities/countries/usa.gd`
	`3`	`+# res://ui/widgets/top_app_bar.tscn`
`3`	`4`	`#`
`4`	`5`	`# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.`
`5`	`6`	`#`
`@@ -20,3 +21,7 @@ msgstr ""`
`20`	`21`	`#: entities/countries/usa.gd`
`21`	`22`	`msgid "COUNTRY_USA_NAME"`
`22`	`23`	`msgstr "United States of America"`
	`24`	`+`
	`25`	`+#: ui/widgets/top_app_bar.tscn`
	`26`	`+msgid "TEMPERATURE_ANOMALY_DESCRIPTION"`
	`27`	`+msgstr "Temperature Anomaly"`