Show atmospheric carbon levels.

telrikk · telrikk · commit 3745c6747f6f · 2025-03-29T13:51:27.000-07:00
diff --git a/entities/components/carbon_component.gd b/entities/components/carbon_component.gd
@@ -0,0 +1,19 @@
+extends Node
+class_name CarbonComponent
+
+@onready var view_model = CarbonViewModel.new()
+@export var time_component: TimeComponent
+
+var carbon_level_ppm: float
+
+func _ready():
+	ViewModelRegistry.register(ViewModelRegistry.Keys.CARBON, view_model)
+	time_component.on_new_month.connect(_handle_new_month)
+
+func _handle_new_month(new_timestamp: float):
+	# TODO: this is a large increase for testing. it should be based on the state of the world.
+	set_carbon_in_atmosphere(carbon_level_ppm + 1)
+
+func set_carbon_in_atmosphere(new_carbon_level_ppm: float):
+	carbon_level_ppm = new_carbon_level_ppm
+	view_model.set_carbon_in_atmosphere(carbon_level_ppm)
diff --git a/entities/components/carbon_component.tscn b/entities/components/carbon_component.tscn
@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://bcq54x0laubvw"]
+
+[ext_resource type="Script" path="res://entities/components/carbon_component.gd" id="1_aa2fy"]
+
+[node name="CarbonComponent" type="Node"]
+script = ExtResource("1_aa2fy")
diff --git a/entities/components/music_player_component.tscn b/entities/components/music_player_component.tscn
diff --git a/entities/components/temperature_component.gd b/entities/components/temperature_component.gd
@@ -17,7 +17,7 @@ func _ready() -> void:
 	
 func _handle_new_day(new_timestamp: int) -> void:
 	# TODO: this is a large increase for testing. it should be based on the state of the world.
-	set_temperature_anomaly(temperature_anomaly_celsius + .01)
+	set_temperature_anomaly(temperature_anomaly_celsius + .001)
 
 func set_temperature_anomaly(new_temperature_anomaly_celsius: float) -> void: 
 	temperature_anomaly_celsius = new_temperature_anomaly_celsius
diff --git a/entities/components/time_component.gd b/entities/components/time_component.gd
@@ -8,12 +8,14 @@ class_name TimeComponent
 @export var fast_speed: float = 3
 
 signal on_new_day (new_timestamp: int)
+signal on_new_month (new_timestamp: int)
 
 var time_since_last_update: float = 0
 var time: float = Time.get_unix_time_from_system()
 var is_paused: bool = false
 var speed: float = default_speed
 var date_string_regex: RegEx
+var last_month: int
 
 func _ready():
 	date_string_regex = RegEx.new()
@@ -31,6 +33,11 @@ func _process(delta: float):
 		time += 86400 # seconds in a day
 		on_new_day.emit(time)
 		view_model.set_time(time)
+		var datetime_dict = Time.get_datetime_dict_from_unix_time(time)
+		var current_month = datetime_dict.get("month")
+		if last_month == Time.MONTH_DECEMBER and current_month == Time.MONTH_JANUARY || current_month > last_month:
+			last_month = current_month
+			on_new_month.emit(time) 
 
 func get_timestamp_from_date_string(date_string: String) -> int:
 	var results = date_string_regex.search(date_string)
diff --git a/entities/components/time_component.tscn b/entities/components/time_component.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://b1x0140gst6wf"]
 
-[ext_resource type="Script" path="res://entities/time_component.gd" id="1_bhnnc"]
+[ext_resource type="Script" path="res://entities/components/time_component.gd" id="1_bhnnc"]
 
 [node name="TimeComponent" type="Node2D"]
 script = ExtResource("1_bhnnc")
diff --git a/entities/countries/country.gd b/entities/countries/country.gd
@@ -5,6 +5,7 @@ enum Keys { USA }
 
 @export var country_key: Keys
 @export var sprite: Sprite2D
+@export var test: StringName
 var selected_material: Material = preload("res://entities/countries/selected_country_material.tres")
 var country_name: String
 
diff --git a/locale/en.mo b/locale/en.mo
diff --git a/locale/en.po b/locale/en.po
@@ -22,28 +22,39 @@ msgstr ""
 msgid "COUNTRY_USA_NAME"
 msgstr "United States of America"
 
+#: ui/widgets/top_app_bar.tscn
+msgid "ATMOSPHERE_CARBON_DESCRIPTION"
+msgstr "Atmospheric CO₂ Levels"
+
+#: ui/widgets/top_app_bar.tscn
+msgid "CARBON_UNIT"
+msgstr "ppm"
+
 #: ui/widgets/top_app_bar.tscn
 msgid "TEMPERATURE_ANOMALY_DESCRIPTION"
 msgstr "Temperature Anomaly"
 
 #: ui/widgets/modal_loss.gd
 msgid "LOSSCONDITION_TIMEEXCEEDED_TEXT"
 msgstr ""
-"Humanity failed to achieve net-zero carbon emissions in time, leading "
-"to the worst effects of climate change being unavoidable. They include "
-"more frequent and intense weather events like hurricanes, wildfires, "
-"and floods. Additionally, biodiversity loss, food and water shortages, "
-"and economic instability will increasingly disrupt human life."
+"Humanity failed to achieve net-zero carbon emissions in time, leading to the "
+"worst effects of climate change being unavoidable. They include more "
+"frequent and intense weather events like hurricanes, wildfires, and floods. "
+"Additionally, biodiversity loss, food and water shortages, and economic "
+"instability will increasingly disrupt human life."
 
 #: ui/widgets/modal_loss.gd
 msgid "LOSSCONDITION_TEMPERATUREEXCEEDED_TEXT"
 msgstr ""
-"The Earth has warmed to a level where the worst effects of climate "
-"change are becoming unavoidable. They include more frequent and intense "
-"weather events like hurricanes, wildfires, and floods. Additionally, "
-"biodiversity loss, food and water shortages, and economic instability "
-"will increasingly disrupt human life."
+"The Earth has warmed to a level where the worst effects of climate change "
+"are becoming unavoidable. They include more frequent and intense weather "
+"events like hurricanes, wildfires, and floods. Additionally, biodiversity "
+"loss, food and water shortages, and economic instability will increasingly "
+"disrupt human life."
 
 #: ui/widgets/modal_loss.tscn
 msgid "LOSSMODAL_RESTART_TEXT"
 msgstr "Restart"
+
+#~ msgid "ppm"
+#~ msgstr "ppm"
diff --git a/locale/tra.pot b/locale/tra.pot
@@ -18,6 +18,14 @@ msgstr ""
 msgid "COUNTRY_USA_NAME"
 msgstr ""
 
+#: ui/widgets/top_app_bar.tscn
+msgid "ATMOSPHERE_CARBON_DESCRIPTION"
+msgstr ""
+
+#: ui/widgets/top_app_bar.tscn
+msgid "CARBON_UNIT"
+msgstr ""
+
 #: ui/widgets/top_app_bar.tscn
 msgid "TEMPERATURE_ANOMALY_DESCRIPTION"
 msgstr ""
diff --git a/scenes/common/standard_game_mode.gd b/scenes/common/standard_game_mode.gd
@@ -3,9 +3,11 @@ class_name StandardGameMode
 
 @export var start_date: String = "01/01/1988" 
 @export var loss_date: String = "01/01/2050"
+@export var carbon_in_atmosphere_ppm: float = 350.51
 @export var loss_temperature_anomaly: float = 1.50
 @export var time_component: TimeComponent;
 @export var temperature_component: TemperatureComponent
+@export var carbon_component: CarbonComponent
 
 var loss_timestamp: int
 var view_model: GameModeViewModel = GameModeViewModel.new()
@@ -18,6 +20,7 @@ func _ready() -> void:
 	time_component.on_new_day.connect(_handle_new_day)
 	temperature_component.on_temperature_anomaly_changed.connect(_handle_new_temperature_anomaly)
 	ViewModelRegistry.register(ViewModelRegistry.Keys.GAME_MODE, view_model)
+	carbon_component.set_carbon_in_atmosphere(carbon_in_atmosphere_ppm)
 	
 func _handle_new_day(new_timestamp: float) -> void:
 	if new_timestamp >= loss_timestamp:
diff --git a/scenes/common/standard_game_mode.tscn b/scenes/common/standard_game_mode.tscn
@@ -4,6 +4,3 @@
 
 [node name="StandardGameMode" type="Node"]
 script = ExtResource("1_agwb2")
-start_date = null
-loss_date = null
-loss_temperature_anomaly = null
diff --git a/scenes/main/main.tscn b/scenes/main/main.tscn
@@ -1,14 +1,15 @@
-[gd_scene load_steps=12 format=3 uid="uid://d3nj6rt0cm53e"]
+[gd_scene load_steps=13 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"]
 [ext_resource type="PackedScene" uid="uid://bnqxch8qylr8l" path="res://ui/widgets/hud.tscn" id="2_jggq6"]
 [ext_resource type="PackedScene" uid="uid://2hgdqurtbrxg" path="res://scenes/common/player_controller.tscn" id="3_jr0xa"]
-[ext_resource type="PackedScene" uid="uid://dap6c80qsg2ip" path="res://entities/music_player_component.tscn" id="3_l6axm"]
+[ext_resource type="PackedScene" uid="uid://dap6c80qsg2ip" path="res://entities/components/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://b1x0140gst6wf" path="res://entities/components/time_component.tscn" id="5_6js18"]
 [ext_resource type="PackedScene" uid="uid://cxdm1p8x2yt7d" path="res://entities/components/temperature_component.tscn" id="5_p0y26"]
 [ext_resource type="PackedScene" uid="uid://bs84f822v0oba" path="res://scenes/components/cheat_component.tscn" id="6_6lkyn"]
+[ext_resource type="PackedScene" uid="uid://bcq54x0laubvw" path="res://entities/components/carbon_component.tscn" id="7_xe0mx"]
 [ext_resource type="PackedScene" uid="uid://7e58nln2jjm5" path="res://ui/widgets/modal_loss.tscn" id="10_f2gcx"]
 [ext_resource type="PackedScene" uid="uid://c57b4mhnpqlmr" path="res://scenes/common/standard_game_mode.tscn" id="10_o6r5s"]
 
@@ -31,12 +32,16 @@ time_component = NodePath("../TimeComponent")
 
 [node name="CheatComponent" parent="Components" instance=ExtResource("6_6lkyn")]
 
+[node name="CarbonComponent" parent="Components" node_paths=PackedStringArray("time_component") instance=ExtResource("7_xe0mx")]
+time_component = NodePath("../TimeComponent")
+
 [node name="WorldMap" parent="." instance=ExtResource("1_cjno1")]
 position = Vector2(0, 1)
 
-[node name="StandardGameMode" parent="." node_paths=PackedStringArray("time_component", "temperature_component") instance=ExtResource("10_o6r5s")]
+[node name="StandardGameMode" parent="." node_paths=PackedStringArray("time_component", "temperature_component", "carbon_component") instance=ExtResource("10_o6r5s")]
 time_component = NodePath("../Components/TimeComponent")
 temperature_component = NodePath("../Components/TemperatureComponent")
+carbon_component = NodePath("../Components/CarbonComponent")
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
diff --git a/ui/viewmodels/vm_carbon.gd b/ui/viewmodels/vm_carbon.gd
@@ -0,0 +1,7 @@
+extends ViewModelBase
+class_name CarbonViewModel
+
+signal on_carbon_in_atmosphere_changed (new_carbon_level_ppm: float)
+
+func set_carbon_in_atmosphere(new_carbon_level_ppm: float):
+	on_carbon_in_atmosphere_changed.emit(new_carbon_level_ppm)
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, TEMPERATURE, GAME_MODE }
+enum Keys { TIMER, COUNTRIES, TEMPERATURE, GAME_MODE, CARBON }
 static var registry = {}
 
 static func register(key: Keys, view_model: ViewModelBase):
diff --git a/ui/widgets/top_app_bar.gd b/ui/widgets/top_app_bar.gd
@@ -6,17 +6,26 @@ var timer_view_model: TimerViewModel
 @export var pause_button: TextureButton
 @export var speed_up_button: TextureButton
 @export var temperature_anomaly_label: Label
+@export var carbon_label: Label
 
 func _ready() -> void:
 	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)
-	
+		
+	var carbon_view_model = ViewModelRegistry.retrieve(ViewModelRegistry.Keys.CARBON) as CarbonViewModel
+	if carbon_view_model:
+		carbon_view_model.on_carbon_in_atmosphere_changed.connect(_handle_carbon_atmosphere_changed)
+
+func _handle_carbon_atmosphere_changed(new_carbon_in_atmosphere_ppm: float):
+	carbon_label.text = str(snappedf(new_carbon_in_atmosphere_ppm, 0.01))
+
 func _handle_formatted_datetime_changed(new_datetime: String):
 	date_label.text = new_datetime
 	
@@ -27,4 +36,4 @@ func _handle_speed_up_button_clicked(_is_toggled: bool):
 	timer_view_model.toggle_speed_up()
 
 func _on_temperature_anomaly_changed(new_temperature_anomaly: float):
-	temperature_anomaly_label.text = str(new_temperature_anomaly)
+	temperature_anomaly_label.text = str(snappedf(new_temperature_anomaly, 0.01))
diff --git a/ui/widgets/top_app_bar.tscn b/ui/widgets/top_app_bar.tscn
@@ -8,7 +8,7 @@
 [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", "temperature_anomaly_label")]
+[node name="TopAppBar" type="Control" node_paths=PackedStringArray("date_label", "pause_button", "speed_up_button", "temperature_anomaly_label", "carbon_label")]
 layout_mode = 3
 anchors_preset = 10
 anchor_right = 1.0
@@ -19,6 +19,7 @@ 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")
+carbon_label = NodePath("AppBarHBox/CarbonHBox/CarbonAmount")
 
 [node name="Background" type="NinePatchRect" parent="."]
 layout_mode = 1
@@ -42,7 +43,28 @@ offset_bottom = 50.0
 grow_horizontal = 0
 theme_override_constants/separation = 100
 
+[node name="CarbonHBox" type="HBoxContainer" parent="AppBarHBox"]
+clip_contents = true
+layout_mode = 2
+
+[node name="CarbonDescription" type="Label" parent="AppBarHBox/CarbonHBox"]
+layout_mode = 2
+theme = ExtResource("2_7qrg5")
+text = "ATMOSPHERE_CARBON_DESCRIPTION"
+
+[node name="CarbonAmount" type="Label" parent="AppBarHBox/CarbonHBox"]
+auto_translate_mode = 2
+layout_mode = 2
+theme = ExtResource("2_7qrg5")
+text = "123"
+
+[node name="CarbonUnit" type="Label" parent="AppBarHBox/CarbonHBox"]
+layout_mode = 2
+theme = ExtResource("2_7qrg5")
+text = "CARBON_UNIT"
+
 [node name="TemperatureHBox" type="HBoxContainer" parent="AppBarHBox"]
+clip_contents = true
 layout_mode = 2
 
 [node name="TemperatureDescriptionLabel" type="Label" parent="AppBarHBox/TemperatureHBox"]
@@ -54,6 +76,7 @@ text = "TEMPERATURE_ANOMALY_DESCRIPTION"
 auto_translate_mode = 2
 layout_mode = 2
 theme = ExtResource("2_7qrg5")
+text = "123"
 
 [node name="TemperatureAnomalyUnit" type="Label" parent="AppBarHBox/TemperatureHBox"]
 auto_translate_mode = 2
@@ -62,11 +85,15 @@ theme = ExtResource("2_7qrg5")
 text = "°C"
 
 [node name="TimeHBox" type="HBoxContainer" parent="AppBarHBox"]
+clip_contents = true
+custom_minimum_size = Vector2(300, 0)
 layout_mode = 2
 mouse_filter = 2
 
 [node name="GameTimeLabel" type="Label" parent="AppBarHBox/TimeHBox"]
 auto_translate_mode = 2
+clip_contents = true
+custom_minimum_size = Vector2(180, 0)
 layout_mode = 2
 theme = ExtResource("2_7qrg5")
 text = "January 1st, 2022"
