add sit state and colors to cat

core/ai/agents/base/ai_base.gd

@@ -15,8 +15,8 @@ var _enable_state_machine: bool = true
 @export var anim_player: AnimationPlayer
 
 @export_group("Entities")
-enum EntityType { HUMANOID, ANIMAL }
+enum EntityType { FARMER, CITIZEN_WALKER, CITIZEN_SITTER, CAT, CROW, FOX, GOAT, RACOON, WAGYU }
-@export var entity_type: EntityType = EntityType.HUMANOID
+@export var entity_type: EntityType = EntityType.FARMER
 @export var entity_name: String = ""
 @export var allowed_biomes: Array[String] = []
 @export_range(0.0, 100.0, 0.1) var spawn_uniqueness: float = 1.0

core/ai/agents/cat/ai_cat.gd

@@ -0,0 +1,38 @@
+extends AIBase
+
+class_name AICat
+
+@export_group("Cat Colors")
+@export var mesh: MeshInstance3D
+@export var fur_colors: Array[Color] = []
+@export var eye_colors: Array[Color] = []
+
+@export var fur_material_index: int = 0
+@export var eye_material_index: int = 1
+
+func _ready() -> void:
+	super._ready()
+	_apply_random_color()
+
+func _apply_random_color() -> void:
+	if fur_colors.is_empty() or eye_colors.is_empty():
+		return
+		
+	if not mesh or not mesh.mesh:
+		return
+		
+	var max_index = min(fur_colors.size(), eye_colors.size())
+	var random_idx = randi() % max_index
+	
+	_override_material_color(mesh, fur_material_index, fur_colors[random_idx])
+	_override_material_color(mesh, eye_material_index, eye_colors[random_idx])
+
+func _override_material_color(mesh_node: MeshInstance3D, surface_idx: int, color: Color) -> void:
+	if surface_idx < 0 or surface_idx >= mesh_node.mesh.get_surface_count():
+		return
+		
+	var mat = mesh_node.mesh.surface_get_material(surface_idx)
+	if mat and mat is StandardMaterial3D:
+		var new_mat = mat.duplicate() as StandardMaterial3D
+		new_mat.albedo_color = color
+		mesh_node.set_surface_override_material(surface_idx, new_mat)

core/ai/agents/cat/ai_cat.gd.uid

@@ -0,0 +1 @@
+uid://cx67xas1hxv3x

core/ai/agents/cat/ai_cat.tscn

@@ -2,12 +2,20 @@
 
 [ext_resource type="PackedScene" uid="uid://clx701xdwelgx" path="res://core/ai/agents/base/ai_base.tscn" id="1_85o24"]
 [ext_resource type="Script" uid="uid://d3hy70ec8vqo5" path="res://core/ai/framework/run_animation_state.gd" id="2_6mu8r"]
+[ext_resource type="Script" uid="uid://cx67xas1hxv3x" path="res://core/ai/agents/cat/ai_cat.gd" id="2_cat_script"]
 [ext_resource type="PackedScene" uid="uid://c5rccx22gs6jt" path="res://core/ai/agents/cat/Cat_rig.fbx" id="2_rohxe"]
 [ext_resource type="Script" uid="uid://bngfthvt04ivv" path="res://core/ai/framework/patrol_state.gd" id="3_0jm3k"]
+[ext_resource type="Script" uid="uid://dty1p02kqviwf" path="res://core/ai/framework/sit_state.gd" id="3_scd7t"]
 
-[node name="AiCat" unique_id=1228675528 node_paths=PackedStringArray("anim_player") instance=ExtResource("1_85o24")]
+[node name="AiCat" unique_id=1228675528 node_paths=PackedStringArray("mesh", "anim_player") instance=ExtResource("1_85o24")]
+script = ExtResource("2_cat_script")
+mesh = NodePath("Cat_rig/Rig_Cat/Skeleton3D/Cat")
+fur_colors = Array[Color]([])
+eye_colors = Array[Color]([])
+fur_material_index = 0
+eye_material_index = 1
 anim_player = NodePath("Cat_rig/AnimationPlayer")
-entity_type = 1
+entity_type = 3
 entity_name = "Cat"
 
 [node name="StateMachine" parent="." index="1" unique_id=1286404264 node_paths=PackedStringArray("initial_state")]
@@ -17,9 +25,16 @@ initial_state = NodePath("IdleState")
 script = ExtResource("2_6mu8r")
 state_id = &"idle"
 next_state_id = &"patrol"
+random_next_state_ids = Array[StringName]([&"patrol", &"sit"])
 animation_name = "Cat_Idle"
 
-[node name="PatrolState" type="Node" parent="StateMachine" index="1" unique_id=1861645340]
+[node name="SitState" type="Node" parent="StateMachine" index="1" unique_id=860354787]
+script = ExtResource("3_scd7t")
+state_id = &"sit"
+next_state_id = &"idle"
+animation_name = "Cat_Sit"
+
+[node name="PatrolState" type="Node" parent="StateMachine" index="2" unique_id=1861645340]
 script = ExtResource("3_0jm3k")
 state_id = &"patrol"
 next_state_id = &"idle"
@@ -28,7 +43,7 @@ exit_on_action_finished = true
 
 [node name="Cat_rig" parent="." index="3" unique_id=1332997618 instance=ExtResource("2_rohxe")]
 
-[node name="Skeleton3D" parent="Cat_rig/Rig_Cat" parent_id_path=PackedInt32Array(1332997618, 1292226211) index="0" unique_id=807490174]
+[node name="Skeleton3D" parent="Cat_rig/Rig_Cat" parent_id_path=PackedInt32Array(1332997618, 656824407) index="0" unique_id=1952223098]
 bones/1/position = Vector3(1.6719584e-08, 0.23547882, 0.34218493)
 bones/1/rotation = Quaternion(0.12769094, -0.6954821, -0.12769029, 0.69548184)
 bones/2/rotation = Quaternion(-1.5819447e-07, -1.9079575e-07, -0.5904159, 0.8070992)

core/ai/agents/crow/ai_crow.tscn

@@ -7,6 +7,8 @@
 
 [node name="AiCrow" unique_id=1228675528 node_paths=PackedStringArray("anim_player") instance=ExtResource("1_tx3nx")]
 anim_player = NodePath("Crow_rig/AnimationPlayer")
+entity_type = 4
+entity_name = "Crow"
 
 [node name="StateMachine" parent="." index="1" unique_id=1286404264 node_paths=PackedStringArray("initial_state")]
 initial_state = NodePath("WaitTrainState")

core/ai/agents/fox/ai_fox.tscn

@@ -8,6 +8,8 @@
 
 [node name="AiFox" unique_id=1228675528 node_paths=PackedStringArray("anim_player") instance=ExtResource("1_m3efo")]
 anim_player = NodePath("Fox_rig/AnimationPlayer")
+entity_type = 5
+entity_name = "Fox"
 
 [node name="StateMachine" parent="." index="1" unique_id=1286404264 node_paths=PackedStringArray("initial_state")]
 initial_state = NodePath("IdleState")

core/ai/agents/goat/ai_goat.tscn

@@ -7,6 +7,8 @@
 
 [node name="AiGoat" unique_id=1228675528 node_paths=PackedStringArray("anim_player") instance=ExtResource("1_f7hhh")]
 anim_player = NodePath("Goat_rig/AnimationPlayer")
+entity_type = 6
+entity_name = "Goat"
 
 [node name="StateMachine" parent="." index="1" unique_id=1286404264 node_paths=PackedStringArray("initial_state")]
 initial_state = NodePath("IdleState")
@@ -26,7 +28,7 @@ exit_on_action_finished = true
 
 [node name="Goat_rig" parent="." index="3" unique_id=1336829719 instance=ExtResource("2_oxwbf")]
 
-[node name="Skeleton3D" parent="Goat_rig/Rig_Goat" parent_id_path=PackedInt32Array(1336829719, 1896192446) index="0" unique_id=1573667924]
+[node name="Skeleton3D" parent="Goat_rig/Rig_Goat" parent_id_path=PackedInt32Array(1336829719, 123281310) index="0" unique_id=1526518923]
 bones/1/position = Vector3(-8.352713e-09, 0.36986786, 0.8951362)
 bones/1/rotation = Quaternion(0.1276911, -0.695482, -0.12769035, 0.69548184)
 bones/2/rotation = Quaternion(-8.7811394e-08, -9.458198e-08, -0.5904155, 0.80709946)

core/ai/agents/human/ai_citizen_sitter.tscn

@@ -3,6 +3,7 @@
 [ext_resource type="PackedScene" uid="uid://bdqeshcwwnyc4" path="res://core/ai/agents/human/ai_citizen.tscn" id="1_cduuu"]
 
 [node name="AiCitizenSitter" unique_id=1228675528 instance=ExtResource("1_cduuu")]
+entity_type = 2
 entity_name = "CitizenSitter"
 
 [node name="Skeleton3D" parent="BaseMesh/BaseMesh" parent_id_path=PackedInt32Array(1846171523, 1142246531) index="0" unique_id=928995817]

core/ai/agents/human/ai_citizen_walker.tscn

@@ -5,6 +5,7 @@
 [ext_resource type="Script" uid="uid://bngfthvt04ivv" path="res://core/ai/framework/patrol_state.gd" id="3_8d0tj"]
 
 [node name="AiCitizenWalker" unique_id=1228675528 instance=ExtResource("1_dms8s")]
+entity_type = 1
 entity_name = "CitizenWalker"
 
 [node name="StateMachine" parent="." index="1" unique_id=1286404264 node_paths=PackedStringArray("initial_state")]

core/ai/agents/human/ai_farmer.tscn

@@ -5,6 +5,7 @@
 [ext_resource type="Script" uid="uid://d3hy70ec8vqo5" path="res://core/ai/framework/run_animation_state.gd" id="4_2oda6"]
 
 [node name="AiFarmer" unique_id=1228675528 instance=ExtResource("1_l2y7m")]
+entity_type = 0
 entity_name = "Farmer"
 allowed_biomes = Array[String](["countryside"])
 

core/ai/agents/racoon/ai_racoon.tscn

@@ -7,6 +7,8 @@
 
 [node name="AiRacoon" unique_id=1228675528 node_paths=PackedStringArray("anim_player") instance=ExtResource("1_seif5")]
 anim_player = NodePath("Raccoon_rig/AnimationPlayer")
+entity_type = 7
+entity_name = "Racoon"
 
 [node name="StateMachine" parent="." index="1" unique_id=1286404264 node_paths=PackedStringArray("initial_state")]
 initial_state = NodePath("IdleState")
@@ -26,7 +28,7 @@ exit_on_action_finished = true
 
 [node name="Raccoon_rig" parent="." index="3" unique_id=338211330 instance=ExtResource("2_obtl0")]
 
-[node name="Skeleton3D" parent="Raccoon_rig/Rig_Raccoon" parent_id_path=PackedInt32Array(338211330, 1484615769) index="0" unique_id=689430915]
+[node name="Skeleton3D" parent="Raccoon_rig/Rig_Raccoon" parent_id_path=PackedInt32Array(338211330, 590893883) index="0" unique_id=1830599374]
 bones/1/position = Vector3(2.0224038e-08, 0.20926544, 0.2908604)
 bones/1/rotation = Quaternion(0.12769087, -0.6954821, -0.12769023, 0.69548184)
 bones/1/scale = Vector3(1, 0.99999994, 0.99999994)

core/ai/agents/wagyu/ai_wagyu.tscn

@@ -7,7 +7,7 @@
 
 [node name="AiWagyu" unique_id=1228675528 node_paths=PackedStringArray("anim_player") instance=ExtResource("1_01jto")]
 anim_player = NodePath("Wagyu_rig/AnimationPlayer")
-entity_type = 1
+entity_type = 8
 entity_name = "Wagyu"
 
 [node name="StateMachine" parent="." index="1" unique_id=1286404264 node_paths=PackedStringArray("initial_state")]

core/ai/framework/sit_state.gd

@@ -0,0 +1,40 @@
+extends State
+
+class_name SitState
+
+var reverse: bool = false
+
+func enter() -> void:
+	reverse = false
+	super.enter()
+	
+	if agent.anim_player and not agent.anim_player.animation_finished.is_connected(_on_animation_finished):
+		agent.anim_player.animation_finished.connect(_on_animation_finished)
+		
+	if runtime_timer and not runtime_timer.is_stopped():
+		runtime_timer.stop()
+		
+	run_animation()
+
+func exit() -> void:
+	super.exit()
+	if agent.anim_player and agent.anim_player.animation_finished.is_connected(_on_animation_finished):
+		agent.anim_player.animation_finished.disconnect(_on_animation_finished)
+
+func _on_animation_finished(anim_name: StringName) -> void:
+	if animation_name == anim_name:
+		if not reverse:
+			if min_wait_time > 0:
+				var wait_time := randf_range(min_wait_time, max_wait_time)
+				runtime_timer.start(wait_time)
+			else:
+				_on_timer_timeout()
+		else:
+			transitioned.emit(self, get_next_state())
+
+func _on_timer_timeout() -> void:
+	reverse = true
+	if agent.anim_player and agent.anim_player.has_animation(animation_name):
+		agent.anim_player.play_backwards(animation_name, blend_time)
+	else:
+		transitioned.emit(self, get_next_state())

core/ai/framework/sit_state.gd.uid

@@ -0,0 +1 @@
+uid://dty1p02kqviwf

core/biome_generator/biome_generator.gd

@@ -4,11 +4,6 @@ extends Node3D
 const CHUNK_TYPE_BIOME: int = 0
 const CHUNK_TYPE_STRAIGHT_TRACK: int = 1
 const CHUNK_TYPE_CURVED_TRACK: int = 2
-const ENTITY_TYPE_HUMANOID: int = 0
-const ENTITY_TYPE_ANIMAL: int = 1
-const ENTITY_SPAWN_ANY: int = 0
-const ENTITY_SPAWN_HUMANOID_ONLY: int = 1
-const ENTITY_SPAWN_ANIMAL_ONLY: int = 2
 
 const CHUNK_GENERATION_FRAME_BUDGET_USEC: int = 1000 #2 ms/frame to generate chunks
 const CHUNK_CLEANUP_FRAME_BUDGET_USEC: int = 1000 #1 ms/frame per cleanup
@@ -922,11 +917,10 @@ func _spawn_entities_for_chunk(root: Node, biome_name: String) -> void:
 
 func _get_spawn_point_type_filter(spawn_point: Node) -> int:
 	if "allowed_type" in spawn_point:
-		match spawn_point.allowed_type:
+		if spawn_point.allowed_type == 0:
-			ENTITY_SPAWN_HUMANOID_ONLY:
+			return -1
-				return ENTITY_TYPE_HUMANOID
+		else:
-			ENTITY_SPAWN_ANIMAL_ONLY:
+			return spawn_point.allowed_type - 1
-				return ENTITY_TYPE_ANIMAL
 	return -1
 
 func _pick_compatible_entity(biome_name: String, type_filter: int) -> PackedScene:

core/biome_generator/entity_spawn_point.gd

@@ -1,7 +1,7 @@
 extends Marker3D
 class_name EntitySpawnPoint
 
-enum AllowedType { ANY, HUMANOID_ONLY, ANIMAL_ONLY }
+enum AllowedType { ANY, FARMER, CITIZEN_WALKER, CITIZEN_SITTER, CAT, CROW, FOX, GOAT, RACOON, WAGYU }
 
 @export var allowed_type: AllowedType = AllowedType.ANY
 @export_range(0.0, 1.0, 0.01) var spawn_chance: float = 1.0

core/biome_generator/rails.gd

@@ -1,7 +1,7 @@
 extends Path3D
 
 const STEAM_DISTANCE_STAT: String = "stat_distance_km"
-const DISTANCE_KM_PER_UNIT: float = 0.001
+const STEAM_DISTANCE_KM_PER_UNIT: float = 1#0.001
 
 @export_group("Train")
 ##train speed
@@ -395,7 +395,7 @@ func _track_steam_distance(distance_units: float) -> void:
 	if distance_units <= 0.0 or not SteamManager.is_on_steam:
 		return
 
-	_pending_steam_distance_km += distance_units * DISTANCE_KM_PER_UNIT
+	_pending_steam_distance_km += distance_units * STEAM_DISTANCE_KM_PER_UNIT
 	var whole_km: int = int(floor(_pending_steam_distance_km))
 	if whole_km <= 0:
 		return

core/game_menu/train_selector.gd

@@ -1,57 +1,52 @@
 extends VBoxContainer
 
-@onready var color_pickers_1: Array[TrainColorPicker] = [$%ColorPicker1, $%ColorPicker2, $%ColorPicker3, $%ColorPicker4, $%ColorPicker5, $%ColorPicker6]
+@onready var color_pickers: Array[TrainColorPicker] = [$%ColorPicker1, $%ColorPicker2, $%ColorPicker3, $%ColorPicker4, $%ColorPicker5, $%ColorPicker6]
-@onready var color_pickers_2: Array[TrainColorPicker] = [$%ColorPicker7, $%ColorPicker8, $%ColorPicker9, $%ColorPicker10, $%ColorPicker11, $%ColorPicker12]
+@onready var left_arrow: ArrowButton = $%ArrowButtonLeft
+@onready var right_arrow: ArrowButton = $%ArrowButtonRight
 @onready var treno: Node3D = $TrainViewportContainer/SubViewport/Treno
 
 var selected_color: Color
+var selected_color_index: int = 0
 
 func _ready() -> void:
-	for color_picker in color_pickers_1:
+	for color_picker in color_pickers:
-		color_picker.pressed.connect(_on_color_selected.bind(color_picker, 0))
+		color_picker.pressed.connect(_on_color_selected.bind(color_picker))
 		color_picker.deselect()
 	
-	var init_idx_1 = GameState.save_data.train_color_1_index
+	_set_selected_color(0)
-	_set_selected_color(init_idx_1, 0)
 
-	for color_picker in color_pickers_2:
+	left_arrow.pressed.connect(_select_prev_color)
-		color_picker.pressed.connect(_on_color_selected.bind(color_picker, 1))
+	right_arrow.pressed.connect(_select_next_color)
-		color_picker.deselect()
-	
-	var init_idx_2 = GameState.save_data.train_color_2_index
-	_set_selected_color(init_idx_2, 1)
 
 func _process(delta: float) -> void:
 	if treno:
 		treno.rotation_degrees.y += 30.0 * delta
 
-func _set_selected_color(index: int, material_index: int) -> void:
+func _set_selected_color(index: int) -> void:
-	var color_pickers = color_pickers_1 if material_index == 0 else color_pickers_2
 	for i in range(color_pickers.size()):
 		if i == index:
 			color_pickers[i].select()
+			selected_color_index = i
 			selected_color = color_pickers[i].color
-			_apply_train_color(selected_color, material_index, index)
+			_apply_train_color(selected_color)
 		else:
 			color_pickers[i].deselect()
 
-func _on_color_selected(selected_color_picker: TrainColorPicker, material_index: int) -> void:
+func _on_color_selected(selected_color_picker: TrainColorPicker) -> void:
-	var color_pickers = color_pickers_1 if material_index == 0 else color_pickers_2
 	for i in range(color_pickers.size()):
 		if color_pickers[i] == selected_color_picker:
-			_set_selected_color(i, material_index)
+			_set_selected_color(i)
 			break
 
-func _apply_train_color(color: Color, material_index: int, color_index: int = 0) -> void:
+func _select_prev_color() -> void:
-	var path = "res://tgcc/train/Color%s_train.tres" % ("1" if material_index == 0 else "2")
+	var next_index = (selected_color_index - 1 + color_pickers.size()) % color_pickers.size()
-	var mat: ShaderMaterial = load(path) 
+	_set_selected_color(next_index)
+
+func _select_next_color() -> void:
+	var next_index = (selected_color_index + 1) % color_pickers.size()
+	_set_selected_color(next_index)
+
+func _apply_train_color(color: Color) -> void:
+	var mat: ShaderMaterial = load("res://tgcc/train/Color1_train.tres")
 	if mat:
 		mat.set_shader_parameter("albedo_color", color)
-		
-	if material_index == 0:
-		GameState.save_data.train_color_1 = color.to_html()
-		GameState.save_data.train_color_1_index = color_index
-	else:
-		GameState.save_data.train_color_2 = color.to_html()
-		GameState.save_data.train_color_2_index = color_index
-	GameState.save_game()

core/game_menu/window_option_menu_button.gd

@@ -9,10 +9,10 @@ func _ready() -> void:
 	deselect()
 	disable()
 
-func set_option_text(_text: String) -> void:
+func set_option_text(text: String) -> void:
 	if label == null:
 		label = $%Label
-	label.text = _text
+	label.text = text
 
 func select() -> void:
 	if checkbox == null:

core/game_state/game_state.gd

@@ -34,7 +34,7 @@ func apply_video_settings() -> void:
 	get_viewport().use_taa = save_data.anti_aliasing
 	var msaa_mode = Viewport.MSAA_2X if save_data.anti_aliasing else Viewport.MSAA_DISABLED
 	get_viewport().msaa_3d = msaa_mode
-	get_viewport().msaa_2d = Viewport.MSAA_DISABLED
+	get_viewport().msaa_2d = msaa_mode
 
 	match save_data.window_mode_index:
 		0:
@@ -49,18 +49,9 @@ func apply_video_settings() -> void:
 		DisplayServer.window_set_size(Vector2i(save_data.resolution_x, save_data.resolution_y))
 		
 		# Optional: center the window if resized
-		var screen_position: Vector2i = DisplayServer.screen_get_position()
+		var screen_center = DisplayServer.screen_get_position() + DisplayServer.screen_get_size() / 2
-		var screen_size: Vector2i = DisplayServer.screen_get_size()
+		var window_size = DisplayServer.window_get_size()
-		var window_size: Vector2i = DisplayServer.window_get_size()
+		DisplayServer.window_set_position(screen_center - window_size / 2)
-		var screen_center := screen_position + Vector2i(
-			floori(float(screen_size.x) / 2.0),
-			floori(float(screen_size.y) / 2.0)
-		)
-		var window_half_size := Vector2i(
-			floori(float(window_size.x) / 2.0),
-			floori(float(window_size.y) / 2.0)
-		)
-		DisplayServer.window_set_position(screen_center - window_half_size)
 
 
 func save_game() -> void:

core/main_scene_ui/main_scene_ui.gd

@@ -1,5 +1,6 @@
 extends Control
 
+
 @onready var game_menu: Control = $%GameMenu
 @onready var game_menu_panel: Control = $%GameMenuPanel
 @onready var menu_icon_button: Button = $%MenuIconButton
@@ -88,8 +89,6 @@ func _on_weather_row_on_option_changed(data: String) -> void:
 			pick_random_weather()
 		_:
 			pass
-	
-	AchievementManager.is_unlocked("ACH_CHANGE_METEO")
 
 func pick_random_weather() -> void:
 	var valid_buttons = []
@@ -167,8 +166,6 @@ func _on_photo_taken_finished() -> void:
 	await tween.finished
 	photo_mode_black_screen.hide()
 	GameState.on_photo_mode_black_screen_disappeared.emit()
-	StatsManager.add_int("stat_photo_number", 1)
-	StatsManager.store()
 
 func hide_ui_for_photo_mode() -> void:
 	TweenFX.fade_out(weather_row, 0.25)

core/main_scene_ui/total_stats_display.gd

@@ -1,70 +0,0 @@
-## Updates total elapsed time and train distance labels.
-class_name TotalStatsDisplay
-extends Node
-
-const RAILS_SCRIPT = preload("res://core/biome_generator/rails.gd")
-const SECONDS_PER_MINUTE: int = 60
-const MINUTES_PER_HOUR: int = 60
-const HOURS_PER_DAY: int = 24
-#DISTANCE_KM_PER_UNIT is taken from rails.gd constant
-
-@export var time_label_path: NodePath
-@export var distance_label_path: NodePath
-@export var rail_path: NodePath
-
-var _elapsed_seconds: float = 0.0
-var _total_distance_km: float = 0.0
-var _last_train_progress: float = -1.0
-
-@onready var _time_label: Label = get_node_or_null(time_label_path) as Label
-@onready var _distance_label: Label = get_node_or_null(distance_label_path) as Label
-@onready var _rail_path: Path3D = get_node_or_null(rail_path) as Path3D
-
-
-func _ready() -> void:
-	_update_time_label()
-	_update_distance_label()
-
-
-func _process(delta: float) -> void:
-	_elapsed_seconds += delta
-	_update_total_distance()
-	_update_time_label()
-	_update_distance_label()
-
-
-func _update_total_distance() -> void:
-	if _rail_path == null or _rail_path.curve == null:
-		return
-
-	var current_train_progress: float = float(_rail_path.get("train_progress"))
-	if _last_train_progress < 0.0:
-		_last_train_progress = current_train_progress
-		return
-
-	var total_length: float = _rail_path.curve.get_baked_length()
-	if total_length <= 0.0:
-		return
-
-	var progress_delta: float = absf(current_train_progress - _last_train_progress)
-	var wrapped_progress_delta: float = minf(progress_delta, total_length - progress_delta)
-	_total_distance_km += wrapped_progress_delta * RAILS_SCRIPT.DISTANCE_KM_PER_UNIT
-	_last_train_progress = current_train_progress
-
-
-func _update_time_label() -> void:
-	if _time_label == null:
-		return
-
-	var total_minutes: int = int(floor(_elapsed_seconds / SECONDS_PER_MINUTE))
-	var days: int = floori(float(total_minutes) / float(MINUTES_PER_HOUR * HOURS_PER_DAY))
-	var hours: int = floori(float(total_minutes) / float(MINUTES_PER_HOUR)) % HOURS_PER_DAY
-	var minutes: int = total_minutes % MINUTES_PER_HOUR
-	_time_label.text = "Time %dd %02dh %02dm" % [days, hours, minutes]
-
-
-func _update_distance_label() -> void:
-	if _distance_label == null:
-		return
-
-	_distance_label.text = "Distance %.1f km" % _total_distance_km

core/main_scene_ui/total_stats_display.gd.uid

@@ -1 +0,0 @@
-uid://c2usnexa5x7pg

core/steam_manager/achievement_manager.gd

@@ -4,22 +4,23 @@ extends Node
 #if you have an error setting achievements or stats in debug mode remember to open your steam client
 #with jmp games account or another account who bought this game. If error persist try to clos and reopen steam client.
 const KNOWN := [
-	"ACH_CHANGE_METEO",
+	"ACH_DISTANCE_100",
-	"ACH_CHANGE_TRAIN_COLOR",
+	"ACH_DISTANCE_200",
+	"ACH_10_PHOTOS",
 ]
 
 #how it works:
 #func _on_player_won() -> void:
-#    AchievementManager.unlock("ACH_DISTANCE_100") #unlock the achievement at first win
+#    Achievements.unlock("ACH_DISTANCE_100") #unlock the achievement at first win
 
 #func _on_match_finished(coins_collected: int) -> void:
 	#update stats
 	#...
 	#check thresholds and unlock achievements
-#    if StatsManager.get_int("stat_distance_km") >= 100:
+#    if Stats.get_int("stat_distance_km") >= 100:
-#        AchievementManager.unlock("ACH_DISTANCE_100")
+#        Achievements.unlock("ACH_DISTANCE_100")
-#    if StatsManager.get_int("stat_distance_km") >= 200:
+#    if Stats.get_int("stat_distance_km") >= 200:
-#        AchievementManager.unlock("ACH_DISTANCE_200")
+#        Achievements.unlock("ACH_DISTANCE_200")
 
 signal unlocked(api_name: String)
 

core/steam_manager/stats_manager.gd

@@ -7,7 +7,7 @@ extends Node
 #if you have an error setting achievements or stats in debug mode remember to open your steam client
 #with jmp games account or another account who bought this game. If error persist try to clos and reopen steam client.
 const KNOWN := [
-	"stat_time_played",
+	"stat_games_played",
 	"stat_distance_km",
 	"stat_stop_number",
 	"stat_photo_number",
@@ -16,11 +16,11 @@ const KNOWN := [
 
 #how it works:
 #func _on_match_finished(score: int) -> void:
-#    StatsManager.add_int("stat_time_played", 1)
+#    Stats.add_int("stat_games_played", 1)
-#    StatsManager.set_int("stat_total_score", StatsManager.get_int("stat_total_score") + score)
+#    Stats.set_int("stat_total_score", Stats.get_int("stat_total_score") + score)
-#    StatsManager.store()                       #only one push at the end of the game
+#    Stats.store()                       #only one push at the end of the game
-#    if StatsManager.get_int("stat_time_played") >= 10:
+#    if Stats.get_int("stat_games_played") >= 10:
-#        AchievementManager.unlock("ACH_PLAY_10_HOURS")   #it call storeStats()
+#        Achievements.unlock("ACH_PLAY_10_GAMES")   #it call storeStats()
 
 
 func _ready() -> void:
@@ -64,8 +64,8 @@ func store() -> void:
 
 #Development only: reset stats
 func reset_all(include_achievements: bool = false) -> void:
-	if !Steam.resetAllStats(include_achievements):
+	Steam.resetAllStats(include_achievements)
-		push_error("resetAllStats failed")
+	Steam.storeStats()
 
 func _on_stats_stored(_game: int, result: int) -> void:
 	if !result:

core/transition.gdshader

@@ -1,57 +0,0 @@
-shader_type canvas_item;
-
-uniform vec4 base_color : source_color;
-uniform vec2 node_resolution;
-
-uniform float factor : hint_range(0.0, 1.0, 0.01) = 0.54;
-uniform float width = 0.4;
-
-group_uniforms gradient;
-uniform sampler2D gradient_texture;
-uniform bool gradient_fixed = false;
-
-group_uniforms shape;
-uniform sampler2D shape_texture;
-uniform float shape_tiling = 32.0;
-uniform float shape_rotation = 0.0;
-uniform vec2 shape_scroll = vec2(0.0);
-uniform float shape_feathering : hint_range(0.0, 1.0, 0.01) = 0.00;
-uniform float shape_treshold : hint_range(0.0, 2.0, 0.01) = 1.0;
-
-float gradient(vec2 uv, vec2 fixed_uv, bool fixed){
-	float value = 0.0;
-	if(fixed){
-		value = texture(gradient_texture, fixed_uv).r;
-	} else {
-		value = texture(gradient_texture, uv).r;
-	}
-	return value;
-}
-
-vec2 rotate(vec2 uv, vec2 pivot, float angle)
-{
-	mat2 rotation = mat2(vec2(sin(angle), -cos(angle)),
-						vec2(cos(angle), sin(angle)));
-	uv -= pivot;
-	uv = uv * rotation;
-	uv += pivot;
-	return uv;
-}
-
-void fragment() {
-	float progress = mix(-width, 1.0, factor);
-	float aspect = node_resolution.y / node_resolution.x;
-
-	vec2 aspect_uv = ((UV-vec2(0.0,0.5)) * vec2(1.0, aspect))+vec2(0.0,0.5);
-
-	float value = clamp((gradient(UV, aspect_uv, gradient_fixed) - progress) / (width), 0.0, 1.0);
-
-	vec2 tiled_uv = rotate(mod((aspect_uv + vec2(TIME)*shape_scroll) * shape_tiling, 1.0), vec2(0.5), radians(shape_rotation));
-	float shape_value = 1.0 - texture(shape_texture, tiled_uv).r;
-
-	shape_value = mix(shape_feathering * 0.5, 1.0 - shape_feathering * 0.5, shape_value);
-	float shaped_gradient = smoothstep(value - (shape_feathering * 0.5), value + (shape_feathering * 0.5), shape_treshold - shape_value);
-
-	COLOR.rgb = base_color.rgb;
-	COLOR.a = shaped_gradient;
-}

core/transition.gdshader.uid

@@ -1 +0,0 @@
-uid://ovrd5ydp8p0q

core/ui_events.gd

@@ -43,7 +43,3 @@ signal day_time_changed(value: float, time_string: String)
 signal time_option_item_changed(index: int)
 @warning_ignore("unused_signal")
 signal day_time_option_changed(index: int)
-
-#train signals
-@warning_ignore("unused_signal")
-signal toot_toot()

docs/museums/biome_generator/museum_biome_generator.gd

@@ -1,6 +1,6 @@
 extends Node3D
 
-#func _input(event):
+func _input(event):
-	#if event is InputEventKey and event.pressed:
+	if event is InputEventKey and event.pressed:
-		#if event.keycode == KEY_ESCAPE:
+		if event.keycode == KEY_ESCAPE:
-			#get_tree().quit()
+			get_tree().quit()

docs/museums/daynight/control.gd

@@ -107,9 +107,3 @@ func _on_fog_toggled(toggled_on: bool) -> void:
 
 func _on_update_rails_pressed() -> void:
 	UIEvents.update_rail_chunks.emit()
-
-func _on_toot_toot_pressed() -> void:
-	UIEvents.toot_toot.emit()
-
-func _on_reset_stats_ach_pressed() -> void:
-	StatsManager.reset_all(true)

docs/museums/daynight/museum_daynight.gd

@@ -1,6 +1,6 @@
 extends Node3D
 
-#func _input(event):
+func _input(event):
-	#if event is InputEventKey and event.pressed:
+	if event is InputEventKey and event.pressed:
-		#if event.keycode == KEY_ESCAPE:
+		if event.keycode == KEY_ESCAPE:
-			#get_tree().quit()
+			get_tree().quit()

tgcc/main_scene.tscn

@@ -65,7 +65,6 @@
 [ext_resource type="PackedScene" uid="uid://bei7fscn77p1p" path="res://core/main_scene_ui/main_scene_ui.tscn" id="49_exdk1"]
 [ext_resource type="PackedScene" uid="uid://vni5kjalum6d" path="res://core/photo_mode/runtime/photo_mode_controller.tscn" id="50_57hhv"]
 [ext_resource type="PackedScene" uid="uid://bujym3ai10i7q" path="res://tgcc/chunk/countryside/scene/tea/chunk_country_tea_corner_01.tscn" id="51_lxncq"]
-[ext_resource type="Script" uid="uid://c2usnexa5x7pg" path="res://core/main_scene_ui/total_stats_display.gd" id="51_totals"]
 [ext_resource type="PackedScene" uid="uid://bdfosig4g14vt" path="res://tgcc/chunk/countryside/scene/tea/chunk_country_tea_corner_02.tscn" id="52_317hq"]
 [ext_resource type="PackedScene" uid="uid://ffblnqib7fry" path="res://tgcc/chunk/countryside/scene/tea/chunk_country_tea_cross_3_01.tscn" id="53_0ur37"]
 [ext_resource type="PackedScene" uid="uid://b785qpoxbrovj" path="res://tgcc/chunk/countryside/scene/tea/chunk_country_tea_cross_3_02.tscn" id="54_vbb0s"]
@@ -219,11 +218,6 @@ transform = Transform3D(0.57785755, -0.57709646, 0.5770964, 0, 0.7071067, 0.7071
 rotation_target = NodePath("../pivot")
 iso_camera = NodePath("../camera_iso")
 
-[node name="MainSceneUi" parent="cameras" unique_id=1359391222 instance=ExtResource("49_exdk1")]
-offset_left = 3.0
-offset_right = 3.0
-mouse_filter = 2
-
 [node name="DayNight" parent="." unique_id=1611939731 node_paths=PackedStringArray("camera_pivot") instance=ExtResource("36_qwsp8")]
 camera_pivot = NodePath("../cameras")
 thunder_sounds = Array[AudioStream]([SubResource("AudioStreamMP3_ra0ar"), SubResource("AudioStreamMP3_j8mxr"), ExtResource("37_pdfkp"), ExtResource("38_fpbvh"), ExtResource("39_hxtdl")])
@@ -268,6 +262,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -91.191925, 0, 539.03174)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -312.19193, 0, 349.03174)
 
 [node name="Control" type="Control" parent="." unique_id=630650980]
+visible = false
 layout_mode = 3
 anchors_preset = 0
 offset_right = 40.0
@@ -353,29 +348,6 @@ theme_override_colors/font_hover_pressed_color = Color(1, 1, 1, 1)
 theme_override_colors/font_outline_color = Color(1, 1, 1, 1)
 text = "Storm"
 
-[node name="TotalDistance" type="Label" parent="Control" unique_id=1735753299]
-layout_mode = 0
-offset_left = 277.0
-offset_top = 31.0
-offset_right = 611.0
-offset_bottom = 54.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_colors/font_outline_color = Color(1, 1, 1, 1)
-text = "Distance 0 km"
-
-[node name="TotalTime" type="Label" parent="Control" unique_id=1065776479]
-layout_mode = 0
-offset_left = 276.0
-offset_top = 13.0
-offset_right = 610.0
-offset_bottom = 36.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_colors/font_outline_color = Color(1, 1, 1, 1)
-text = "Time 00:00"
-
-[node name="TotalStatsDisplay" type="Node" parent="Control" unique_id=1147065793]
-script = ExtResource("51_totals")
-
 [node name="DayTimeLabel" type="Label" parent="Control" unique_id=1124935856]
 layout_mode = 0
 offset_left = 13.0
@@ -507,34 +479,6 @@ theme_override_colors/font_hover_pressed_color = Color(1, 1, 1, 1)
 theme_override_colors/font_outline_color = Color(1, 1, 1, 1)
 text = "Fog"
 
-[node name="ResetStatsAch" type="Button" parent="Control" unique_id=960673125]
-layout_mode = 0
-offset_left = 12.0
-offset_top = 425.0
-offset_right = 195.0
-offset_bottom = 456.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_colors/font_focus_color = Color(1, 1, 1, 1)
-theme_override_colors/font_pressed_color = Color(1, 1, 1, 1)
-theme_override_colors/font_hover_color = Color(1, 1, 1, 1)
-theme_override_colors/font_hover_pressed_color = Color(1, 1, 1, 1)
-theme_override_colors/font_outline_color = Color(1, 1, 1, 1)
-text = "Reset Stats & Ach."
-
-[node name="TootToot" type="Button" parent="Control" unique_id=2047151132]
-layout_mode = 0
-offset_left = 12.0
-offset_top = 388.0
-offset_right = 195.0
-offset_bottom = 419.0
-theme_override_colors/font_color = Color(1, 1, 1, 1)
-theme_override_colors/font_focus_color = Color(1, 1, 1, 1)
-theme_override_colors/font_pressed_color = Color(1, 1, 1, 1)
-theme_override_colors/font_hover_color = Color(1, 1, 1, 1)
-theme_override_colors/font_hover_pressed_color = Color(1, 1, 1, 1)
-theme_override_colors/font_outline_color = Color(1, 1, 1, 1)
-text = "Toot Toot"
-
 [node name="UpdateRails" type="Button" parent="Control" unique_id=267134156]
 layout_mode = 0
 offset_left = 12.0
@@ -549,6 +493,9 @@ theme_override_colors/font_hover_pressed_color = Color(1, 1, 1, 1)
 theme_override_colors/font_outline_color = Color(1, 1, 1, 1)
 text = "Update Rails"
 
+[node name="MainSceneUi" parent="." unique_id=1359391222 instance=ExtResource("49_exdk1")]
+mouse_filter = 2
+
 [connection signal="toggled" from="Control/Snow" to="Control" method="_on_snow_toggled"]
 [connection signal="toggled" from="Control/Rain" to="Control" method="_on_rain_toggled"]
 [connection signal="toggled" from="Control/Wind" to="Control" method="_on_wind_toggled"]
@@ -563,8 +510,6 @@ text = "Update Rails"
 [connection signal="toggled" from="Control/Shadows" to="Control" method="_on_shadows_toggled"]
 [connection signal="pressed" from="Control/RandomWeather" to="Control" method="_on_random_weather_pressed"]
 [connection signal="toggled" from="Control/Fog" to="Control" method="_on_fog_toggled"]
-[connection signal="pressed" from="Control/ResetStatsAch" to="Control" method="_on_reset_stats_ach_pressed"]
-[connection signal="pressed" from="Control/TootToot" to="Control" method="_on_toot_toot_pressed"]
 [connection signal="pressed" from="Control/UpdateRails" to="Control" method="_on_update_rails_pressed"]
 
 [editable path="cameras"]

tgcc/train/sounds/train_whistle.mp3.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://dc6si4i1wgtg1"
-path="res://.godot/imported/train_whistle.mp3-7c9ba844b982f1e2dc8f87df905de652.mp3str"
-
-[deps]
-
-source_file="res://tgcc/train/sounds/train_whistle.mp3"
-dest_files=["res://.godot/imported/train_whistle.mp3-7c9ba844b982f1e2dc8f87df905de652.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

tgcc/train/sounds/train_whistle2.mp3.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://cr7evvbfp33ra"
-path="res://.godot/imported/train_whistle2.mp3-fa64a19fd0b0cdce9722553ae5dff242.mp3str"
-
-[deps]
-
-source_file="res://tgcc/train/sounds/train_whistle2.mp3"
-dest_files=["res://.godot/imported/train_whistle2.mp3-fa64a19fd0b0cdce9722553ae5dff242.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

tgcc/train/train.gd

@@ -1,46 +0,0 @@
-extends Node3D
-
-#const TRAIN_WHISTLE_STREAM: AudioStream = preload("res://tgcc/train/sounds/train_whistle.mp3")
-const TRAIN_WHISTLE_STREAM: AudioStream = preload("res://tgcc/train/sounds/train_whistle2.mp3")
-
-@export_group("Whistle")
-@export var whistle_volume_db: float = 1.0
-@export var whistle_unit_size: float = 90.0
-@export var whistle_max_distance: float = 1200.0
-
-var _whistle_player: AudioStreamPlayer3D
-
-
-func _ready() -> void:
-	_create_whistle_player()
-
-	if not UIEvents.toot_toot.is_connected(_on_toot_toot):
-		UIEvents.toot_toot.connect(_on_toot_toot)
-	
-	
-func _exit_tree() -> void:
-	if UIEvents.toot_toot.is_connected(_on_toot_toot):
-		UIEvents.toot_toot.disconnect(_on_toot_toot)
-
-
-func _create_whistle_player() -> void:
-	_whistle_player = AudioStreamPlayer3D.new()
-	_whistle_player.name = "TrainWhistlePlayer"
-	_whistle_player.bus = &"SFX"
-	_whistle_player.volume_db = whistle_volume_db
-	_whistle_player.unit_size = whistle_unit_size
-	_whistle_player.max_distance = whistle_max_distance
-	_whistle_player.stream = TRAIN_WHISTLE_STREAM
-	add_child(_whistle_player)
-
-
-func _on_toot_toot() -> void:
-	if _whistle_player == null:
-		return
-
-	print("stat_toottoot_number")
-	StatsManager.add_int("stat_toottoot_number", 1)
-	StatsManager.store()
-	
-	_whistle_player.stop()
-	_whistle_player.play()

tgcc/train/train.gd.uid

@@ -1 +0,0 @@
-uid://c34qgl2afyhse

tgcc/train/train.tscn

@@ -7,7 +7,7 @@
 [ext_resource type="Material" uid="uid://o31kp0jm07q3" path="res://tgcc/chunk/material/rocks.tres" id="5_pj7tp"]
 [ext_resource type="Material" uid="uid://bsote67noubj2" path="res://tgcc/train/Color1_train.tres" id="7_sgpgi"]
 [ext_resource type="Shader" uid="uid://d0ch5ofrgf7y6" path="res://core/daynight/trunk_shader.gdshader" id="8_eke0t"]
-[ext_resource type="Script" path="res://tgcc/train/train.gd" id="9_4qk3b"]
+[ext_resource type="Script" uid="uid://5frq4qrokiy2" path="res://tgcc/train/train_glass_emission.gd" id="9_4qk3b"]
 [ext_resource type="Texture2D" uid="uid://j4m5wsf4magb" path="res://tgcc/chunk/material/decal/vending_decal.png" id="9_eke0t"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_p4ai0"]