Adding beginning of world block generation

README.md

@@ -11,4 +11,11 @@
 - `SUPER/SUPER` - Super User
 - `test1/test1` - Super User
 - `test3/test3` - User
-  
+
+## Controls
+- Move: WASD
+- Jump: Space
+- Interact (enter/exit car): E
+- Flashlight: F
+- Phone: Tab
+- Pause menu: Esc

game/assets/audio/jump.ogg.import

@@ -1,19 +1,19 @@
-[remap]
+[remap]
-
+
-importer="oggvorbisstr"
+importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
+type="AudioStreamOggVorbis"
-uid="uid://de2e8sy4x724m"
+uid="uid://de2e8sy4x724m"
-path="res://.godot/imported/jump.ogg-09aff86a6f79a8fce2febb69902962cf.oggvorbisstr"
+path="res://.godot/imported/jump.ogg-09aff86a6f79a8fce2febb69902962cf.oggvorbisstr"
-
+
-[deps]
+[deps]
-
+
-source_file="res://assets/audio/jump.ogg"
+source_file="res://assets/audio/jump.ogg"
-dest_files=["res://.godot/imported/jump.ogg-09aff86a6f79a8fce2febb69902962cf.oggvorbisstr"]
+dest_files=["res://.godot/imported/jump.ogg-09aff86a6f79a8fce2febb69902962cf.oggvorbisstr"]
-
+
-[params]
+[params]
-
+
-loop=false
+loop=false
-loop_offset=0
+loop_offset=0
-bpm=0
+bpm=0
-beat_count=0
+beat_count=0
-bar_beats=4
+bar_beats=4

game/assets/audio/silly-menu-hover-test.ogg.import

@@ -1,19 +1,19 @@
-[remap]
+[remap]
-
+
-importer="oggvorbisstr"
+importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
+type="AudioStreamOggVorbis"
-uid="uid://64dplcgx2icb"
+uid="uid://64dplcgx2icb"
-path="res://.godot/imported/silly-menu-hover-test.ogg-101de051c9810c756b28483653a4c618.oggvorbisstr"
+path="res://.godot/imported/silly-menu-hover-test.ogg-101de051c9810c756b28483653a4c618.oggvorbisstr"
-
+
-[deps]
+[deps]
-
+
-source_file="res://assets/audio/silly-menu-hover-test.ogg"
+source_file="res://assets/audio/silly-menu-hover-test.ogg"
-dest_files=["res://.godot/imported/silly-menu-hover-test.ogg-101de051c9810c756b28483653a4c618.oggvorbisstr"]
+dest_files=["res://.godot/imported/silly-menu-hover-test.ogg-101de051c9810c756b28483653a4c618.oggvorbisstr"]
-
+
-[params]
+[params]
-
+
-loop=false
+loop=false
-loop_offset=0
+loop_offset=0
-bpm=0
+bpm=0
-beat_count=0
+beat_count=0
-bar_beats=4
+bar_beats=4

game/assets/audio/silly-test.ogg.import

@@ -1,19 +1,19 @@
-[remap]
+[remap]
-
+
-importer="oggvorbisstr"
+importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
+type="AudioStreamOggVorbis"
-uid="uid://txgki0ijeuud"
+uid="uid://txgki0ijeuud"
-path="res://.godot/imported/silly-test.ogg-4a08df8a26b9ee1e5d13235e013c7cfc.oggvorbisstr"
+path="res://.godot/imported/silly-test.ogg-4a08df8a26b9ee1e5d13235e013c7cfc.oggvorbisstr"
-
+
-[deps]
+[deps]
-
+
-source_file="res://assets/audio/silly-test.ogg"
+source_file="res://assets/audio/silly-test.ogg"
-dest_files=["res://.godot/imported/silly-test.ogg-4a08df8a26b9ee1e5d13235e013c7cfc.oggvorbisstr"]
+dest_files=["res://.godot/imported/silly-test.ogg-4a08df8a26b9ee1e5d13235e013c7cfc.oggvorbisstr"]
-
+
-[params]
+[params]
-
+
-loop=false
+loop=false
-loop_offset=0
+loop_offset=0
-bpm=0
+bpm=0
-beat_count=0
+beat_count=0
-bar_beats=4
+bar_beats=4

game/assets/fonts/PlayfairDisplay-VariableFont_wght.ttf.import

@@ -1,36 +1,36 @@
-[remap]
+[remap]
-
+
-importer="font_data_dynamic"
+importer="font_data_dynamic"
-type="FontFile"
+type="FontFile"
-uid="uid://m5ceou0rk6j6"
+uid="uid://m5ceou0rk6j6"
-path="res://.godot/imported/PlayfairDisplay-VariableFont_wght.ttf-fbc765a7962e1c71b0eb2c53d6eb2a10.fontdata"
+path="res://.godot/imported/PlayfairDisplay-VariableFont_wght.ttf-fbc765a7962e1c71b0eb2c53d6eb2a10.fontdata"
-
+
-[deps]
+[deps]
-
+
-source_file="res://assets/fonts/PlayfairDisplay-VariableFont_wght.ttf"
+source_file="res://assets/fonts/PlayfairDisplay-VariableFont_wght.ttf"
-dest_files=["res://.godot/imported/PlayfairDisplay-VariableFont_wght.ttf-fbc765a7962e1c71b0eb2c53d6eb2a10.fontdata"]
+dest_files=["res://.godot/imported/PlayfairDisplay-VariableFont_wght.ttf-fbc765a7962e1c71b0eb2c53d6eb2a10.fontdata"]
-
+
-[params]
+[params]
-
+
-Rendering=null
+Rendering=null
-antialiasing=1
+antialiasing=1
-generate_mipmaps=false
+generate_mipmaps=false
-disable_embedded_bitmaps=true
+disable_embedded_bitmaps=true
-multichannel_signed_distance_field=false
+multichannel_signed_distance_field=false
-msdf_pixel_range=8
+msdf_pixel_range=8
-msdf_size=48
+msdf_size=48
-allow_system_fallback=true
+allow_system_fallback=true
-force_autohinter=false
+force_autohinter=false
-modulate_color_glyphs=false
+modulate_color_glyphs=false
-hinting=1
+hinting=1
-subpixel_positioning=4
+subpixel_positioning=4
-keep_rounding_remainders=true
+keep_rounding_remainders=true
-oversampling=0.0
+oversampling=0.0
-Fallbacks=null
+Fallbacks=null
-fallbacks=[]
+fallbacks=[]
-Compress=null
+Compress=null
-compress=true
+compress=true
-preload=[]
+preload=[]
-language_support={}
+language_support={}
-script_support={}
+script_support={}
-opentype_features={}
+opentype_features={}

game/assets/images/pp_start_bg.png.import

@@ -1,40 +1,40 @@
-[remap]
+[remap]
-
+
-importer="texture"
+importer="texture"
-type="CompressedTexture2D"
+type="CompressedTexture2D"
-uid="uid://dhuosr0p605gj"
+uid="uid://dhuosr0p605gj"
-path="res://.godot/imported/pp_start_bg.png-8fb0f850edd45e79935f992c58fa8ca2.ctex"
+path="res://.godot/imported/pp_start_bg.png-8fb0f850edd45e79935f992c58fa8ca2.ctex"
-metadata={
+metadata={
-"vram_texture": false
+"vram_texture": false
-}
+}
-
+
-[deps]
+[deps]
-
+
-source_file="res://assets/images/pp_start_bg.png"
+source_file="res://assets/images/pp_start_bg.png"
-dest_files=["res://.godot/imported/pp_start_bg.png-8fb0f850edd45e79935f992c58fa8ca2.ctex"]
+dest_files=["res://.godot/imported/pp_start_bg.png-8fb0f850edd45e79935f992c58fa8ca2.ctex"]
-
+
-[params]
+[params]
-
+
-compress/mode=0
+compress/mode=0
-compress/high_quality=false
+compress/high_quality=false
-compress/lossy_quality=0.7
+compress/lossy_quality=0.7
-compress/uastc_level=0
+compress/uastc_level=0
-compress/rdo_quality_loss=0.0
+compress/rdo_quality_loss=0.0
-compress/hdr_compression=1
+compress/hdr_compression=1
-compress/normal_map=0
+compress/normal_map=0
-compress/channel_pack=0
+compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=false
-mipmaps/limit=-1
+mipmaps/limit=-1
-roughness/mode=0
+roughness/mode=0
-roughness/src_normal=""
+roughness/src_normal=""
-process/channel_remap/red=0
+process/channel_remap/red=0
-process/channel_remap/green=1
+process/channel_remap/green=1
-process/channel_remap/blue=2
+process/channel_remap/blue=2
-process/channel_remap/alpha=3
+process/channel_remap/alpha=3
-process/fix_alpha_border=true
+process/fix_alpha_border=true
-process/premult_alpha=false
+process/premult_alpha=false
-process/normal_map_invert_y=false
+process/normal_map_invert_y=false
-process/hdr_as_srgb=false
+process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
+process/hdr_clamp_exposure=false
-process/size_limit=0
+process/size_limit=0
-detect_3d/compress_to=1
+detect_3d/compress_to=1

game/project.godot

@@ -25,6 +25,7 @@ MenuMusic="*res://scenes/UI/menu_music.tscn"
 MenuSfx="*res://scenes/UI/menu_sfx.tscn"
 AuthState="*res://scenes/UI/auth_state.gd"
 CharacterService="*res://scenes/UI/character_service.gd"
+SelectedCharacter="*res://scenes/UI/selected_character.gd"
 
 [dotnet]
 
@@ -74,3 +75,8 @@ player_phone={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194306,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }
+interact={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
+]
+}

game/scenes/Characters/repo_bot.gd

@@ -3,8 +3,9 @@ extends Node3D
 @export var left_pupil_path: NodePath = NodePath("Body/HeadPivot/EyeLeft/Pupil")
 @export var right_pupil_path: NodePath = NodePath("Body/HeadPivot/EyeRight/Pupil")
 @export var camera_path: NodePath
-@export var look_origin_path: NodePath = NodePath("Body/HeadPivot")
+@export var look_origin_path: NodePath = NodePath("Body/HeadPivot")
-@export var look_reference_path: NodePath = NodePath("Body")
+@export var look_reference_path: NodePath = NodePath("Body")
+@export var look_target_path: NodePath = NodePath("")
 @export var lock_vertical: bool = true
 @export var vertical_unlock_height: float = 0.6
 @export var vertical_lock_smooth_speed: float = 6.0
@@ -28,10 +29,11 @@ var _head: Node3D
 var _head_base_rot: Vector3
 var _vertical_lock_factor: float = 1.0
 var _vertical_hold_timer: float = 0.0
-var _look_reference: Node3D
+var _look_reference: Node3D
+var _look_target: Node3D
 
 
-func _ready() -> void:
+func _ready() -> void:
 	_left_pupil = get_node_or_null(left_pupil_path) as Node3D
 	_right_pupil = get_node_or_null(right_pupil_path) as Node3D
 	if _left_pupil:
@@ -39,9 +41,10 @@ func _ready() -> void:
 	if _right_pupil:
 		_right_base = _right_pupil.position
 	_camera = _resolve_camera()
-	_look_origin = get_node_or_null(look_origin_path) as Node3D
+	_look_origin = get_node_or_null(look_origin_path) as Node3D
-	_look_reference = get_node_or_null(look_reference_path) as Node3D
+	_look_reference = get_node_or_null(look_reference_path) as Node3D
-	_head = get_node_or_null(head_path) as Node3D
+	_look_target = get_node_or_null(look_target_path) as Node3D
+	_head = get_node_or_null(head_path) as Node3D
 	if _head:
 		_head_base_rot = _head.rotation
 
@@ -54,15 +57,21 @@ func _process(_delta: float) -> void:
 	_update_pupils()
 
 
-func _update_pupils() -> void:
+func _update_pupils() -> void:
-	if _camera == null or not _camera.is_inside_tree():
+	if _look_target == null and look_target_path != NodePath(""):
-		_camera = _resolve_camera()
+		_look_target = get_node_or_null(look_target_path) as Node3D
-	if _camera == null:
+	if _look_target == null:
-		return
+		var viewport_cam := get_viewport().get_camera_3d()
-	var origin := _look_origin
+		if viewport_cam != null and viewport_cam != _camera:
-	if origin == null:
+			_camera = viewport_cam
-		origin = self
+		elif _camera == null or not _camera.is_inside_tree():
-	var target := _camera.global_position
+			_camera = _resolve_camera()
+	if _look_target == null and _camera == null:
+		return
+	var origin := _look_origin
+	if origin == null:
+		origin = self
+	var target := _look_target.global_position if _look_target != null else _camera.global_position
 	var dir_world := target - origin.global_position
 	if dir_world.length_squared() <= 0.0001:
 		return

game/scenes/Characters/repo_bot.tscn

@@ -57,7 +57,12 @@ height = 1.1
 [node name="RepoBot" type="Node3D"]
 script = ExtResource("1_repo_bot")
 
-[node name="Body" type="StaticBody3D" parent="."]
+[node name="Body" type="RigidBody3D" parent="."]
+mass = 1.5
+axis_lock_angular_x = true
+axis_lock_angular_z = true
+angular_damp = 8.0
+linear_damp = 0.5
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Body"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, 0)

game/scenes/Levels/level.tscn

@@ -7,6 +7,7 @@
 [ext_resource type="Script" uid="uid://b7fopt7sx74g8" path="res://scenes/Levels/menu.gd" id="3_tc7dm"]
 [ext_resource type="PackedScene" path="res://scenes/Characters/repo_bot.tscn" id="4_repo"]
 [ext_resource type="PackedScene" uid="uid://bnqaqbgynoyys" path="res://assets/models/TestCharAnimated.glb" id="5_fi66n"]
+[ext_resource type="PackedScene" path="res://scenes/Vehicles/car.tscn" id="5_car"]
 
 [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_2q6dc"]
 bounce = 0.5
@@ -43,6 +44,7 @@ script = ExtResource("1_a4mo8")
 
 [node name="RepoBot" parent="." instance=ExtResource("4_repo")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.9426608, 0, -4.4451966)
+look_target_path = NodePath("../Player")
 
 [node name="Thing" type="RigidBody3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -3.7986288)
@@ -186,8 +188,8 @@ bones/62/rotation = Quaternion(0.56540585, 0.011310213, -0.008501466, 0.8246915)
 bones/63/position = Vector3(7.93632e-09, 0.1572156, -2.6982683e-10)
 bones/63/rotation = Quaternion(0.28907102, 0.031904068, 0.014082117, 0.9566723)
 bones/64/position = Vector3(7.567915e-10, 0.099999994, -3.2595668e-09)
-
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Player"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
 shape = SubResource("SphereShape3D_mx8sn")
 
 [node name="Camera3D" type="Camera3D" parent="Player"]
@@ -197,6 +199,8 @@ fov = 49.0
 
 [node name="SpotLight3D" type="SpotLight3D" parent="Player"]
 
+[node name="Car" parent="." instance=ExtResource("5_car")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6, 0, -3)
 [node name="Ground" type="StaticBody3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
 
@@ -204,6 +208,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
 shape = SubResource("BoxShape3D_2q6dc")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="Ground"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00053596497, 0.0075991154, -0.0019865036)
 mesh = SubResource("BoxMesh_w7c3h")
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]

game/scenes/Levels/location_level.gd

@@ -0,0 +1,15 @@
+extends Node3D
+
+@export var tile_size := 4.0
+@export var block_height := 1.0
+
+@onready var _block: MeshInstance3D = $TerrainBlock
+@onready var _camera: Camera3D = $Camera3D
+
+func _ready() -> void:
+	var coord := SelectedCharacter.get_coord()
+	var block_pos := Vector3(coord.x * tile_size, block_height * 0.5, coord.y * tile_size)
+	_block.position = block_pos
+	_block.scale = Vector3(tile_size, block_height, tile_size)
+	if _camera:
+		_camera.look_at(block_pos, Vector3.UP)

game/scenes/Levels/location_level.gd.uid

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

game/scenes/Levels/location_level.tscn

@@ -0,0 +1,23 @@
+[gd_scene load_steps=4 format=3 uid="uid://b7p7k1i4t0m2l"]
+
+[ext_resource type="Script" path="res://scenes/Levels/location_level.gd" id="1_6y4q1"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yu2x4"]
+albedo_color = Color(0.2, 0.6, 0.2, 1)
+
+[sub_resource type="BoxMesh" id="BoxMesh_t2a5k"]
+material = SubResource("StandardMaterial3D_yu2x4")
+
+[node name="LocationLevel" type="Node3D"]
+script = ExtResource("1_6y4q1")
+
+[node name="TerrainBlock" type="MeshInstance3D" parent="."]
+mesh = SubResource("BoxMesh_t2a5k")
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 0.819152, 0.573576, 0, -0.573576, 0.819152, 0, 6, 0)
+shadow_enabled = true
+
+[node name="Camera3D" type="Camera3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 0.92388, 0.382683, 0, -0.382683, 0.92388, 0, 6, 10)
+current = true

game/scenes/Levels/menu.gd

@@ -14,13 +14,15 @@ func _input(event):
 		else:
 			pause_game()
 
-func pause_game():
+func pause_game():
-	get_tree().paused = true
+	get_tree().paused = true
-	visible = true
+	visible = true
+	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
 
-func resume_game():
+func resume_game():
-	get_tree().paused = false
+	get_tree().paused = false
-	visible = false
+	visible = false
+	Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
 
 func _on_quit_button_pressed():
 	get_tree().quit()
@@ -28,9 +30,10 @@ func _on_quit_button_pressed():
 func _on_continue_button_pressed():
 	resume_game()
 
-func _on_main_menu_button_pressed():
+func _on_main_menu_button_pressed():
-	resume_game()
+	resume_game()
-	get_tree().change_scene_to_file(START_SCREEN_SCENE)
+	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
+	get_tree().change_scene_to_file(START_SCREEN_SCENE)
 
 func _register_focus_sounds() -> void:
 	if pause_menu == null:

game/scenes/UI/character_screen.gd

@@ -69,11 +69,11 @@ func _on_add_button_pressed() -> void:
 	else:
 		_status_label.text = "Character created, but response was unexpected."
 
-func _on_delete_button_pressed() -> void:
+func _on_delete_button_pressed() -> void:
-	var selected := _character_list.get_selected_items()
+	var selected := _character_list.get_selected_items()
-	if selected.is_empty():
+	if selected.is_empty():
-		_status_label.text = "Select a character to delete."
+		_status_label.text = "Select a character to delete."
-		return
+		return
 
 	var index := selected[0]
 	if index < 0 or index >= _characters.size():
@@ -94,8 +94,23 @@ func _on_delete_button_pressed() -> void:
 		return
 
 	_characters.remove_at(index)
-	_character_list.remove_item(index)
+	_character_list.remove_item(index)
-	_status_label.text = "Character deleted."
+	_status_label.text = "Character deleted."
+
+func _on_select_button_pressed() -> void:
+	var selected := _character_list.get_selected_items()
+	if selected.is_empty():
+		_status_label.text = "Select a character first."
+		return
+
+	var index := selected[0]
+	if index < 0 or index >= _characters.size():
+		_status_label.text = "Invalid selection."
+		return
+
+	var character: Dictionary = _characters[index]
+	SelectedCharacter.set_character(character)
+	get_tree().change_scene_to_file("res://scenes/Levels/location_level.tscn")
 
 func _on_refresh_button_pressed() -> void:
 	_load_characters()

game/scenes/UI/character_screen.tscn

@@ -87,16 +87,23 @@ theme = ExtResource("4_5b3b7")
 text = "ADD"
 text_alignment = 1
 
-[node name="ActionHBox" type="HBoxContainer" parent="MarginContainer/ContentCenter/ContentVBox"]
+[node name="ActionHBox" type="HBoxContainer" parent="MarginContainer/ContentCenter/ContentVBox"]
-layout_mode = 2
+layout_mode = 2
-size_flags_horizontal = 4
+size_flags_horizontal = 4
-theme_override_constants/separation = 10
+theme_override_constants/separation = 10
-
+
-[node name="RefreshButton" type="Button" parent="MarginContainer/ContentCenter/ContentVBox/ActionHBox"]
+[node name="SelectButton" type="Button" parent="MarginContainer/ContentCenter/ContentVBox/ActionHBox"]
-layout_mode = 2
+layout_mode = 2
-size_flags_horizontal = 4
+size_flags_horizontal = 4
-theme = ExtResource("4_5b3b7")
+theme = ExtResource("4_5b3b7")
-text = "REFRESH"
+text = "SELECT"
+text_alignment = 1
+
+[node name="RefreshButton" type="Button" parent="MarginContainer/ContentCenter/ContentVBox/ActionHBox"]
+layout_mode = 2
+size_flags_horizontal = 4
+theme = ExtResource("4_5b3b7")
+text = "REFRESH"
 text_alignment = 1
 
 [node name="DeleteButton" type="Button" parent="MarginContainer/ContentCenter/ContentVBox/ActionHBox"]
@@ -123,9 +130,10 @@ text_alignment = 1
 [node name="LogoutRequest" type="HTTPRequest" parent="."]
 unique_name_in_owner = true
 
-[connection signal="pressed" from="MarginContainer/ContentCenter/ContentVBox/AddHBox/AddButton" to="." method="_on_add_button_pressed"]
+[connection signal="pressed" from="MarginContainer/ContentCenter/ContentVBox/AddHBox/AddButton" to="." method="_on_add_button_pressed"]
-[connection signal="pressed" from="MarginContainer/ContentCenter/ContentVBox/ActionHBox/RefreshButton" to="." method="_on_refresh_button_pressed"]
+[connection signal="pressed" from="MarginContainer/ContentCenter/ContentVBox/ActionHBox/SelectButton" to="." method="_on_select_button_pressed"]
-[connection signal="pressed" from="MarginContainer/ContentCenter/ContentVBox/ActionHBox/DeleteButton" to="." method="_on_delete_button_pressed"]
+[connection signal="pressed" from="MarginContainer/ContentCenter/ContentVBox/ActionHBox/RefreshButton" to="." method="_on_refresh_button_pressed"]
-[connection signal="pressed" from="MarginContainer/ContentCenter/ContentVBox/ActionHBox/BackButton" to="." method="_on_back_button_pressed"]
+[connection signal="pressed" from="MarginContainer/ContentCenter/ContentVBox/ActionHBox/DeleteButton" to="." method="_on_delete_button_pressed"]
-[connection signal="pressed" from="MarginContainer/ContentCenter/ContentVBox/ActionHBox/LogoutButton" to="." method="_on_logout_button_pressed"]
+[connection signal="pressed" from="MarginContainer/ContentCenter/ContentVBox/ActionHBox/BackButton" to="." method="_on_back_button_pressed"]
+[connection signal="pressed" from="MarginContainer/ContentCenter/ContentVBox/ActionHBox/LogoutButton" to="." method="_on_logout_button_pressed"]
 [connection signal="request_completed" from="LogoutRequest" to="." method="_on_logout_request_completed"]

game/scenes/UI/selected_character.gd

@@ -0,0 +1,16 @@
+extends Node
+
+var character: Dictionary = {}
+
+func set_character(data: Dictionary) -> void:
+	character = data
+
+func clear() -> void:
+	character = {}
+
+func get_coord() -> Vector2:
+	var coord: Dictionary = character.get("coord", {})
+	return Vector2(
+		float(coord.get("x", 0)),
+		float(coord.get("y", 0))
+	)

game/scenes/UI/selected_character.gd.uid

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

game/scenes/Vehicles/car.gd

@@ -0,0 +1,105 @@
+extends RigidBody3D
+
+@export var drive_speed := 18.0
+@export var drive_accel := 20.0
+@export var brake_strength := 28.0
+@export var turn_speed := 2.0
+@export var turn_accel := 8.0
+@export var lateral_damp := 10.0
+@export var launch_impulse := 28.0
+@export var launch_up_impulse := 6.0
+@export var seat_path: NodePath
+@export var exit_path: NodePath
+@export var camera_path: NodePath
+@export var interact_area_path: NodePath
+
+@onready var seat: Node3D = get_node(seat_path) if seat_path != NodePath("") else null
+@onready var exit_point: Node3D = get_node(exit_path) if exit_path != NodePath("") else null
+@onready var car_camera: Camera3D = get_node(camera_path) if camera_path != NodePath("") else null
+@onready var interact_area: Area3D = get_node(interact_area_path) if interact_area_path != NodePath("") else null
+
+var _nearby_driver: Node = null
+var _driver: Node = null
+
+func _ready() -> void:
+	if interact_area:
+		interact_area.collision_layer = 2
+		interact_area.collision_mask = 1
+		interact_area.body_entered.connect(_on_interact_body_entered)
+		interact_area.body_exited.connect(_on_interact_body_exited)
+	if car_camera:
+		car_camera.current = false
+	contact_monitor = true
+	max_contacts_reported = 8
+
+func _process(_delta: float) -> void:
+	if _driver == null and _nearby_driver != null and Input.is_action_just_pressed("interact"):
+		_enter_vehicle(_nearby_driver)
+	elif _driver != null and Input.is_action_just_pressed("interact"):
+		_exit_vehicle()
+
+func _integrate_forces(state: PhysicsDirectBodyState3D) -> void:
+	if _driver == null:
+		return
+
+	var input2v := Input.get_vector("ui_left", "ui_right", "ui_up", "ui_down")
+	var forward := global_transform.basis.z
+	forward.y = 0.0
+	forward = forward.normalized()
+
+	var current_speed := linear_velocity.dot(forward)
+	var target_speed := input2v.y * drive_speed
+	var accel := drive_accel if abs(input2v.y) > 0.01 else brake_strength
+	var new_forward_speed := move_toward(current_speed, target_speed, accel * state.step)
+	var forward_vel := forward * new_forward_speed
+	var lateral_vel := linear_velocity - (forward * current_speed)
+	lateral_vel = lateral_vel.move_toward(Vector3.ZERO, lateral_damp * state.step)
+	linear_velocity = forward_vel + lateral_vel
+
+	var speed_factor: float = clamp(abs(new_forward_speed) / drive_speed, 0.0, 1.0)
+	var turn_input := input2v.x
+	if new_forward_speed < -0.1:
+		turn_input = -turn_input
+	var target_turn: float = turn_input * turn_speed * speed_factor
+	angular_velocity.y = move_toward(angular_velocity.y, target_turn, turn_accel * state.step)
+
+	if speed_factor > 0.2:
+		var hit_ids := {}
+		for i in state.get_contact_count():
+			var collider := state.get_contact_collider_object(i)
+			if collider is RigidBody3D and collider != self:
+				var collider_id := (collider as Node).get_instance_id()
+				if hit_ids.has(collider_id):
+					continue
+				hit_ids[collider_id] = true
+				var contact_pos := state.get_contact_collider_position(i)
+				var launch_dir := (contact_pos - global_position).normalized()
+				if launch_dir.length() <= 0.001:
+					var normal_world := (global_transform.basis * state.get_contact_local_normal(i)).normalized()
+					launch_dir = normal_world if normal_world.length() > 0.001 else forward.normalized()
+				var impulse := launch_dir * (launch_impulse * speed_factor) + Vector3.UP * launch_up_impulse
+				(collider as RigidBody3D).apply_central_impulse(impulse)
+
+func _enter_vehicle(player: Node) -> void:
+	if seat == null:
+		return
+	_driver = player
+	player.call("enter_vehicle", self, seat, car_camera)
+	if car_camera:
+		car_camera.current = true
+
+func _exit_vehicle() -> void:
+	if _driver == null:
+		return
+	_driver.call("exit_vehicle", exit_point, car_camera)
+	_driver = null
+	if car_camera:
+		car_camera.current = false
+
+func _on_interact_body_entered(body: Node) -> void:
+	if body.has_method("enter_vehicle"):
+		_nearby_driver = body
+
+func _on_interact_body_exited(body: Node) -> void:
+	if body == _nearby_driver:
+		_nearby_driver = null

game/scenes/Vehicles/car.gd.uid

@@ -0,0 +1 @@
+uid://4qf5yinepytc

game/scenes/Vehicles/car.tscn

@@ -0,0 +1,43 @@
+[gd_scene load_steps=6 format=3]
+
+[ext_resource type="Script" path="res://scenes/Vehicles/car.gd" id="1_kbd20"]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_7r1j6"]
+size = Vector3(1.4, 0.9, 2.6)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_jk0m1"]
+size = Vector3(2.2, 2.0, 3.8)
+
+[sub_resource type="BoxMesh" id="BoxMesh_4y8xk"]
+size = Vector3(1.4, 0.9, 2.6)
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_red"]
+albedo_color = Color(0.85, 0.1, 0.1, 1)
+
+[node name="Car" type="RigidBody3D"]
+script = ExtResource("1_kbd20")
+seat_path = NodePath("Seat")
+exit_path = NodePath("Exit")
+camera_path = NodePath("CarCamera")
+interact_area_path = NodePath("InteractArea")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("BoxShape3D_7r1j6")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+mesh = SubResource("BoxMesh_4y8xk")
+surface_material_override/0 = SubResource("StandardMaterial3D_red")
+
+[node name="InteractArea" type="Area3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="InteractArea"]
+shape = SubResource("BoxShape3D_jk0m1")
+
+[node name="Seat" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0, 0.6, 0.0)
+
+[node name="Exit" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.3, 0.0, 0.0)
+
+[node name="CarCamera" type="Camera3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0, 2.0, 4.2)

game/scenes/player.gd

@@ -20,14 +20,27 @@ var current_number_of_jumps := 0
 var _pending_mouse_delta := Vector2.ZERO
 var _last_move_forward := Vector3(0, 0, 1)
 var _last_move_right := Vector3(1, 0, 0)
-var _camera_offset_local := Vector3.ZERO
+var _camera_offset_local := Vector3.ZERO
-var _camera_yaw := 0.0
+var _camera_yaw := 0.0
-var _camera_pitch := 0.0
+var _camera_pitch := 0.0
-
+var _in_vehicle := false
-@export var camera_follow_speed := 10.0
+var _vehicle_collision_layer := 0
-
+var _vehicle_collision_mask := 0
-var jump_sound = preload("res://assets/audio/jump.ogg")
+var _vehicle_original_parent: Node = null
-var audio_player = AudioStreamPlayer.new()
+var _light_was_on := false
+var _jump_triggered := false
+@onready var _flashlight: SpotLight3D = $SpotLight3D
+@onready var _anim_player: AnimationPlayer = find_child("AnimationPlayer", true, false) as AnimationPlayer
+@onready var _model_root: Node3D = find_child("TestCharAnimated", true, false) as Node3D
+
+@export var camera_follow_speed := 10.0
+@export var anim_idle_name := "Idle"
+@export var anim_walk_name := "Walk"
+@export var anim_jump_name := "Jump"
+@export var anim_walk_speed_threshold := 0.25
+
+var jump_sound = preload("res://assets/audio/jump.ogg")
+var audio_player = AudioStreamPlayer.new()
 
 @export var camera_path: NodePath
 @onready var cam: Camera3D = get_node(camera_path) if camera_path != NodePath("") else null
@@ -35,7 +48,7 @@ var audio_player = AudioStreamPlayer.new()
 @onready var phone: CanvasLayer = get_node(phone_path) if phone_path != NodePath("") else null
 var phone_visible := false
 
-func _ready() -> void:
+func _ready() -> void:
 	axis_lock_angular_x = true
 	axis_lock_angular_z = true
 	angular_damp = 6.0
@@ -44,7 +57,7 @@ func _ready() -> void:
 	add_child(audio_player)
 	audio_player.stream = jump_sound
 	audio_player.volume_db = -20
-	if cam:
+	if cam:
 		_camera_offset_local = cam.transform.origin
 		_camera_pitch = cam.rotation.x
 		_camera_yaw = global_transform.basis.get_euler().y
@@ -58,11 +71,16 @@ func _ready() -> void:
 	right.y = 0.0
 	if forward.length() > 0.0001:
 		_last_move_forward = forward.normalized()
-	if right.length() > 0.0001:
+	if right.length() > 0.0001:
-		_last_move_right = right.normalized()
+		_last_move_right = right.normalized()
-	
+	_vehicle_collision_layer = collision_layer
-func _integrate_forces(state):
+	_vehicle_collision_mask = collision_mask
-	if cameraMoveMode and _pending_mouse_delta != Vector2.ZERO:
+	
+func _integrate_forces(state):
+	if _in_vehicle:
+		linear_velocity = Vector3.ZERO
+		return
+	if cameraMoveMode and _pending_mouse_delta != Vector2.ZERO:
 		rotation_x -= _pending_mouse_delta.y * mouse_sensitivity
 		rotation_y -= _pending_mouse_delta.x * mouse_sensitivity
 		rotation_x = clamp(rotation_x, deg_to_rad(-90), deg_to_rad(90))  # Prevent flipping
@@ -113,21 +131,27 @@ func _integrate_forces(state):
 			on_floor = true
 			break
 	
-	if Input.is_action_just_pressed("ui_accept") and (on_floor or current_number_of_jumps == 1):
+	if Input.is_action_just_pressed("ui_accept") and (on_floor or current_number_of_jumps == 1):
-		current_number_of_jumps = (current_number_of_jumps + 1) % 2
+		current_number_of_jumps = (current_number_of_jumps + 1) % 2
-		linear_velocity.y = JUMP_SPEED
+		linear_velocity.y = JUMP_SPEED
-		audio_player.play()
+		audio_player.play()
+		_jump_triggered = true
+
+	if cam:
+		var target_yaw := global_transform.basis.get_euler().y
+		_camera_yaw = lerp_angle(_camera_yaw, target_yaw, camera_follow_speed * state.step)
+		var target_basis := Basis(Vector3.UP, _camera_yaw)
+		var target_pos := global_position + (target_basis * _camera_offset_local)
+		cam.global_position = cam.global_position.lerp(target_pos, camera_follow_speed * state.step)
+		cam.global_rotation = Vector3(_camera_pitch, _camera_yaw, 0.0)
+
+	_update_animation(on_floor, state.linear_velocity)
+	_jump_triggered = false
 
-	if cam:
+func _input(event):
-		var target_yaw := global_transform.basis.get_euler().y
+	if _in_vehicle:
-		_camera_yaw = lerp_angle(_camera_yaw, target_yaw, camera_follow_speed * state.step)
+		return
-		var target_basis := Basis(Vector3.UP, _camera_yaw)
+	if event is InputEventMouseButton:
-		var target_pos := global_position + (target_basis * _camera_offset_local)
-		cam.global_position = cam.global_position.lerp(target_pos, camera_follow_speed * state.step)
-		cam.global_rotation = Vector3(_camera_pitch, _camera_yaw, 0.0)
-
-func _input(event):
-	if event is InputEventMouseButton:
 		if event.button_index == MOUSE_BUTTON_MIDDLE:
 			if event.pressed:
 				cameraMoveMode = true
@@ -145,10 +169,68 @@ func _input(event):
 		elif event.button_index == MOUSE_BUTTON_WHEEL_DOWN:
 			zoom_camera(ZOOM_FACTOR) # Zoom out
 			
-	if event.is_action_pressed("player_light"):
+	if event.is_action_pressed("player_light"):
-		$SpotLight3D.visible = !$SpotLight3D.visible
+		_flashlight.visible = !_flashlight.visible
 			
-func zoom_camera(factor):
+func zoom_camera(factor):
-	var new_fov = cam.fov * factor
+	var new_fov = cam.fov * factor
-	cam.fov = clamp(new_fov, MIN_FOV, MAX_FOV)
+	cam.fov = clamp(new_fov, MIN_FOV, MAX_FOV)
+
+func _update_animation(on_floor: bool, velocity: Vector3) -> void:
+	if _anim_player == null:
+		return
+	var horizontal_speed := Vector3(velocity.x, 0.0, velocity.z).length()
+	if _jump_triggered and _anim_player.has_animation(anim_jump_name):
+		if _anim_player.current_animation != anim_jump_name:
+			_anim_player.play(anim_jump_name)
+		return
+	if not on_floor and _anim_player.has_animation(anim_jump_name):
+		if _anim_player.current_animation != anim_jump_name:
+			_anim_player.play(anim_jump_name)
+		return
+	if horizontal_speed > anim_walk_speed_threshold and _anim_player.has_animation(anim_walk_name):
+		if _anim_player.current_animation != anim_walk_name:
+			_anim_player.play(anim_walk_name)
+		return
+	if _anim_player.has_animation(anim_idle_name):
+		if _anim_player.current_animation != anim_idle_name:
+			_anim_player.play(anim_idle_name)
+
+func enter_vehicle(_vehicle: Node, seat: Node3D, vehicle_camera: Camera3D) -> void:
+	_in_vehicle = true
+	freeze = true
+	sleeping = true
+	collision_layer = 0
+	collision_mask = 0
+	_vehicle_original_parent = get_parent()
+	_light_was_on = _flashlight.visible
+	_flashlight.visible = false
+	if _model_root:
+		_model_root.visible = false
+	if seat:
+		reparent(seat, true)
+		global_transform = seat.global_transform
+	if cam:
+		cam.current = false
+	if vehicle_camera:
+		vehicle_camera.current = true
+
+func exit_vehicle(exit_point: Node3D, vehicle_camera: Camera3D) -> void:
+	_in_vehicle = false
+	freeze = false
+	sleeping = false
+	collision_layer = _vehicle_collision_layer
+	collision_mask = _vehicle_collision_mask
+	if _vehicle_original_parent:
+		reparent(_vehicle_original_parent, true)
+	_vehicle_original_parent = null
+	_flashlight.visible = _light_was_on
+	if _model_root:
+		_model_root.visible = true
+	if exit_point:
+		global_transform = exit_point.global_transform
+	if vehicle_camera:
+		vehicle_camera.current = false
+	if cam:
+		cam.current = true
 			

microservices/CharacterApi/DOCUMENTS.md

@@ -1,27 +1,27 @@
-# CharacterApi document shapes
+# CharacterApi document shapes
-
+
-This service expects JSON request bodies for character creation and stores
+This service expects JSON request bodies for character creation and stores
-character documents in MongoDB.
+character documents in MongoDB.
-
+
-Inbound JSON documents
+Inbound JSON documents
-- CreateCharacterRequest (`POST /api/characters`)
+- CreateCharacterRequest (`POST /api/characters`)
-  ```json
+  ```json
-  {
+  {
-    "name": "string"
+    "name": "string"
-  }
+  }
-  ```
+  ```
-
+
-Stored documents (MongoDB)
+Stored documents (MongoDB)
-- Character
+- Character
-  ```json
+  ```json
-  {
+  {
-    "id": "string (ObjectId)",
+    "id": "string (ObjectId)",
-    "ownerUserId": "string",
+    "ownerUserId": "string",
-    "name": "string",
+    "name": "string",
-    "coord": {
+    "coord": {
-      "x": "number",
+      "x": "number",
-      "y": "number"
+      "y": "number"
-    },
+    },
-    "createdUtc": "string (ISO-8601 datetime)"
+    "createdUtc": "string (ISO-8601 datetime)"
-  }
+  }
-  ```
+  ```

microservices/CharacterApi/Models/Coord.cs

@@ -1,8 +1,8 @@
-namespace CharacterApi.Models;
+namespace CharacterApi.Models;
-
+
-public class Coord
+public class Coord
-{
+{
-    public int X { get; set; }
+    public int X { get; set; }
-
+
-    public int Y { get; set; }
+    public int Y { get; set; }
-}
+}

microservices/LocationsApi/Services/LocationStore.cs

@@ -1,132 +1,132 @@
-using LocationsApi.Models;
+using LocationsApi.Models;
-using MongoDB.Bson;
+using MongoDB.Bson;
-using MongoDB.Driver;
+using MongoDB.Driver;
-
+
-namespace LocationsApi.Services;
+namespace LocationsApi.Services;
-
+
-public class LocationStore
+public class LocationStore
-{
+{
-    private readonly IMongoCollection<Location> _col;
+    private readonly IMongoCollection<Location> _col;
-
+
-    public LocationStore(IConfiguration cfg)
+    public LocationStore(IConfiguration cfg)
-    {
+    {
-        var cs = cfg["MongoDB:ConnectionString"] ?? "mongodb://127.0.0.1:27017";
+        var cs = cfg["MongoDB:ConnectionString"] ?? "mongodb://127.0.0.1:27017";
-        var dbName = cfg["MongoDB:DatabaseName"] ?? "GameDb";
+        var dbName = cfg["MongoDB:DatabaseName"] ?? "GameDb";
-        var client = new MongoClient(cs);
+        var client = new MongoClient(cs);
-        var db = client.GetDatabase(dbName);
+        var db = client.GetDatabase(dbName);
-        var collectionName = "Locations";
+        var collectionName = "Locations";
-        EnsureLocationSchema(db, collectionName);
+        EnsureLocationSchema(db, collectionName);
-        _col = db.GetCollection<Location>(collectionName);
+        _col = db.GetCollection<Location>(collectionName);
-
+
-        var coordIndex = Builders<Location>.IndexKeys
+        var coordIndex = Builders<Location>.IndexKeys
-            .Ascending(l => l.Coord.X)
+            .Ascending(l => l.Coord.X)
-            .Ascending(l => l.Coord.Y);
+            .Ascending(l => l.Coord.Y);
-        var coordIndexOptions = new CreateIndexOptions { Unique = true };
+        var coordIndexOptions = new CreateIndexOptions { Unique = true };
-        _col.Indexes.CreateOne(new CreateIndexModel<Location>(coordIndex, coordIndexOptions));
+        _col.Indexes.CreateOne(new CreateIndexModel<Location>(coordIndex, coordIndexOptions));
-
+
-        EnsureOriginLocation();
+        EnsureOriginLocation();
-    }
+    }
-
+
-    private static void EnsureLocationSchema(IMongoDatabase db, string collectionName)
+    private static void EnsureLocationSchema(IMongoDatabase db, string collectionName)
-    {
+    {
-        var validator = new BsonDocument
+        var validator = new BsonDocument
-        {
+        {
-            {
+            {
-                "$jsonSchema", new BsonDocument
+                "$jsonSchema", new BsonDocument
-                {
+                {
-                    { "bsonType", "object" },
+                    { "bsonType", "object" },
-                    { "required", new BsonArray { "name", "coord", "createdUtc" } },
+                    { "required", new BsonArray { "name", "coord", "createdUtc" } },
-                    {
+                    {
-                        "properties", new BsonDocument
+                        "properties", new BsonDocument
-                        {
+                        {
-                            { "name", new BsonDocument { { "bsonType", "string" } } },
+                            { "name", new BsonDocument { { "bsonType", "string" } } },
-                            {
+                            {
-                                "coord", new BsonDocument
+                                "coord", new BsonDocument
-                                {
+                                {
-                                    { "bsonType", "object" },
+                                    { "bsonType", "object" },
-                                    { "required", new BsonArray { "x", "y" } },
+                                    { "required", new BsonArray { "x", "y" } },
-                                    {
+                                    {
-                                        "properties", new BsonDocument
+                                        "properties", new BsonDocument
-                                        {
+                                        {
-                                            { "x", new BsonDocument { { "bsonType", "int" } } },
+                                            { "x", new BsonDocument { { "bsonType", "int" } } },
-                                            { "y", new BsonDocument { { "bsonType", "int" } } }
+                                            { "y", new BsonDocument { { "bsonType", "int" } } }
-                                        }
+                                        }
-                                    }
+                                    }
-                                }
+                                }
-                            },
+                            },
-                            { "createdUtc", new BsonDocument { { "bsonType", "date" } } }
+                            { "createdUtc", new BsonDocument { { "bsonType", "date" } } }
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-        };
+        };
-
+
-        var collections = db.ListCollectionNames().ToList();
+        var collections = db.ListCollectionNames().ToList();
-        if (!collections.Contains(collectionName))
+        if (!collections.Contains(collectionName))
-        {
+        {
-            var createCommand = new BsonDocument
+            var createCommand = new BsonDocument
-            {
+            {
-                { "create", collectionName },
+                { "create", collectionName },
-                { "validator", validator },
+                { "validator", validator },
-                { "validationAction", "error" }
+                { "validationAction", "error" }
-            };
+            };
-            db.RunCommand<BsonDocument>(createCommand);
+            db.RunCommand<BsonDocument>(createCommand);
-            return;
+            return;
-        }
+        }
-
+
-        var command = new BsonDocument
+        var command = new BsonDocument
-        {
+        {
-            { "collMod", collectionName },
+            { "collMod", collectionName },
-            { "validator", validator },
+            { "validator", validator },
-            { "validationAction", "error" }
+            { "validationAction", "error" }
-        };
+        };
-        db.RunCommand<BsonDocument>(command);
+        db.RunCommand<BsonDocument>(command);
-    }
+    }
-
+
-    public Task CreateAsync(Location location) => _col.InsertOneAsync(location);
+    public Task CreateAsync(Location location) => _col.InsertOneAsync(location);
-
+
-    public Task<List<Location>> GetAllAsync() =>
+    public Task<List<Location>> GetAllAsync() =>
-        _col.Find(Builders<Location>.Filter.Empty).ToListAsync();
+        _col.Find(Builders<Location>.Filter.Empty).ToListAsync();
-
+
-    public async Task<bool> DeleteAsync(string id)
+    public async Task<bool> DeleteAsync(string id)
-    {
+    {
-        var filter = Builders<Location>.Filter.Eq(l => l.Id, id);
+        var filter = Builders<Location>.Filter.Eq(l => l.Id, id);
-        var result = await _col.DeleteOneAsync(filter);
+        var result = await _col.DeleteOneAsync(filter);
-        return result.DeletedCount > 0;
+        return result.DeletedCount > 0;
-    }
+    }
-
+
-    public async Task<bool> UpdateNameAsync(string id, string name)
+    public async Task<bool> UpdateNameAsync(string id, string name)
-    {
+    {
-        var filter = Builders<Location>.Filter.Eq(l => l.Id, id);
+        var filter = Builders<Location>.Filter.Eq(l => l.Id, id);
-        var update = Builders<Location>.Update.Set(l => l.Name, name);
+        var update = Builders<Location>.Update.Set(l => l.Name, name);
-        var result = await _col.UpdateOneAsync(filter, update);
+        var result = await _col.UpdateOneAsync(filter, update);
-        return result.ModifiedCount > 0;
+        return result.ModifiedCount > 0;
-    }
+    }
-
+
-    private void EnsureOriginLocation()
+    private void EnsureOriginLocation()
-    {
+    {
-        var filter = Builders<Location>.Filter.And(
+        var filter = Builders<Location>.Filter.And(
-            Builders<Location>.Filter.Eq(l => l.Coord.X, 0),
+            Builders<Location>.Filter.Eq(l => l.Coord.X, 0),
-            Builders<Location>.Filter.Eq(l => l.Coord.Y, 0)
+            Builders<Location>.Filter.Eq(l => l.Coord.Y, 0)
-        );
+        );
-        var existing = _col.Find(filter).FirstOrDefault();
+        var existing = _col.Find(filter).FirstOrDefault();
-        if (existing is not null)
+        if (existing is not null)
-            return;
+            return;
-
+
-        var origin = new Location
+        var origin = new Location
-        {
+        {
-            Name = "Origin",
+            Name = "Origin",
-            Coord = new Coord { X = 0, Y = 0 },
+            Coord = new Coord { X = 0, Y = 0 },
-            CreatedUtc = DateTime.UtcNow
+            CreatedUtc = DateTime.UtcNow
-        };
+        };
-
+
-        try
+        try
-        {
+        {
-            _col.InsertOne(origin);
+            _col.InsertOne(origin);
-        }
+        }
-        catch (MongoWriteException ex) when (ex.WriteError.Category == ServerErrorCategory.DuplicateKey)
+        catch (MongoWriteException ex) when (ex.WriteError.Category == ServerErrorCategory.DuplicateKey)
-        {
+        {
-            // Another instance seeded it first.
+            // Another instance seeded it first.
-        }
+        }
-    }
+    }
-}
+}