betalars
/
frame-of-mind
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: player animation track path fix

This commit is contained in:
tiger tiger tiger 2026-01-24 10:57:55 +01:00
parent 1dca96614e
commit dc9a06e375
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base-environments/youth_room/youth_room.tscn
View File

@ -402,7 +402,7 @@ id = 1
[node name="PlayerController" parent="logic" groups=["camera_owner"] instance=ExtResource("3_foj4y")] [node name="PlayerController" parent="logic" groups=["camera_owner"] instance=ExtResource("3_foj4y")]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(0.686123, 0, 0.727485, 0, 1, 0, -0.727485, 0, 0.686123, 0.63, 0, 0.925) transform = Transform3D(0.686123, 0, 0.727485, 0, 1, 0, -0.727485, 0, 0.686123, 0.5654894, 0, 0.8411364)
[node name="Yaw" parent="logic/PlayerController" index="1"] [node name="Yaw" parent="logic/PlayerController" index="1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.25, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.25, 0)

11
src/logic-scenes/board/card-board.gd
View File

@ -154,15 +154,22 @@ func _finalize_board_state() -> void:
print("CardBoard: Board state finalized") print("CardBoard: Board state finalized")
func _ensure_unique(items: Array[StringName]) -> Array[StringName]:
var result : Array[StringName] = []
for item in items:
if item not in result and item not in all_names: result.append(item)
else: push_warning("card-board.gd: ", "discarding non-unique item ", item)
return result
## Spawn Cards and Post-Its ## Spawn Cards and Post-Its
# TODO: rename to "add to board" # TODO: rename to "add to board"
func populate_board(names: Array[StringName]): func populate_board(names: Array[StringName]):
mementos_collected += 1 mementos_collected += 1
for item in names: names = _ensure_unique(names)
assert(name not in all_names, "Tried to re-add card %s" % item)
var all_new:Dictionary = HardCards.get_cards_by_name_array(names) var all_new:Dictionary = HardCards.get_cards_by_name_array(names)
all_names.append_array(all_new.keys())
for new_card: Card in all_new["cards"]: for new_card: Card in all_new["cards"]:
add_card(new_card) add_card(new_card)

18
src/logic-scenes/player_controller/player_controller.tscn
View File

@ -35,7 +35,7 @@ length = 0.001
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/path = NodePath("Mount:position") tracks/0/path = NodePath("Yaw:position")
tracks/0/interp = 1 tracks/0/interp = 1
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/keys = { tracks/0/keys = {
@ -147,7 +147,7 @@ length = 2.0
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/path = NodePath("Mount:position") tracks/0/path = NodePath("Yaw:position")
tracks/0/interp = 2 tracks/0/interp = 2
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/keys = { tracks/0/keys = {
@ -210,7 +210,7 @@ resource_name = "fast_crouch"
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/path = NodePath("Mount:position") tracks/0/path = NodePath("Yaw:position")
tracks/0/interp = 2 tracks/0/interp = 2
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/keys = { tracks/0/keys = {
@ -274,7 +274,7 @@ length = 1.2
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/path = NodePath("Mount:position") tracks/0/path = NodePath("Yaw:position")
tracks/0/interp = 2 tracks/0/interp = 2
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/keys = { tracks/0/keys = {
@ -338,7 +338,7 @@ length = 2.0
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/path = NodePath("Mount:position") tracks/0/path = NodePath("Yaw:position")
tracks/0/interp = 2 tracks/0/interp = 2
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/keys = { tracks/0/keys = {
@ -438,7 +438,7 @@ length = 2.0
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/path = NodePath("Mount:position") tracks/0/path = NodePath("Yaw:position")
tracks/0/interp = 2 tracks/0/interp = 2
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/keys = { tracks/0/keys = {
@ -538,7 +538,7 @@ length = 2.5
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/path = NodePath("Mount:position") tracks/0/path = NodePath("Yaw:position")
tracks/0/interp = 2 tracks/0/interp = 2
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/keys = { tracks/0/keys = {
@ -629,10 +629,10 @@ gi_mode = 2
mesh = SubResource("CapsuleMesh_x6v75") mesh = SubResource("CapsuleMesh_x6v75")
[node name="Yaw" type="Node3D" parent="."] [node name="Yaw" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.22534, 0)
[node name="Pitch" type="Node3D" parent="Yaw"] [node name="Pitch" type="Node3D" parent="Yaw"]
transform = Transform3D(1, 0, 0, 0, 0.9999993, 0, 0, 0, 0.9999993, 0, 0, 0) transform = Transform3D(1, 0, 0, 0, 0.642787, -0.766044, 0, 0.766044, 0.642787, 0, 0, 0)
[node name="Mount" type="Node3D" parent="Yaw/Pitch"] [node name="Mount" type="Node3D" parent="Yaw/Pitch"]