Author SHA1 Message Date
admin d39d719c7d Anim fix?
Deploy Promiscuity Auth API / deploy (push) Successful in 46s
Deploy Promiscuity Character API / deploy (push) Successful in 44s
Deploy Promiscuity Locations API / deploy (push) Successful in 45s
k8s smoke test / test (push) Successful in 7s
2026-02-25 19:48:43 -06:00
admin bf1ac4406c A raging quest 2026-02-25 19:46:10 -06:00
deifiedexile 2670392e2d Added animation tree to player model
Deploy Promiscuity Auth API / deploy (push) Successful in 45s
Deploy Promiscuity Character API / deploy (push) Successful in 43s
Deploy Promiscuity Locations API / deploy (push) Successful in 44s
k8s smoke test / test (push) Successful in 7s
2026-02-20 13:48:02 -06:00
null f4ff1308b8 Added hidden card game.
Deploy Promiscuity Auth API / deploy (push) Successful in 46s
Deploy Promiscuity Character API / deploy (push) Successful in 43s
Deploy Promiscuity Locations API / deploy (push) Successful in 46s
k8s smoke test / test (push) Successful in 7s
2026-02-13 12:30:24 -06:00
admin 6dc4d53ba0 Dialog bug fix/tweaks
Deploy Promiscuity Auth API / deploy (push) Successful in 47s
Deploy Promiscuity Character API / deploy (push) Successful in 43s
Deploy Promiscuity Locations API / deploy (push) Successful in 44s
k8s smoke test / test (push) Successful in 7s
2026-02-13 11:55:19 -06:00
admin ba6edd455a Merge pull request 'Adding simple dialog system' (#8) from dialog into main
Deploy Promiscuity Auth API / deploy (push) Successful in 49s
Deploy Promiscuity Character API / deploy (push) Successful in 1m33s
Deploy Promiscuity Locations API / deploy (push) Successful in 1m15s
k8s smoke test / test (push) Successful in 21s
Reviewed-on: #8
2026-02-13 11:44:13 -06:00
admin a66c39e9f8 Adding simple dialog system 2026-02-13 11:41:39 -06:00
admin 6f809c3684 Update README.md
Deploy Promiscuity Auth API / deploy (push) Successful in 45s
Deploy Promiscuity Character API / deploy (push) Successful in 42s
Deploy Promiscuity Locations API / deploy (push) Successful in 46s
k8s smoke test / test (push) Successful in 7s
2026-02-13 11:12:54 -06:00
pillboxstyx 2d27e4254e Merge pull request 'Starting to add a sprint, will figure out how to hook in the run animation next' (#7) from pillboxstyx/addingSprint into main
Deploy Promiscuity Auth API / deploy (push) Successful in 46s
Deploy Promiscuity Character API / deploy (push) Successful in 44s
Deploy Promiscuity Locations API / deploy (push) Successful in 45s
k8s smoke test / test (push) Successful in 7s
Reviewed-on: #7
2026-02-13 02:50:06 -06:00
pillboxstyx b3287ccf6f Starting to add a sprint, will figure out how to hook in the run animation next 2026-02-13 02:48:07 -06:00
42 changed files with 1140 additions and 530 deletions
+1
View File
@@ -15,6 +15,7 @@
## Controls
- Move: WASD
- Jump: Space
- Sprint: Shift
- Interact (enter/exit car): E
- Flashlight: F
- Phone: Tab
Binary file not shown.

After

Width:  |  Height:  |  Size: 519 KiB

+40
View File
@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bstshxshmlfiq"
path="res://.godot/imported/card.webp-99b23fadea1c063dd14bdfc3719125c0.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/images/card.webp"
dest_files=["res://.godot/imported/card.webp-99b23fadea1c063dd14bdfc3719125c0.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
+2
View File
@@ -26,6 +26,8 @@ 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"
DialogSystem="*res://scenes/UI/dialog_system.gd"
QuestManager="*res://scenes/Quests/quest_manager.gd"
[dotnet]
+14
View File
@@ -0,0 +1,14 @@
extends Node2D
@export var card_name: String
@export var card_text: String
@export var card_cost: int
@onready var card_name_node := $CardName
@onready var card_text_node := $CardText
@onready var card_cost_node := $CardCost
func _ready():
card_name_node.text = card_name
card_text_node.text = card_text
card_cost_node.text = str(card_cost)
+1
View File
@@ -0,0 +1 @@
uid://chk06witxlje
+39
View File
@@ -0,0 +1,39 @@
[gd_scene load_steps=3 format=3 uid="uid://cqumma8ibtbsx"]
[ext_resource type="Script" uid="uid://chk06witxlje" path="res://scenes/CardGame/card.gd" id="1_qu2n3"]
[ext_resource type="Texture2D" uid="uid://bstshxshmlfiq" path="res://assets/images/card.webp" id="2_xgndj"]
[node name="Card" type="Node2D"]
script = ExtResource("1_qu2n3")
[node name="CardBackbround" type="Sprite2D" parent="."]
scale = Vector2(0.25, 0.25)
texture = ExtResource("2_xgndj")
[node name="CardName" type="Label" parent="."]
offset_left = -44.0
offset_top = 22.0
offset_right = 47.0
offset_bottom = 45.0
horizontal_alignment = 1
vertical_alignment = 1
[node name="CardText" type="RichTextLabel" parent="."]
offset_left = -75.0
offset_top = 64.0
offset_right = 75.0
offset_bottom = 115.0
text = "Test Text"
horizontal_alignment = 1
vertical_alignment = 1
[node name="CardCost" type="Label" parent="."]
offset_left = -80.0
offset_top = -125.0
offset_right = -45.0
offset_bottom = -89.0
text = "2"
horizontal_alignment = 1
vertical_alignment = 1
[node name="CardImage" type="Sprite2D" parent="."]
+12
View File
@@ -0,0 +1,12 @@
extends Node2D
var card_scene = preload("uid://cqumma8ibtbsx")
func _ready():
var card = card_scene.instantiate()
var size = get_viewport().get_visible_rect().size
card.card_text = "YOOOOOO"
card.card_name = "HAHAHAH"
card.card_cost = 2
card.position = Vector2(size.x / 2, size.y / 2)
add_child(card)
+1
View File
@@ -0,0 +1 @@
uid://btx5q72aali0g
+6
View File
@@ -0,0 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://q4abhlwqdvay"]
[ext_resource type="Script" uid="uid://btx5q72aali0g" path="res://scenes/CardGame/cards.gd" id="1_l08q2"]
[node name="Node2D" type="Node2D"]
script = ExtResource("1_l08q2")
+24 -9
View File
@@ -1,6 +1,7 @@
[gd_scene load_steps=14 format=3]
[ext_resource type="Script" path="res://scenes/Characters/repo_bot.gd" id="1_repo_bot"]
[gd_scene load_steps=14 format=3]
[ext_resource type="Script" path="res://scenes/Characters/repo_bot.gd" id="1_repo_bot"]
[ext_resource type="Script" path="res://scenes/Interaction/dialog_trigger_area.gd" id="2_dialog"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_body"]
albedo_color = Color(0.78, 0.8, 0.82, 1)
@@ -50,9 +51,12 @@ material = SubResource("StandardMaterial3D_body")
size = Vector3(0.26, 0.3, 0.12)
material = SubResource("StandardMaterial3D_accent")
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_body"]
radius = 0.3
height = 1.1
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_body"]
radius = 0.3
height = 1.1
[sub_resource type="SphereShape3D" id="SphereShape3D_interact"]
radius = 1.7
[node name="RepoBot" type="Node3D"]
script = ExtResource("1_repo_bot")
@@ -111,6 +115,17 @@ mesh = SubResource("CylinderMesh_limb")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.12, 0.15, 0)
mesh = SubResource("CylinderMesh_limb")
[node name="Backpack" type="MeshInstance3D" parent="Body"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0.22)
mesh = SubResource("BoxMesh_pack")
[node name="Backpack" type="MeshInstance3D" parent="Body"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0.22)
mesh = SubResource("BoxMesh_pack")
[node name="InteractArea" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 0)
script = ExtResource("2_dialog")
collision_layer = 2
collision_mask = 1
prompt_text = "Press E to talk"
dialog_text = "Repo Bot: Welcome to Promiscuity.\n\nPress E again to close this dialog."
[node name="CollisionShape3D" type="CollisionShape3D" parent="InteractArea"]
shape = SubResource("SphereShape3D_interact")
@@ -0,0 +1,64 @@
extends Area3D
@export var target_group: StringName = &"player"
@export var prompt_text := "Press E to talk"
@export_multiline var dialog_text := ""
@export var auto_popup := false
@export_enum("Every Entry", "Once") var auto_popup_mode := 0
@export var auto_popup_close_on_exit := false
var _has_triggered := false
func _ready() -> void:
collision_layer = 2
collision_mask = 1
body_entered.connect(_on_body_entered)
body_exited.connect(_on_body_exited)
func _exit_tree() -> void:
if not auto_popup and DialogSystem:
DialogSystem.unregister_interactable(self)
func _on_body_entered(body: Node) -> void:
if not (target_group == StringName() or body.is_in_group(target_group)):
return
if auto_popup:
if DialogSystem and DialogSystem.has_method("is_dialog_open") and DialogSystem.is_dialog_open():
if not (DialogSystem.has_method("is_dialog_open_from") and DialogSystem.is_dialog_open_from(self)):
return
if auto_popup_mode == 1 and _has_triggered:
return
_has_triggered = true
if DialogSystem and auto_popup_close_on_exit and DialogSystem.has_method("show_text_from"):
DialogSystem.show_text_from(self, dialog_text)
return
if DialogSystem and DialogSystem.has_method("show_text"):
DialogSystem.show_text(dialog_text)
return
if DialogSystem:
DialogSystem.register_interactable(self)
func _on_body_exited(body: Node) -> void:
if not (target_group == StringName() or body.is_in_group(target_group)):
return
if auto_popup:
if auto_popup_close_on_exit and DialogSystem:
if DialogSystem.has_method("close_if_source"):
DialogSystem.close_if_source(self)
elif DialogSystem.has_method("close_if_text"):
DialogSystem.close_if_text(dialog_text)
return
return
if target_group == StringName() or body.is_in_group(target_group):
DialogSystem.unregister_interactable(self)
func get_dialog_prompt() -> String:
return prompt_text
func get_dialog_text() -> String:
return dialog_text
@@ -0,0 +1 @@
uid://bk53njt7i3kmv
+85
View File
@@ -2,11 +2,46 @@ extends Node3D
@export var day_length := 120.0 # seconds for full rotation
@export var start_light_angle := -90.0
@export var show_spawn_dialog := true
@export_multiline var spawn_dialog_text := "Welcome to Promiscuity.\n\nPress E to close this message."
@export var spawn_dialog_auto_close_seconds := 4.0
var end_light_angle = start_light_angle + 360.0
var start_radians = start_light_angle * PI / 180
var time := 0.0
@onready var sun := $DirectionalLight3D
@onready var _player: Node = $Player
@onready var _quest_text: RichTextLabel = $PhoneUI/Control/PhoneFrame/QuestText
const FIRST_QUEST_ID := "first_drive"
const FIRST_QUEST := {
"id": FIRST_QUEST_ID,
"title": "RepoBot's First Task",
"description": "Get familiar with movement and vehicles.",
"steps": [
{
"id": "enter_vehicle",
"text": "Get in the car (E).",
"complete_event": "entered_vehicle",
},
{
"id": "reach_checkpoint",
"text": "Drive the car into the checkpoint marker.",
"complete_event": "reach_checkpoint",
},
],
}
func _ready() -> void:
_setup_quests()
if show_spawn_dialog and DialogSystem and DialogSystem.has_method("show_text"):
await get_tree().process_frame
DialogSystem.show_text(spawn_dialog_text)
if spawn_dialog_auto_close_seconds > 0.0:
await get_tree().create_timer(spawn_dialog_auto_close_seconds).timeout
if DialogSystem and DialogSystem.has_method("close_if_text"):
DialogSystem.close_if_text(spawn_dialog_text)
_show_quest_intro_dialog()
func _process(delta):
time = fmod((time + delta), day_length)
@@ -20,3 +55,53 @@ func _process(delta):
var curSin = -sin((t * TAU) + start_radians)
var energy = clamp((curSin * 1.0) + 0.2, 0.0, 1.2)
sun.light_energy = energy
func _setup_quests() -> void:
if QuestManager == null:
return
if not QuestManager.has_quest(FIRST_QUEST_ID):
QuestManager.register_quest(FIRST_QUEST)
if not QuestManager.is_active_quest(FIRST_QUEST_ID) and not QuestManager.is_quest_completed(FIRST_QUEST_ID):
QuestManager.start_quest(FIRST_QUEST_ID)
if not QuestManager.is_connected("quest_state_changed", Callable(self, "_refresh_quest_ui")):
QuestManager.quest_state_changed.connect(_refresh_quest_ui)
if _player and _player.has_signal("vehicle_entered"):
if not _player.is_connected("vehicle_entered", Callable(self, "_on_player_vehicle_entered")):
_player.vehicle_entered.connect(_on_player_vehicle_entered)
_refresh_quest_ui()
func _on_player_vehicle_entered(_vehicle: Node) -> void:
if QuestManager:
QuestManager.emit_event(&"entered_vehicle")
func _refresh_quest_ui() -> void:
if _quest_text == null or QuestManager == null:
return
var state: Dictionary = QuestManager.get_active_quest_state()
if not bool(state.get("active", false)):
_quest_text.text = "No active quest."
return
var title := String(state.get("title", "Quest"))
if bool(state.get("completed", false)):
_quest_text.text = "[b]%s[/b]\nComplete." % title
return
var step_index: int = int(state.get("current_step_index", 0))
var total_steps: int = int(state.get("total_steps", 0))
var step_text := String(state.get("current_step_text", ""))
_quest_text.text = "[b]%s[/b]\nStep %d/%d\n%s" % [title, step_index + 1, total_steps, step_text]
func _show_quest_intro_dialog() -> void:
if QuestManager == null:
return
var state: Dictionary = QuestManager.get_active_quest_state()
if not bool(state.get("active", false)) or bool(state.get("completed", false)):
return
var step_text := String(state.get("current_step_text", ""))
if step_text.is_empty():
return
if DialogSystem and DialogSystem.has_method("show_text"):
DialogSystem.show_text("RepoBot: New task assigned.\n\n%s" % step_text)
+260 -128
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=18 format=3 uid="uid://dchj6g2i8ebph"]
[gd_scene load_steps=65 format=3 uid="uid://dchj6g2i8ebph"]
[ext_resource type="Script" uid="uid://brgmxhhhtakja" path="res://scenes/Levels/level.gd" id="1_a4mo8"]
[ext_resource type="PackedScene" uid="uid://bb6hj6l23043x" path="res://assets/models/human.blend" id="1_eg4yq"]
@@ -6,8 +6,10 @@
[ext_resource type="PackedScene" uid="uid://c5of6aaxop1hl" path="res://scenes/block.tscn" id="2_tc7dm"]
[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"]
[ext_resource type="PackedScene" uid="uid://bnqaqbgynoyys" path="res://assets/models/TestCharAnimated.glb" id="5_fi66n"]
[ext_resource type="Script" uid="uid://bk53njt7i3kmv" path="res://scenes/Interaction/dialog_trigger_area.gd" id="6_dialog"]
[ext_resource type="Script" path="res://scenes/Quests/quest_trigger_area.gd" id="7_qtrigger"]
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_2q6dc"]
bounce = 0.5
@@ -21,21 +23,205 @@ bounce = 0.5
[sub_resource type="SphereShape3D" id="SphereShape3D_mx8sn"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_he7fi"]
animation = &"Idle"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_42npc"]
animation = &"Idle"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_neck2"]
animation = &"Idle"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_bg4jh"]
animation = &"Idle"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_43ksg"]
animation = &"Jump"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_loupo"]
animation = &"Jump"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_1meta"]
animation = &"LStrafe"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_i35yb"]
animation = &"LStrafeWalk"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_18iqp"]
animation = &"LTurn"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_px5jg"]
animation = &"LTurn90"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_f2oql"]
animation = &"RStrafe"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_8hdhy"]
animation = &"RStrafe"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_8ydj0"]
animation = &"RStrafeWalk"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ol8dr"]
animation = &"RTurn"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_eorea"]
animation = &"RTurn90"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_mwo3k"]
animation = &"Run"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_j43p6"]
animation = &"Run"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_7qd4n"]
animation = &"Walk"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_5wdrc"]
animation = &"Walk"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_k13o0"]
animation = &"Walk"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_pqisa"]
animation = &"Walk"
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_5qdlo"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_hwpvo"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_2jvac"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_m443h"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ccri0"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_aqwus"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_tknc3"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ygago"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_koxac"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_0pp6t"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_3xa5y"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_8m234"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_jnqa2"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_vwq6c"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_e2sp2"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_r45s2"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_p7els"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_elh2a"]
advance_mode = 2
[sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_bwsrl"]
states/End/position = Vector2(664, 130)
states/Idle/node = SubResource("AnimationNodeAnimation_bg4jh")
states/Idle/position = Vector2(318, 57)
"states/Idle 2/node" = SubResource("AnimationNodeAnimation_he7fi")
"states/Idle 2/position" = Vector2(397, 105)
"states/Idle 3/node" = SubResource("AnimationNodeAnimation_42npc")
"states/Idle 3/position" = Vector2(312, 279)
"states/Idle 4/node" = SubResource("AnimationNodeAnimation_neck2")
"states/Idle 4/position" = Vector2(437, 356)
states/Jump/node = SubResource("AnimationNodeAnimation_loupo")
states/Jump/position = Vector2(282, 356)
"states/Jump 2/node" = SubResource("AnimationNodeAnimation_43ksg")
"states/Jump 2/position" = Vector2(421, 287)
states/LStrafe/node = SubResource("AnimationNodeAnimation_1meta")
states/LStrafe/position = Vector2(1401, 100)
states/LStrafeWalk/node = SubResource("AnimationNodeAnimation_i35yb")
states/LStrafeWalk/position = Vector2(1346, 175)
states/LTurn/node = SubResource("AnimationNodeAnimation_18iqp")
states/LTurn/position = Vector2(1516, 83)
states/LTurn90/node = SubResource("AnimationNodeAnimation_px5jg")
states/LTurn90/position = Vector2(1550, 208)
states/RStrafe/node = SubResource("AnimationNodeAnimation_8hdhy")
states/RStrafe/position = Vector2(856, 161)
"states/RStrafe 2/node" = SubResource("AnimationNodeAnimation_f2oql")
"states/RStrafe 2/position" = Vector2(956, 208)
states/RStrafeWalk/node = SubResource("AnimationNodeAnimation_8ydj0")
states/RStrafeWalk/position = Vector2(1181, 155)
states/RTurn/node = SubResource("AnimationNodeAnimation_ol8dr")
states/RTurn/position = Vector2(1065, 162)
states/RTurn90/node = SubResource("AnimationNodeAnimation_eorea")
states/RTurn90/position = Vector2(1218, 92)
states/Run/node = SubResource("AnimationNodeAnimation_j43p6")
states/Run/position = Vector2(293, 225)
"states/Run 2/node" = SubResource("AnimationNodeAnimation_mwo3k")
"states/Run 2/position" = Vector2(421, 161)
states/Start/position = Vector2(156, 121)
states/Walk/node = SubResource("AnimationNodeAnimation_pqisa")
states/Walk/position = Vector2(414, 57)
"states/Walk 2/node" = SubResource("AnimationNodeAnimation_7qd4n")
"states/Walk 2/position" = Vector2(303, 111)
"states/Walk 3/node" = SubResource("AnimationNodeAnimation_5wdrc")
"states/Walk 3/position" = Vector2(312, 175)
"states/Walk 4/node" = SubResource("AnimationNodeAnimation_k13o0")
"states/Walk 4/position" = Vector2(421, 219)
transitions = ["Idle", "Walk", SubResource("AnimationNodeStateMachineTransition_5qdlo"), "Walk 2", "Idle 2", SubResource("AnimationNodeStateMachineTransition_hwpvo"), "Walk 3", "Run 2", SubResource("AnimationNodeStateMachineTransition_2jvac"), "Run", "Walk 4", SubResource("AnimationNodeStateMachineTransition_m443h"), "Start", "Idle", SubResource("AnimationNodeStateMachineTransition_ccri0"), "Start", "Walk 2", SubResource("AnimationNodeStateMachineTransition_aqwus"), "Start", "Walk 3", SubResource("AnimationNodeStateMachineTransition_tknc3"), "Start", "Run", SubResource("AnimationNodeStateMachineTransition_ygago"), "Idle 3", "Jump 2", SubResource("AnimationNodeStateMachineTransition_koxac"), "Jump", "Idle 4", SubResource("AnimationNodeStateMachineTransition_0pp6t"), "Start", "Jump", SubResource("AnimationNodeStateMachineTransition_3xa5y"), "Start", "Idle 3", SubResource("AnimationNodeStateMachineTransition_8m234"), "Walk", "End", SubResource("AnimationNodeStateMachineTransition_jnqa2"), "Idle 2", "End", SubResource("AnimationNodeStateMachineTransition_vwq6c"), "Run 2", "End", SubResource("AnimationNodeStateMachineTransition_e2sp2"), "Walk 4", "End", SubResource("AnimationNodeStateMachineTransition_r45s2"), "Jump 2", "End", SubResource("AnimationNodeStateMachineTransition_p7els"), "Idle 4", "End", SubResource("AnimationNodeStateMachineTransition_elh2a")]
[sub_resource type="SphereShape3D" id="SphereShape3D_dialog_zone"]
radius = 2.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dialog_zone"]
transparency = 1
cull_mode = 2
shading_mode = 0
albedo_color = Color(0.2, 0.8, 0.35, 0.18)
[sub_resource type="SphereMesh" id="SphereMesh_dialog_zone"]
material = SubResource("StandardMaterial3D_dialog_zone")
radius = 2.5
height = 5.0
[sub_resource type="SphereShape3D" id="SphereShape3D_checkpoint"]
radius = 3.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_checkpoint"]
transparency = 1
cull_mode = 2
shading_mode = 0
albedo_color = Color(1, 0.804, 0.204, 0.2)
[sub_resource type="SphereMesh" id="SphereMesh_checkpoint"]
material = SubResource("StandardMaterial3D_checkpoint")
radius = 3.0
height = 6.0
[sub_resource type="BoxShape3D" id="BoxShape3D_2q6dc"]
size = Vector3(1080, 2, 1080)
[sub_resource type="BoxMesh" id="BoxMesh_w7c3h"]
size = Vector3(1080, 2, 1080)
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_fi66n"]
[sub_resource type="Sky" id="Sky_a4mo8"]
sky_material = SubResource("ProceduralSkyMaterial_fi66n")
[sub_resource type="Environment" id="Environment_a4mo8"]
background_mode = 2
sky = SubResource("Sky_a4mo8")
ambient_light_source = 3
[node name="Node3D" type="Node3D"]
script = ExtResource("1_a4mo8")
@@ -62,6 +248,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
mesh = SubResource("SphereMesh_w7c3h")
[node name="Player" type="RigidBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.6563287, 0, 0)
physics_material_override = SubResource("PhysicsMaterial_w8frs")
script = ExtResource("1_muv8p")
camera_path = NodePath("Camera3D")
@@ -70,124 +257,6 @@ phone_path = NodePath("../PhoneUI")
[node name="TestCharAnimated" parent="Player" instance=ExtResource("5_fi66n")]
transform = Transform3D(-0.9998549, 0, 0.01703362, 0, 1, 0, -0.01703362, 0, -0.9998549, 0, 0, 0)
[node name="Skeleton3D" parent="Player/TestCharAnimated/Armature" index="0"]
bones/0/position = Vector3(0.0026170756, -0.0012418391, -0.98996276)
bones/0/rotation = Quaternion(-0.7278173, -0.05346041, 0.012412205, 0.6835714)
bones/1/position = Vector3(8.593209e-06, 0.09923458, -0.012273359)
bones/1/rotation = Quaternion(-0.031655744, 0.011362745, 0.022744056, 0.9991754)
bones/2/position = Vector3(-2.2989244e-10, 0.117319785, 2.9730852e-08)
bones/2/rotation = Quaternion(0.010291794, 0.001169461, 0.013815534, 0.9998509)
bones/3/position = Vector3(-2.3358266e-09, 0.13458829, -1.382244e-08)
bones/3/rotation = Quaternion(0.067557335, 0.0021622085, 0.013776206, 0.99761796)
bones/4/position = Vector3(2.508626e-07, 0.15027755, 0.008779066)
bones/4/rotation = Quaternion(0.051882792, -0.00090027065, 0.0039363643, 0.998645)
bones/5/position = Vector3(2.152588e-08, 0.103218146, 0.03142428)
bones/5/rotation = Quaternion(-0.06595954, 0.011917545, -0.0014885183, 0.99775004)
bones/6/position = Vector3(1.5477327e-06, 0.18474667, 0.06636399)
bones/7/position = Vector3(0.061058242, 0.09106279, 0.0075706206)
bones/7/rotation = Quaternion(-0.5982132, -0.43452233, 0.50765175, -0.4422909)
bones/8/position = Vector3(1.1842036e-08, 0.12922287, 5.2578955e-08)
bones/8/rotation = Quaternion(0.5434686, 0.18407291, 0.20301422, 0.7934383)
bones/9/position = Vector3(1.5054144e-07, 0.2740467, 2.2048344e-08)
bones/9/rotation = Quaternion(-5.192343e-09, -1.1239315e-06, 0.01273731, 0.99991894)
bones/10/position = Vector3(1.9432857e-08, 0.27614468, 9.6609995e-08)
bones/10/rotation = Quaternion(0.048323337, -0.28487536, 0.026756868, 0.9569718)
bones/11/position = Vector3(-0.030029751, 0.037888147, 0.021671427)
bones/11/rotation = Quaternion(0.2098604, -0.059559863, 0.20750383, 0.9536002)
bones/12/position = Vector3(-3.3527822e-08, 0.0474497, -1.48403245e-08)
bones/12/rotation = Quaternion(-0.14269812, 0.08661232, -0.24053419, 0.9561793)
bones/13/position = Vector3(-9.313215e-09, 0.043821093, 1.7813335e-08)
bones/13/rotation = Quaternion(-0.121022485, -0.07554186, 0.024044419, 0.98947906)
bones/14/position = Vector3(-4.847594e-08, 0.034590863, -5.3379924e-08)
bones/15/position = Vector3(-0.02822038, 0.12266627, 0.0023182186)
bones/15/rotation = Quaternion(0.06621808, 0.00073213095, 0.008435749, 0.99776924)
bones/16/position = Vector3(-8.136956e-09, 0.03891963, -1.4837047e-08)
bones/16/rotation = Quaternion(0.1509963, 7.805282e-07, -0.015479834, 0.98841316)
bones/17/position = Vector3(7.499967e-09, 0.034151517, -5.4443618e-08)
bones/17/rotation = Quaternion(0.070082076, 7.71772e-07, -0.007181638, 0.99751544)
bones/18/position = Vector3(2.700483e-09, 0.030779874, 4.9589467e-08)
bones/19/position = Vector3(-1.2452401e-07, 0.12775533, -8.01722e-08)
bones/19/rotation = Quaternion(0.13653132, -0.0038339633, -0.022952663, 0.9903624)
bones/20/position = Vector3(2.5990463e-09, 0.036139663, 1.713758e-10)
bones/20/rotation = Quaternion(0.15125485, 1.1823237e-06, -0.015500045, 0.9883733)
bones/21/position = Vector3(2.9034163e-07, 0.034597658, -3.6051716e-08)
bones/21/rotation = Quaternion(0.1599333, 1.4124467e-06, -0.016389191, 0.98699176)
bones/22/position = Vector3(-3.0519334e-07, 0.03680197, -9.1170705e-08)
bones/23/position = Vector3(0.022166358, 0.12147022, -9.993157e-05)
bones/23/rotation = Quaternion(0.18325116, -0.004651328, -0.031451236, 0.9825519)
bones/24/position = Vector3(4.5585904e-09, 0.036011815, -8.07135e-09)
bones/24/rotation = Quaternion(0.18138836, 1.5675009e-06, -0.018595627, 0.9832358)
bones/25/position = Vector3(-9.647604e-09, 0.033073086, -1.46341534e-08)
bones/25/rotation = Quaternion(0.1552087, 2.2643005e-06, -0.015905593, 0.9877537)
bones/26/position = Vector3(-2.434721e-07, 0.03660111, 2.471306e-07)
bones/27/position = Vector3(0.04725836, 0.109081924, 0.0022613404)
bones/27/rotation = Quaternion(0.23387046, -0.0035344863, -0.048872076, 0.97103226)
bones/28/position = Vector3(4.3135207e-09, 0.041366525, 3.569472e-08)
bones/28/rotation = Quaternion(0.15124865, 1.4340599e-05, -0.015863812, 0.98836845)
bones/29/position = Vector3(1.195453e-08, 0.02594832, 1.5542597e-08)
bones/29/rotation = Quaternion(0.14350323, 3.322942e-05, -0.014478063, 0.98954403)
bones/30/position = Vector3(-2.4944999e-08, 0.029238665, 6.2325825e-08)
bones/31/position = Vector3(-0.06105696, 0.09106397, 0.007570758)
bones/31/rotation = Quaternion(0.60009927, -0.4346891, 0.52418536, 0.4197095)
bones/32/position = Vector3(2.116817e-08, 0.12922288, 7.016769e-08)
bones/32/rotation = Quaternion(0.46432823, -0.26300937, -0.23269261, 0.813068)
bones/33/position = Vector3(-2.350565e-08, 0.27404687, 1.5161348e-08)
bones/33/rotation = Quaternion(7.667138e-08, -5.0620065e-06, -0.058376648, 0.99829465)
bones/34/position = Vector3(1.3629875e-07, 0.27614468, -9.158248e-09)
bones/34/rotation = Quaternion(0.059040155, 0.17509013, -0.005968382, 0.9827626)
bones/35/position = Vector3(0.030029776, 0.03788806, 0.021671649)
bones/35/rotation = Quaternion(0.21378386, 0.065372065, -0.22564878, 0.94821185)
bones/36/position = Vector3(-2.7939748e-09, 0.04744962, -1.7240383e-08)
bones/36/rotation = Quaternion(-0.14410053, -0.076146945, 0.2772088, 0.9468854)
bones/37/position = Vector3(5.58785e-09, 0.04382136, 3.566345e-08)
bones/37/rotation = Quaternion(-0.1552004, 0.07467698, -0.026057797, 0.9847117)
bones/38/position = Vector3(8.2187e-08, 0.034590647, -2.4929412e-07)
bones/39/position = Vector3(0.028220426, 0.1226661, 0.0023184721)
bones/39/rotation = Quaternion(0.059513006, -0.0009918809, -0.010980465, 0.99816674)
bones/40/position = Vector3(-1.1795999e-08, 0.038919587, -4.9162594e-09)
bones/40/rotation = Quaternion(0.15128906, 2.1640317e-06, 0.012328284, 0.98841274)
bones/41/position = Vector3(-1.4053852e-07, 0.034151636, -1.1118345e-08)
bones/41/rotation = Quaternion(0.07021882, 5.966413e-07, 0.0057199914, 0.9975152)
bones/42/position = Vector3(-7.1266735e-09, 0.030779934, 3.7720538e-10)
bones/43/position = Vector3(1.69263e-07, 0.12775521, 2.5128352e-07)
bones/43/rotation = Quaternion(0.13051407, 0.003691554, 0.018921439, 0.99125904)
bones/44/position = Vector3(4.8907918e-09, 0.036139727, -8.499214e-09)
bones/44/rotation = Quaternion(0.15154669, 1.6962191e-06, 0.012345144, 0.988373)
bones/45/position = Vector3(-2.8403383e-07, 0.03459763, -4.4995545e-09)
bones/45/rotation = Quaternion(0.16023898, 1.233635e-06, 0.013053549, 0.98699194)
bones/46/position = Vector3(2.8485744e-07, 0.03680191, -9.493007e-09)
bones/47/position = Vector3(-0.022166327, 0.12146996, -9.982591e-05)
bones/47/rotation = Quaternion(0.1774532, 0.0045050457, 0.02645378, 0.98376334)
bones/48/position = Vector3(4.6136024e-09, 0.036011953, 3.056637e-08)
bones/48/rotation = Quaternion(0.18173504, 1.8501213e-06, 0.014812392, 0.98323596)
bones/49/position = Vector3(-3.407626e-08, 0.033073153, 1.8664657e-08)
bones/49/rotation = Quaternion(0.15551038, 3.26233e-07, 0.012668259, 0.98775303)
bones/50/position = Vector3(2.3113911e-07, 0.03660121, -1.1142021e-08)
bones/51/position = Vector3(-0.047258336, 0.109081805, 0.0022614468)
bones/51/rotation = Quaternion(0.22849467, 0.003407588, 0.042977322, 0.97259015)
bones/52/position = Vector3(-1.5261804e-08, 0.041366428, -1.9607107e-09)
bones/52/rotation = Quaternion(0.1515478, 7.4422354e-07, 0.01235583, 0.98837274)
bones/53/position = Vector3(1.4340932e-08, 0.025948457, 3.3946527e-08)
bones/53/rotation = Quaternion(0.14377311, 5.8452275e-07, 0.011701506, 0.98954153)
bones/54/position = Vector3(4.750415e-09, 0.029238641, -1.2388978e-09)
bones/55/position = Vector3(0.09123873, -0.06657194, -0.0005540352)
bones/55/rotation = Quaternion(0.13601132, 0.07838244, 0.9844897, -0.07834015)
bones/56/position = Vector3(-1.3288446e-09, 0.40599436, 1.0443015e-08)
bones/56/rotation = Quaternion(-0.13252214, -0.014519276, 0.03215593, 0.99055195)
bones/57/position = Vector3(5.707578e-09, 0.42099008, -1.5425995e-08)
bones/57/rotation = Quaternion(0.5344839, -0.021701135, -0.027458949, 0.8444537)
bones/58/position = Vector3(-6.5650525e-09, 0.15721555, -2.6694579e-08)
bones/58/rotation = Quaternion(0.2693438, -0.032380052, -0.014592491, 0.96238893)
bones/59/position = Vector3(2.4854705e-08, 0.09999996, -3.1755625e-09)
bones/60/position = Vector3(-0.091250315, -0.066556, -0.0005535231)
bones/60/rotation = Quaternion(-0.09026457, -0.016758345, 0.9954146, -0.026857648)
bones/61/position = Vector3(1.3129254e-08, 0.40599442, 3.8557886e-09)
bones/61/rotation = Quaternion(-0.07401098, 0.084030755, -0.024547135, 0.99340767)
bones/62/position = Vector3(-7.3885964e-10, 0.42099023, -5.226429e-09)
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")
@@ -199,8 +268,53 @@ fov = 49.0
[node name="SpotLight3D" type="SpotLight3D" parent="Player"]
[node name="AnimationTree" type="AnimationTree" parent="Player"]
root_node = NodePath("../TestCharAnimated")
tree_root = SubResource("AnimationNodeStateMachine_bwsrl")
anim_player = NodePath("../TestCharAnimated/AnimationPlayer")
[node name="Car" parent="." instance=ExtResource("5_car")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6, 0, -3)
[node name="DialogZone" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 0, -2.5)
script = ExtResource("6_dialog")
prompt_text = "Press E to inspect area"
dialog_text = "Dialog trigger area"
[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogZone"]
shape = SubResource("SphereShape3D_dialog_zone")
[node name="Visual" type="MeshInstance3D" parent="DialogZone"]
mesh = SubResource("SphereMesh_dialog_zone")
[node name="AutoDialogZone" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 0, -6.5)
script = ExtResource("6_dialog")
dialog_text = "Auto dialog trigger"
auto_popup = true
auto_popup_close_on_exit = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="AutoDialogZone"]
shape = SubResource("SphereShape3D_dialog_zone")
[node name="Visual" type="MeshInstance3D" parent="AutoDialogZone"]
transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0)
mesh = SubResource("SphereMesh_dialog_zone")
[node name="QuestCheckpoint" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9, 0, -10)
script = ExtResource("7_qtrigger")
event_name = &"reach_checkpoint"
target_group = &"vehicle"
quest_id_filter = "first_drive"
[node name="CollisionShape3D" type="CollisionShape3D" parent="QuestCheckpoint"]
shape = SubResource("SphereShape3D_checkpoint")
[node name="Visual" type="MeshInstance3D" parent="QuestCheckpoint"]
mesh = SubResource("SphereMesh_checkpoint")
[node name="Ground" type="StaticBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
@@ -291,6 +405,24 @@ grow_horizontal = 2
grow_vertical = 2
color = Color(0.08, 0.08, 0.1, 1)
[node name="QuestTitle" type="Label" parent="PhoneUI/Control/PhoneFrame"]
layout_mode = 0
offset_left = 18.0
offset_top = 18.0
offset_right = 150.0
offset_bottom = 41.0
text = "Quest Log"
[node name="QuestText" type="RichTextLabel" parent="PhoneUI/Control/PhoneFrame"]
layout_mode = 0
offset_left = 18.0
offset_top = 52.0
offset_right = 344.0
offset_bottom = 613.0
bbcode_enabled = true
scroll_active = false
text = "No active quest."
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_a4mo8")
+158
View File
@@ -0,0 +1,158 @@
extends Node
signal quest_registered(quest_id: StringName)
signal quest_started(quest_id: StringName)
signal quest_step_advanced(quest_id: StringName, step_index: int, step_text: String)
signal quest_completed(quest_id: StringName)
signal quest_state_changed
var _quests: Dictionary = {}
var _active_quest_id: StringName = &""
var _active_step_index: int = -1
var _completed_quests: Dictionary = {}
func register_quest(definition: Dictionary) -> bool:
var raw_id := String(definition.get("id", "")).strip_edges()
if raw_id.is_empty():
push_warning("Quest definition is missing an id.")
return false
var quest_id: StringName = StringName(raw_id)
if _quests.has(quest_id):
return true
var raw_steps: Variant = definition.get("steps", [])
if typeof(raw_steps) != TYPE_ARRAY:
push_warning("Quest '%s' has invalid steps." % raw_id)
return false
var normalized_steps: Array[Dictionary] = []
var idx := 0
for raw_step in raw_steps:
if typeof(raw_step) != TYPE_DICTIONARY:
continue
var step_dict: Dictionary = raw_step
var step := step_dict.duplicate(true)
step["id"] = String(step.get("id", "step_%d" % idx)).strip_edges()
step["text"] = String(step.get("text", "")).strip_edges()
step["complete_event"] = StringName(String(step.get("complete_event", "")).strip_edges())
normalized_steps.append(step)
idx += 1
if normalized_steps.is_empty():
push_warning("Quest '%s' has no usable steps." % raw_id)
return false
var quest := definition.duplicate(true)
quest["id"] = raw_id
quest["title"] = String(definition.get("title", raw_id))
quest["description"] = String(definition.get("description", ""))
quest["steps"] = normalized_steps
_quests[quest_id] = quest
quest_registered.emit(quest_id)
quest_state_changed.emit()
return true
func has_quest(quest_id: String) -> bool:
return _quests.has(StringName(quest_id))
func start_quest(quest_id: String) -> bool:
var id := StringName(quest_id)
if not _quests.has(id):
push_warning("Cannot start missing quest '%s'." % quest_id)
return false
_active_quest_id = id
_active_step_index = 0
quest_started.emit(_active_quest_id)
var step := _get_active_step()
if not step.is_empty():
quest_step_advanced.emit(_active_quest_id, _active_step_index, String(step.get("text", "")))
quest_state_changed.emit()
return true
func emit_event(event_name: StringName, payload: Dictionary = {}) -> void:
if event_name == StringName():
return
if _active_quest_id == StringName():
return
if is_quest_completed(String(_active_quest_id)):
return
var active_step := _get_active_step()
if active_step.is_empty():
return
var expected: StringName = active_step.get("complete_event", StringName())
if expected != event_name:
return
_advance_active_step(payload)
func is_quest_completed(quest_id: String) -> bool:
return bool(_completed_quests.get(StringName(quest_id), false))
func is_active_quest(quest_id: String) -> bool:
return _active_quest_id == StringName(quest_id)
func get_active_quest_id() -> StringName:
return _active_quest_id
func get_active_quest_state() -> Dictionary:
if _active_quest_id == StringName() or not _quests.has(_active_quest_id):
return {
"active": false,
}
var quest: Dictionary = _quests[_active_quest_id]
var steps: Array = quest.get("steps", [])
var completed: bool = is_quest_completed(String(_active_quest_id))
var step_text := ""
var step_id := ""
if not completed and _active_step_index >= 0 and _active_step_index < steps.size():
var step: Dictionary = steps[_active_step_index]
step_text = String(step.get("text", ""))
step_id = String(step.get("id", ""))
return {
"active": true,
"quest_id": String(_active_quest_id),
"title": String(quest.get("title", "")),
"description": String(quest.get("description", "")),
"current_step_index": _active_step_index,
"total_steps": steps.size(),
"current_step_id": step_id,
"current_step_text": step_text,
"completed": completed,
}
func _get_active_step() -> Dictionary:
if _active_quest_id == StringName():
return {}
if not _quests.has(_active_quest_id):
return {}
var quest: Dictionary = _quests[_active_quest_id]
var steps: Array = quest.get("steps", [])
if _active_step_index < 0 or _active_step_index >= steps.size():
return {}
return steps[_active_step_index]
func _advance_active_step(_payload: Dictionary) -> void:
if _active_quest_id == StringName():
return
var quest: Dictionary = _quests.get(_active_quest_id, {})
var steps: Array = quest.get("steps", [])
_active_step_index += 1
if _active_step_index >= steps.size():
_completed_quests[_active_quest_id] = true
quest_completed.emit(_active_quest_id)
quest_state_changed.emit()
return
var step: Dictionary = steps[_active_step_index]
quest_step_advanced.emit(_active_quest_id, _active_step_index, String(step.get("text", "")))
quest_state_changed.emit()
+1
View File
@@ -0,0 +1 @@
uid://b80hb20j8plpj
+37
View File
@@ -0,0 +1,37 @@
extends Area3D
@export var event_name: StringName = &""
@export var target_group: StringName = &"player"
@export var quest_id_filter: String = ""
@export var one_shot: bool = true
var _triggered := false
func _ready() -> void:
body_entered.connect(_on_body_entered)
func reset_trigger() -> void:
_triggered = false
set_deferred("monitoring", true)
func _on_body_entered(body: Node) -> void:
if one_shot and _triggered:
return
if target_group != StringName() and not body.is_in_group(target_group):
return
if event_name == StringName():
return
if quest_id_filter.strip_edges() != "":
if QuestManager == null or QuestManager.get_active_quest_id() != StringName(quest_id_filter):
return
if QuestManager:
QuestManager.emit_event(event_name, {
"body": body,
"source": self,
})
if one_shot:
_triggered = true
set_deferred("monitoring", false)
@@ -0,0 +1 @@
uid://cshtdpjp4xy2f
+170
View File
@@ -0,0 +1,170 @@
extends CanvasLayer
var _interactables: Array[Node] = []
var _active_interactable: Node = null
var _dialog_visible := false
var _dialog_source: Node = null
var _prompt_label: Label
var _dialog_panel: PanelContainer
var _dialog_label: RichTextLabel
func _ready() -> void:
layer = 50
process_mode = Node.PROCESS_MODE_ALWAYS
_setup_ui()
_set_dialog_visible(false)
_update_prompt_visibility()
func _process(_delta: float) -> void:
if Input.is_action_just_pressed("interact"):
if _dialog_visible:
_set_dialog_visible(false)
return
if _active_interactable != null:
_open_dialog_for(_active_interactable)
func register_interactable(interactable: Node) -> void:
if interactable == null:
return
if _interactables.has(interactable):
return
_interactables.append(interactable)
_refresh_active_interactable()
func unregister_interactable(interactable: Node) -> void:
if interactable == null:
return
_interactables.erase(interactable)
_refresh_active_interactable()
func _refresh_active_interactable() -> void:
while _interactables.size() > 0 and not is_instance_valid(_interactables[_interactables.size() - 1]):
_interactables.pop_back()
_active_interactable = _interactables[_interactables.size() - 1] if _interactables.size() > 0 else null
_update_prompt_visibility()
func _open_dialog_for(interactable: Node) -> void:
if _dialog_label:
_dialog_label.text = _get_dialog_text(interactable)
_dialog_source = interactable
_set_dialog_visible(true)
func show_text(text: String) -> void:
if _dialog_label:
_dialog_label.text = text
_dialog_source = null
_set_dialog_visible(true)
func show_text_from(source: Node, text: String) -> void:
if _dialog_label:
_dialog_label.text = text
_dialog_source = source
_set_dialog_visible(true)
func close_if_text(expected_text: String) -> void:
if not _dialog_visible:
return
if _dialog_label == null:
return
if _dialog_label.text != expected_text:
return
_set_dialog_visible(false)
func is_dialog_open() -> bool:
return _dialog_visible
func is_dialog_open_from(source: Node) -> bool:
return _dialog_visible and _dialog_source == source
func close_if_source(source: Node) -> void:
if not _dialog_visible:
return
if _dialog_source != source:
return
_set_dialog_visible(false)
func _set_dialog_visible(dialog_open: bool) -> void:
_dialog_visible = dialog_open
if not _dialog_visible:
_dialog_source = null
if _dialog_panel:
_dialog_panel.visible = _dialog_visible
_update_prompt_visibility()
func _update_prompt_visibility() -> void:
if _prompt_label == null:
return
var has_active := _active_interactable != null
_prompt_label.visible = has_active and not _dialog_visible
if _prompt_label.visible:
_prompt_label.text = _get_prompt_text(_active_interactable)
func _get_prompt_text(interactable: Node) -> String:
if interactable == null:
return ""
if interactable.has_method("get_dialog_prompt"):
return String(interactable.call("get_dialog_prompt"))
return "Press E to interact"
func _get_dialog_text(interactable: Node) -> String:
if interactable == null:
return ""
if interactable.has_method("get_dialog_text"):
return String(interactable.call("get_dialog_text"))
return "..."
func _setup_ui() -> void:
var root := Control.new()
root.name = "DialogRoot"
root.set_anchors_preset(Control.PRESET_FULL_RECT)
root.mouse_filter = Control.MOUSE_FILTER_IGNORE
add_child(root)
_prompt_label = Label.new()
_prompt_label.name = "PromptLabel"
_prompt_label.set_anchors_preset(Control.PRESET_CENTER_BOTTOM)
_prompt_label.offset_left = -140.0
_prompt_label.offset_top = -64.0
_prompt_label.offset_right = 140.0
_prompt_label.offset_bottom = -36.0
_prompt_label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
_prompt_label.mouse_filter = Control.MOUSE_FILTER_IGNORE
_prompt_label.text = "Press E to interact"
root.add_child(_prompt_label)
_dialog_panel = PanelContainer.new()
_dialog_panel.name = "DialogPanel"
_dialog_panel.visible = false
_dialog_panel.set_anchors_preset(Control.PRESET_CENTER_BOTTOM)
_dialog_panel.offset_left = -300.0
_dialog_panel.offset_top = -220.0
_dialog_panel.offset_right = 300.0
_dialog_panel.offset_bottom = -80.0
_dialog_panel.mouse_filter = Control.MOUSE_FILTER_IGNORE
root.add_child(_dialog_panel)
_dialog_label = RichTextLabel.new()
_dialog_label.name = "DialogText"
_dialog_label.custom_minimum_size = Vector2(560.0, 120.0)
_dialog_label.fit_content = true
_dialog_label.scroll_active = false
_dialog_label.bbcode_enabled = true
_dialog_label.text = ""
_dialog_panel.add_child(_dialog_label)
+1
View File
@@ -0,0 +1 @@
uid://be24usagr8kml
+3
View File
@@ -64,3 +64,6 @@ func _update_login_button() -> void:
_login_button.text = "LOG OUT"
else:
_login_button.text = "LOG IN"
func _on_secret_button_pressed():
get_tree().change_scene_to_file("uid://q4abhlwqdvay")
+9
View File
@@ -90,6 +90,14 @@ size_flags_vertical = 4
theme = ExtResource("1_tx5wa")
text = "QUIT"
[node name="SecretButton" type="Button" parent="."]
show_behind_parent = true
layout_mode = 0
offset_left = 840.0
offset_top = 142.0
offset_right = 856.0
offset_bottom = 159.0
[node name="LogoutRequest" type="HTTPRequest" parent="."]
unique_name_in_owner = true
@@ -97,4 +105,5 @@ unique_name_in_owner = true
[connection signal="pressed" from="MarginContainer/CenterContainer/ContentVBox/VBoxContainer/StartButton" to="." method="_on_start_button_pressed"]
[connection signal="pressed" from="MarginContainer/CenterContainer/ContentVBox/VBoxContainer/SettingsButton" to="." method="_on_settings_button_pressed"]
[connection signal="pressed" from="MarginContainer/CenterContainer/ContentVBox/VBoxContainer/QuitButton" to="." method="_on_quit_button_pressed"]
[connection signal="pressed" from="SecretButton" to="." method="_on_secret_button_pressed"]
[connection signal="request_completed" from="LogoutRequest" to="." method="_on_logout_request_completed"]
+1
View File
@@ -22,6 +22,7 @@ var _nearby_driver: Node = null
var _driver: Node = null
func _ready() -> void:
add_to_group("vehicle")
if interact_area:
interact_area.collision_layer = 2
interact_area.collision_mask = 1
+139 -120
View File
@@ -1,25 +1,27 @@
extends RigidBody3D
# Initially I used a CharacterBody3D, however, I wanted the player to bounce off
# other objects in the environment and that would have required manual handling
# of collisions. So that's why we're using a RigidBody3D instead.
const MOVE_SPEED := 8.0
const ACCELLERATION := 30.0
const DECELLERATION := 40.0
const JUMP_SPEED := 4.0
const MAX_NUMBER_OF_JUMPS := 2
const MIN_FOV := 10
const MAX_FOV := 180
const ZOOM_FACTOR := 1.1 # Zoom out when >1, in when < 1
var mouse_sensitivity := 0.005
var rotation_x := 0.0
var rotation_y := 0.0
var cameraMoveMode := false
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)
extends RigidBody3D
# Initially I used a CharacterBody3D, however, I wanted the player to bounce off
# other objects in the environment and that would have required manual handling
# of collisions. So that's why we're using a RigidBody3D instead.
signal vehicle_entered(vehicle: Node)
signal vehicle_exited(vehicle: Node)
const MOVE_SPEED := 8.0
const SPRINT_MOVE_SPEED :=13
const ACCELLERATION := 30.0
const DECELLERATION := 40.0
const JUMP_SPEED := 4.0
const MAX_NUMBER_OF_JUMPS := 2
const MIN_FOV := 10
const MAX_FOV := 180
const ZOOM_FACTOR := 1.1 # Zoom out when >1, in when < 1
var mouse_sensitivity := 0.005
var rotation_x := 0.0
var rotation_y := 0.0
var cameraMoveMode := false
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_yaw := 0.0
var _camera_pitch := 0.0
@@ -31,46 +33,52 @@ 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 _anim_tree: AnimationTree = find_child("AnimationTree", true, false) as AnimationTree
@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_run_name := "Run"
@export var anim_walk_speed_threshold := 0.25
@export var anim_sprint_speed_threshold := 10.0
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
@export var phone_path: NodePath
@onready var phone: CanvasLayer = get_node(phone_path) if phone_path != NodePath("") else null
var phone_visible := false
@export var camera_path: NodePath
@onready var cam: Camera3D = get_node(camera_path) if camera_path != NodePath("") else null
@export var phone_path: NodePath
@onready var phone: CanvasLayer = get_node(phone_path) if phone_path != NodePath("") else null
var phone_visible := false
func _ready() -> void:
axis_lock_angular_x = true
axis_lock_angular_z = true
angular_damp = 6.0
contact_monitor = true
max_contacts_reported = 4
add_child(audio_player)
audio_player.stream = jump_sound
audio_player.volume_db = -20
add_to_group("player")
if _anim_tree:
_anim_tree.active = false
axis_lock_angular_x = true
axis_lock_angular_z = true
angular_damp = 6.0
contact_monitor = true
max_contacts_reported = 4
add_child(audio_player)
audio_player.stream = jump_sound
audio_player.volume_db = -20
if cam:
_camera_offset_local = cam.transform.origin
_camera_pitch = cam.rotation.x
_camera_yaw = global_transform.basis.get_euler().y
cam.set_as_top_level(true)
cam.global_position = global_position + (Basis(Vector3.UP, _camera_yaw) * _camera_offset_local)
cam.global_rotation = Vector3(_camera_pitch, _camera_yaw, 0.0)
var move_basis := cam.global_transform.basis if cam else global_transform.basis
var forward := move_basis.z
var right := move_basis.x
forward.y = 0.0
right.y = 0.0
if forward.length() > 0.0001:
_last_move_forward = forward.normalized()
_camera_offset_local = cam.transform.origin
_camera_pitch = cam.rotation.x
_camera_yaw = global_transform.basis.get_euler().y
cam.set_as_top_level(true)
cam.global_position = global_position + (Basis(Vector3.UP, _camera_yaw) * _camera_offset_local)
cam.global_rotation = Vector3(_camera_pitch, _camera_yaw, 0.0)
var move_basis := cam.global_transform.basis if cam else global_transform.basis
var forward := move_basis.z
var right := move_basis.x
forward.y = 0.0
right.y = 0.0
if forward.length() > 0.0001:
_last_move_forward = forward.normalized()
if right.length() > 0.0001:
_last_move_right = right.normalized()
_vehicle_collision_layer = collision_layer
@@ -81,56 +89,56 @@ func _integrate_forces(state):
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
_camera_pitch = rotation_x
rotation.y = rotation_y
_pending_mouse_delta = Vector2.ZERO
# Input as 2D vector
var input2v := Input.get_vector("ui_left", "ui_right", "ui_up", "ui_down")
if Input.is_action_just_pressed("player_phone"):
phone_visible = !phone_visible
if phone:
phone.visible = phone_visible
# Camera based movement
var forward := Vector3.FORWARD * -1.0
var right := Vector3.RIGHT
if cam:
forward = cam.global_transform.basis.z
right = cam.global_transform.basis.x
# Project onto ground plane so looking up/down doesn't kill movement.
forward.y = 0.0
right.y = 0.0
if forward.length() > 0.0001:
forward = forward.normalized()
_last_move_forward = forward
else:
forward = _last_move_forward
if right.length() > 0.0001:
right = right.normalized()
_last_move_right = right
else:
right = _last_move_right
var dir := (right * input2v.x + forward * input2v.y).normalized()
var target_v := dir * MOVE_SPEED
var ax := ACCELLERATION if dir != Vector3.ZERO else DECELLERATION
linear_velocity.x = move_toward(linear_velocity.x, target_v.x, ax * state.step)
linear_velocity.z = move_toward(linear_velocity.z, target_v.z, ax * state.step)
# Jump Logic
var on_floor = false
for i in state.get_contact_count():
var normal = state.get_contact_local_normal(i)
if normal.y > 0.5:
on_floor = true
break
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
_camera_pitch = rotation_x
rotation.y = rotation_y
_pending_mouse_delta = Vector2.ZERO
# Input as 2D vector
var input2v := Input.get_vector("ui_left", "ui_right", "ui_up", "ui_down")
# Camera based movement
var forward := Vector3.FORWARD * -1.0
var right := Vector3.RIGHT
if cam:
forward = cam.global_transform.basis.z
right = cam.global_transform.basis.x
# Project onto ground plane so looking up/down doesn't kill movement.
forward.y = 0.0
right.y = 0.0
if forward.length() > 0.0001:
forward = forward.normalized()
_last_move_forward = forward
else:
forward = _last_move_forward
if right.length() > 0.0001:
right = right.normalized()
_last_move_right = right
else:
right = _last_move_right
var dir := (right * input2v.x + forward * input2v.y).normalized()
var target_v := dir * MOVE_SPEED
# Sprinting
if Input.is_key_pressed(KEY_SHIFT):
target_v = dir * SPRINT_MOVE_SPEED
var ax := ACCELLERATION if dir != Vector3.ZERO else DECELLERATION
linear_velocity.x = move_toward(linear_velocity.x, target_v.x, ax * state.step)
linear_velocity.z = move_toward(linear_velocity.z, target_v.z, ax * state.step)
# Jump Logic
var on_floor = false
for i in state.get_contact_count():
var normal = state.get_contact_local_normal(i)
if normal.y > 0.5:
on_floor = true
break
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
linear_velocity.y = JUMP_SPEED
@@ -147,31 +155,37 @@ func _integrate_forces(state):
_update_animation(on_floor, state.linear_velocity)
_jump_triggered = false
func _input(event):
if event.is_action_pressed("player_phone"):
phone_visible = !phone_visible
if phone:
phone.visible = phone_visible
return
if _in_vehicle:
return
if event is InputEventMouseButton:
if event.button_index == MOUSE_BUTTON_MIDDLE:
if event.pressed:
cameraMoveMode = true
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
else:
cameraMoveMode = false
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
if event is InputEventMouseMotion and cameraMoveMode:
_pending_mouse_delta += event.relative
if event is InputEventMouseButton and event.pressed:
if event.button_index == MOUSE_BUTTON_WHEEL_UP:
zoom_camera(1.0 / ZOOM_FACTOR) # Zoom in
elif event.button_index == MOUSE_BUTTON_WHEEL_DOWN:
zoom_camera(ZOOM_FACTOR) # Zoom out
if event.button_index == MOUSE_BUTTON_MIDDLE:
if event.pressed:
cameraMoveMode = true
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
else:
cameraMoveMode = false
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
if event is InputEventMouseMotion and cameraMoveMode:
_pending_mouse_delta += event.relative
if event is InputEventMouseButton and event.pressed:
if event.button_index == MOUSE_BUTTON_WHEEL_UP:
zoom_camera(1.0 / ZOOM_FACTOR) # Zoom in
elif event.button_index == MOUSE_BUTTON_WHEEL_DOWN:
zoom_camera(ZOOM_FACTOR) # Zoom out
if event.is_action_pressed("player_light"):
_flashlight.visible = !_flashlight.visible
func zoom_camera(factor):
var new_fov = cam.fov * factor
cam.fov = clamp(new_fov, MIN_FOV, MAX_FOV)
@@ -188,6 +202,10 @@ func _update_animation(on_floor: bool, velocity: Vector3) -> void:
if _anim_player.current_animation != anim_jump_name:
_anim_player.play(anim_jump_name)
return
if on_floor and horizontal_speed > anim_sprint_speed_threshold and _anim_player.has_animation(anim_run_name):
if _anim_player.current_animation != anim_run_name:
_anim_player.play(anim_run_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)
@@ -214,6 +232,7 @@ func enter_vehicle(_vehicle: Node, seat: Node3D, vehicle_camera: Camera3D) -> vo
cam.current = false
if vehicle_camera:
vehicle_camera.current = true
vehicle_entered.emit(_vehicle)
func exit_vehicle(exit_point: Node3D, vehicle_camera: Camera3D) -> void:
_in_vehicle = false
@@ -233,4 +252,4 @@ func exit_vehicle(exit_point: Node3D, vehicle_camera: Camera3D) -> void:
vehicle_camera.current = false
if cam:
cam.current = true
vehicle_exited.emit(null)
@@ -8,16 +8,14 @@ namespace CharacterApi.Controllers;
[ApiController]
[Route("api/[controller]")]
public class CharactersController : ControllerBase
{
private readonly CharacterStore _characters;
private readonly LocationsClient _locations;
public CharactersController(CharacterStore characters, LocationsClient locations)
{
_characters = characters;
_locations = locations;
}
public class CharactersController : ControllerBase
{
private readonly CharacterStore _characters;
public CharactersController(CharacterStore characters)
{
_characters = characters;
}
[HttpPost]
[Authorize(Roles = "USER,SUPER")]
@@ -56,52 +54,17 @@ public class CharactersController : ControllerBase
[HttpDelete("{id}")]
[Authorize(Roles = "USER,SUPER")]
public async Task<IActionResult> Delete(string id)
{
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
if (string.IsNullOrWhiteSpace(userId))
return Unauthorized();
public async Task<IActionResult> Delete(string id)
{
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
if (string.IsNullOrWhiteSpace(userId))
return Unauthorized();
var allowAnyOwner = User.IsInRole("SUPER");
var deleted = await _characters.DeleteForOwnerAsync(id, userId, allowAnyOwner);
if (!deleted)
return NotFound();
return Ok("Deleted");
}
[HttpPut("{id}/move")]
[Authorize(Roles = "USER,SUPER")]
public async Task<IActionResult> Move(string id, [FromBody] MoveCharacterRequest req, CancellationToken ct)
{
if (req?.Coord is null)
return BadRequest("Coord required");
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
if (string.IsNullOrWhiteSpace(userId))
return Unauthorized();
var allowAnyOwner = User.IsInRole("SUPER");
var existing = await _characters.GetForOwnerByIdAsync(id, userId, allowAnyOwner);
if (existing is null)
return NotFound();
var presence = await _locations.UpdatePresenceAsync(id, req.Coord, ct);
if (!presence.Ok)
{
var message = string.IsNullOrWhiteSpace(presence.Body)
? "Location presence update failed"
: presence.Body;
return StatusCode((int)presence.Status, message);
}
var updated = await _characters.UpdateCoordAsync(id, userId, allowAnyOwner, req.Coord);
if (!updated)
{
await _locations.UpdatePresenceAsync(id, existing.Coord, ct);
return StatusCode(500, "Failed to update character coord");
}
return Ok("Moved");
}
}
return Ok("Deleted");
}
}
+6 -15
View File
@@ -4,21 +4,12 @@ This service expects JSON request bodies for character creation and stores
character documents in MongoDB.
Inbound JSON documents
- CreateCharacterRequest (`POST /api/characters`)
```json
{
"name": "string"
}
```
- MoveCharacterRequest (`PUT /api/characters/{id}/move`)
```json
{
"coord": {
"x": 0,
"y": 0
}
}
```
- CreateCharacterRequest (`POST /api/characters`)
```json
{
"name": "string"
}
```
Stored documents (MongoDB)
- Character
@@ -1,6 +0,0 @@
namespace CharacterApi.Models;
public class MoveCharacterRequest
{
public Coord? Coord { get; set; }
}
+4 -9
View File
@@ -5,15 +5,10 @@ using Microsoft.OpenApi.Models;
using System.Text;
var builder = WebApplication.CreateBuilder(args);
builder.Services.AddControllers();
// DI
builder.Services.AddSingleton<CharacterStore>();
builder.Services.AddHttpClient<LocationsClient>(client =>
{
var baseUrl = builder.Configuration["LocationsApi:BaseUrl"] ?? "http://localhost:5002";
client.BaseAddress = new Uri(baseUrl);
});
builder.Services.AddControllers();
// DI
builder.Services.AddSingleton<CharacterStore>();
// Swagger + JWT auth in Swagger
builder.Services.AddEndpointsApiExplorer();
-1
View File
@@ -7,4 +7,3 @@ See `DOCUMENTS.md` for request payloads and stored document shapes.
- `POST /api/characters` Create a character.
- `GET /api/characters` List characters for the current user.
- `DELETE /api/characters/{id}` Delete a character owned by the current user.
- `PUT /api/characters/{id}/move` Move a character to a new coord.
@@ -21,44 +21,14 @@ public class CharacterStore
public Task CreateAsync(Character character) => _col.InsertOneAsync(character);
public Task<List<Character>> GetForOwnerAsync(string ownerUserId) =>
_col.Find(c => c.OwnerUserId == ownerUserId).ToListAsync();
public async Task<Character?> GetForOwnerByIdAsync(string id, string ownerUserId, bool allowAnyOwner)
{
var filter = Builders<Character>.Filter.Eq(c => c.Id, id);
if (!allowAnyOwner)
{
filter = Builders<Character>.Filter.And(
filter,
Builders<Character>.Filter.Eq(c => c.OwnerUserId, ownerUserId)
);
}
return await _col.Find(filter).FirstOrDefaultAsync();
}
public async Task<bool> UpdateCoordAsync(string id, string ownerUserId, bool allowAnyOwner, Coord coord)
{
var filter = Builders<Character>.Filter.Eq(c => c.Id, id);
if (!allowAnyOwner)
{
filter = Builders<Character>.Filter.And(
filter,
Builders<Character>.Filter.Eq(c => c.OwnerUserId, ownerUserId)
);
}
var update = Builders<Character>.Update.Set(c => c.Coord, coord);
var result = await _col.UpdateOneAsync(filter, update);
return result.ModifiedCount > 0;
}
public async Task<bool> DeleteForOwnerAsync(string id, string ownerUserId, bool allowAnyOwner)
{
var filter = Builders<Character>.Filter.Eq(c => c.Id, id);
if (!allowAnyOwner)
{
public Task<List<Character>> GetForOwnerAsync(string ownerUserId) =>
_col.Find(c => c.OwnerUserId == ownerUserId).ToListAsync();
public async Task<bool> DeleteForOwnerAsync(string id, string ownerUserId, bool allowAnyOwner)
{
var filter = Builders<Character>.Filter.Eq(c => c.Id, id);
if (!allowAnyOwner)
{
filter = Builders<Character>.Filter.And(
filter,
Builders<Character>.Filter.Eq(c => c.OwnerUserId, ownerUserId)
@@ -1,35 +0,0 @@
using CharacterApi.Models;
using System.Net;
using System.Net.Http.Json;
namespace CharacterApi.Services;
public class LocationsClient
{
private readonly HttpClient _http;
private readonly string _internalKey;
public LocationsClient(HttpClient http, IConfiguration cfg)
{
_http = http;
_internalKey = cfg["LocationsApi:InternalKey"] ?? string.Empty;
}
public async Task<(bool Ok, HttpStatusCode Status, string? Body)> UpdatePresenceAsync(
string characterId,
Coord coord,
CancellationToken ct = default)
{
using var request = new HttpRequestMessage(HttpMethod.Post, "api/locations/presence")
{
Content = JsonContent.Create(new { characterId, coord })
};
if (!string.IsNullOrWhiteSpace(_internalKey))
request.Headers.TryAddWithoutValidation("X-Internal-Key", _internalKey);
using var response = await _http.SendAsync(request, ct);
var body = await response.Content.ReadAsStringAsync(ct);
return (response.IsSuccessStatusCode, response.StatusCode, body);
}
}
@@ -1,7 +1,6 @@
{
"Kestrel": { "Endpoints": { "Http": { "Url": "http://0.0.0.0:5001" } } },
"MongoDB": { "ConnectionString": "mongodb://192.168.86.50:27017", "DatabaseName": "promiscuity" },
"LocationsApi": { "BaseUrl": "http://localhost:5002", "InternalKey": "dev-internal-key" },
"Jwt": { "Key": "SuperUltraSecureJwtKeyWithAtLeast32Chars!!", "Issuer": "promiscuity", "Audience": "promiscuity-auth-api" },
"Kestrel": { "Endpoints": { "Http": { "Url": "http://0.0.0.0:5001" } } },
"MongoDB": { "ConnectionString": "mongodb://192.168.86.50:27017", "DatabaseName": "promiscuity" },
"Jwt": { "Key": "SuperUltraSecureJwtKeyWithAtLeast32Chars!!", "Issuer": "promiscuity", "Audience": "promiscuity-auth-api" },
"Logging": { "LogLevel": { "Default": "Information" } }
}
+3 -4
View File
@@ -1,8 +1,7 @@
{
"Kestrel": { "Endpoints": { "Http": { "Url": "http://0.0.0.0:5001" } } },
"MongoDB": { "ConnectionString": "mongodb://192.168.86.50:27017", "DatabaseName": "promiscuity" },
"LocationsApi": { "BaseUrl": "http://localhost:5002", "InternalKey": "dev-internal-key" },
"Jwt": { "Key": "SuperUltraSecureJwtKeyWithAtLeast32Chars!!", "Issuer": "promiscuity", "Audience": "promiscuity-auth-api" },
"Kestrel": { "Endpoints": { "Http": { "Url": "http://0.0.0.0:5001" } } },
"MongoDB": { "ConnectionString": "mongodb://192.168.86.50:27017", "DatabaseName": "promiscuity" },
"Jwt": { "Key": "SuperUltraSecureJwtKeyWithAtLeast32Chars!!", "Issuer": "promiscuity", "Audience": "promiscuity-auth-api" },
"Logging": { "LogLevel": { "Default": "Information" } },
"AllowedHosts": "*"
}
@@ -11,12 +11,10 @@ namespace LocationsApi.Controllers;
public class LocationsController : ControllerBase
{
private readonly LocationStore _locations;
private readonly IConfiguration _cfg;
public LocationsController(LocationStore locations, IConfiguration cfg)
public LocationsController(LocationStore locations)
{
_locations = locations;
_cfg = cfg;
}
[HttpPost]
@@ -33,7 +31,6 @@ public class LocationsController : ControllerBase
{
Name = req.Name.Trim(),
Coord = req.Coord,
CharacterIds = new List<string>(),
CreatedUtc = DateTime.UtcNow
};
@@ -88,28 +85,4 @@ public class LocationsController : ControllerBase
return Ok("Updated");
}
[HttpPost("presence")]
[AllowAnonymous]
public async Task<IActionResult> UpdatePresence([FromBody] UpdateLocationPresenceRequest req)
{
var internalKey = _cfg["Internal:Key"];
if (!string.IsNullOrWhiteSpace(internalKey))
{
if (!Request.Headers.TryGetValue("X-Internal-Key", out var provided) || provided != internalKey)
return Unauthorized();
}
if (string.IsNullOrWhiteSpace(req.CharacterId))
return BadRequest("CharacterId required");
if (req.Coord is null)
return BadRequest("Coord required");
var updated = await _locations.UpdatePresenceAsync(req.CharacterId.Trim(), req.Coord);
if (!updated)
return NotFound("Location not found");
return Ok("Updated");
}
}
-11
View File
@@ -21,16 +21,6 @@ Inbound JSON documents
}
```
`coord` cannot be updated.
- UpdateLocationPresenceRequest (`POST /api/locations/presence`)
```json
{
"characterId": "string",
"coord": {
"x": 0,
"y": 0
}
}
```
Stored documents (MongoDB)
- Location
@@ -42,7 +32,6 @@ Stored documents (MongoDB)
"x": 0,
"y": 0
},
"characterIds": ["string"],
"createdUtc": "string (ISO-8601 datetime)"
}
```
@@ -15,9 +15,6 @@ public class Location
[BsonElement("coord")]
public required Coord Coord { get; set; }
[BsonElement("characterIds")]
public List<string> CharacterIds { get; set; } = new();
[BsonElement("createdUtc")]
public DateTime CreatedUtc { get; set; } = DateTime.UtcNow;
}
@@ -1,8 +0,0 @@
namespace LocationsApi.Models;
public class UpdateLocationPresenceRequest
{
public string CharacterId { get; set; } = string.Empty;
public Coord? Coord { get; set; }
}
-1
View File
@@ -8,4 +8,3 @@ See `DOCUMENTS.md` for request payloads and stored document shapes.
- `GET /api/locations` List all locations (SUPER only).
- `DELETE /api/locations/{id}` Delete a location (SUPER only).
- `PUT /api/locations/{id}` Update a location name (SUPER only).
- `POST /api/locations/presence` Update which characters are present at a coord (internal).
@@ -34,13 +34,13 @@ public class LocationStore
{
"$jsonSchema", new BsonDocument
{
{ "bsonType", "object" },
{ "required", new BsonArray { "name", "coord", "createdUtc" } },
{
"properties", new BsonDocument
{
{ "name", new BsonDocument { { "bsonType", "string" } } },
{
{ "bsonType", "object" },
{ "required", new BsonArray { "name", "coord", "createdUtc" } },
{
"properties", new BsonDocument
{
{ "name", new BsonDocument { { "bsonType", "string" } } },
{
"coord", new BsonDocument
{
{ "bsonType", "object" },
@@ -51,21 +51,14 @@ public class LocationStore
{ "x", new BsonDocument { { "bsonType", "int" } } },
{ "y", new BsonDocument { { "bsonType", "int" } } }
}
}
}
},
{
"characterIds", new BsonDocument
{
{ "bsonType", "array" },
{ "items", new BsonDocument { { "bsonType", "string" } } }
}
},
{ "createdUtc", new BsonDocument { { "bsonType", "date" } } }
}
}
}
}
}
}
},
{ "createdUtc", new BsonDocument { { "bsonType", "date" } } }
}
}
}
}
};
var collections = db.ListCollectionNames().ToList();
@@ -102,31 +95,13 @@ public class LocationStore
return result.DeletedCount > 0;
}
public async Task<bool> UpdateNameAsync(string id, string name)
{
var filter = Builders<Location>.Filter.Eq(l => l.Id, id);
var update = Builders<Location>.Update.Set(l => l.Name, name);
var result = await _col.UpdateOneAsync(filter, update);
return result.ModifiedCount > 0;
}
public async Task<bool> UpdatePresenceAsync(string characterId, Coord coord)
{
if (string.IsNullOrWhiteSpace(characterId))
return false;
var pullFilter = Builders<Location>.Filter.AnyEq(l => l.CharacterIds, characterId);
var pullUpdate = Builders<Location>.Update.Pull(l => l.CharacterIds, characterId);
await _col.UpdateManyAsync(pullFilter, pullUpdate);
var targetFilter = Builders<Location>.Filter.And(
Builders<Location>.Filter.Eq(l => l.Coord.X, coord.X),
Builders<Location>.Filter.Eq(l => l.Coord.Y, coord.Y)
);
var addUpdate = Builders<Location>.Update.AddToSet(l => l.CharacterIds, characterId);
var result = await _col.UpdateOneAsync(targetFilter, addUpdate);
return result.MatchedCount > 0;
}
public async Task<bool> UpdateNameAsync(string id, string name)
{
var filter = Builders<Location>.Filter.Eq(l => l.Id, id);
var update = Builders<Location>.Update.Set(l => l.Name, name);
var result = await _col.UpdateOneAsync(filter, update);
return result.ModifiedCount > 0;
}
private void EnsureOriginLocation()
{
@@ -138,13 +113,12 @@ public class LocationStore
if (existing is not null)
return;
var origin = new Location
{
Name = "Origin",
Coord = new Coord { X = 0, Y = 0 },
CharacterIds = new List<string>(),
CreatedUtc = DateTime.UtcNow
};
var origin = new Location
{
Name = "Origin",
Coord = new Coord { X = 0, Y = 0 },
CreatedUtc = DateTime.UtcNow
};
try
{
@@ -1,7 +1,6 @@
{
"Kestrel": { "Endpoints": { "Http": { "Url": "http://0.0.0.0:5002" } } },
"MongoDB": { "ConnectionString": "mongodb://192.168.86.50:27017", "DatabaseName": "promiscuity" },
"Internal": { "Key": "dev-internal-key" },
"Jwt": { "Key": "SuperUltraSecureJwtKeyWithAtLeast32Chars!!", "Issuer": "promiscuity", "Audience": "promiscuity-auth-api" },
"Logging": { "LogLevel": { "Default": "Information" } }
}
@@ -1,7 +1,6 @@
{
"Kestrel": { "Endpoints": { "Http": { "Url": "http://0.0.0.0:5002" } } },
"MongoDB": { "ConnectionString": "mongodb://192.168.86.50:27017", "DatabaseName": "promiscuity" },
"Internal": { "Key": "dev-internal-key" },
"Jwt": { "Key": "SuperUltraSecureJwtKeyWithAtLeast32Chars!!", "Issuer": "promiscuity", "Audience": "promiscuity-auth-api" },
"Logging": { "LogLevel": { "Default": "Information" } },
"AllowedHosts": "*"