Skip to content

Fix townies walking speed issue #2620 #2809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nickssssss-del wants to merge 1 commit into
base: main
Choose a base branch
from
+105 −18
Open

Fix townies walking speed issue #2620 #2809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 61 additions & 11 deletions scenes/world_map/components/retelling_manager.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,86 @@ extends Node2D
##
## Coordinate an array of townies to join the StoryWeaver at the Eternal Loom
## for listening the retelling.
## Call [member RetellingTownie.go_to_the_loom()] on each townie so they join.
## Call [member EternalLoom.show_retelling_dialogue()] when all townies have joined.
## May call [member RetellingTownie.become_helper()] on one townie (at random).
## Call [member RetellingTownie.leave_the_loom()] on each townie so they leave.
## Call RetellingTownie.go_to_the_loom() on each townie so they join.
## Call EternalLoom.show_retelling_dialogue() when all townies have joined.
## May call RetellingTownie.become_helper() on one townie (at random).
## Call RetellingTownie.leave_the_loom() on each townie so they leave.
Comment on lines -12 to +15

@manuq manuq Aug 31, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please explain why you changed the documentation comments.

@Nickssssss-del Nickssssss-del Sep 1, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! My apologies for that. I slightly modified the format of the comments just to make them easier to read while I was working on the code, but I didn't mean to change them. I'll fix them so they're back to their original version.

@wjt wjt Sep 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I believe both the old and new formats were wrong - based on https://docs.godotengine.org/en/stable/tutorials/scripting/gdscript/gdscript_documentation_comments.html#bbcode-and-class-reference the () should not be included and since these are methods they should be e.g. [method RetellingTownie.go_to_the_loom] rather than [member RetellingTownie.go_to_the_loom()]


## The array of retelling townies in Fray's End.
@export var townies: Array[RetellingTownie] = []

var _waiting_for_townies: Array[RetellingTownie] = []

## The Eternal Loom, for listening to signals and calling
## [member EternalLoom.show_retelling_dialogue()].
## EternalLoom.show_retelling_dialogue().

@manuq manuq Aug 31, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

@onready var eternal_loom: EternalLoom = %EternalLoom


func _ready() -> void:
if Engine.is_editor_hint():
return
eternal_loom.retelling_started.connect(_on_eternal_loom_retelling_started)
eternal_loom.retelling_finished.connect(_on_eternal_loom_retelling_finished)
eternal_loom.give_retelling_upgrade.connect(_on_eternal_loom_give_retelling_upgrade)

eternal_loom.retelling_started.connect(
_on_eternal_loom_retelling_started
)
eternal_loom.retelling_finished.connect(
_on_eternal_loom_retelling_finished
)
eternal_loom.give_retelling_upgrade.connect(
_on_eternal_loom_give_retelling_upgrade
)
Comment on lines -30 to +39

@manuq manuq Aug 31, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change the format here? Check https://github.com/endlessm/threadbare/actions/runs/33290260227/job/99564258513?pr=2809 and please consider installing pre-commit like our Contributing guide mentions.

@Nickssssss-del Nickssssss-del Sep 1, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry.
I thought the code was too densely packed,
and I usually tend to break it up in my classes,
so I didn't think it would affect the design :((
I hadn't checked carefully enough to see that it didn't include the precommit; I've already added it to comply with the rules.



func _on_eternal_loom_retelling_started() -> void:
_waiting_for_townies = townies.duplicate()

var travel_times: Array[float] = []

# Prepare each townie and calculate its travel time.
for t: RetellingTownie in townies:
t.go_to_the_loom()
t.loom_reached.connect(_on_loom_reached.bind(t))
var travel_time: float = t.prepare_walk()
travel_times.append(travel_time)

# The slowest townie determines the target arrival time.
var target_time: float = float(travel_times.max())

print("================================")
print("Tiempo objetivo: ", target_time, " s")
print("================================")

# Start each townie with a delay so they arrive together.
for i in range(townies.size()):
var townie: RetellingTownie = townies[i]
var delay: float = target_time - travel_times[i]

print(
"Townie: ",
townie.name,
" | Retraso: ",
delay,
" s"
)

_start_townie_after_delay(townie, delay)


func _start_townie_after_delay(
townie: RetellingTownie,
delay: float
) -> void:
# Connect before starting the townie so the arrival signal is captured.
if not townie.loom_reached.is_connected(_on_loom_reached.bind(townie)):
townie.loom_reached.connect(_on_loom_reached.bind(townie))

if delay > 0.0:
await get_tree().create_timer(delay).timeout

townie.go_to_the_loom()


func _on_loom_reached(townie: RetellingTownie) -> void:
_waiting_for_townies.erase(townie)

if _waiting_for_townies.size() == 0:
eternal_loom.show_retelling_dialogue()

Expand All @@ -50,6 +98,8 @@ func _on_eternal_loom_retelling_finished() -> void:
t.leave_the_loom()


func _on_eternal_loom_give_retelling_upgrade(type: InventoryItem.ItemType) -> void:
func _on_eternal_loom_give_retelling_upgrade(
type: InventoryItem.ItemType
) -> void:
var t: RetellingTownie = townies.pick_random()
t.become_helper(type)
51 changes: 44 additions & 7 deletions scenes/world_map/components/retelling_townie.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,22 @@ static func reverse_path(path: Path2D) -> Path2D:
var reversed_path := Path2D.new()
var curve := Curve2D.new()
var src := path.curve

for i in range(src.point_count - 1, -1, -1):
curve.add_point(src.get_point_position(i), src.get_point_out(i), src.get_point_in(i))
curve.add_point(
src.get_point_position(i),
src.get_point_out(i),
src.get_point_in(i)
)

reversed_path.curve = curve
return reversed_path


func _ready() -> void:
if Engine.is_editor_hint():
return

hide_townie()


Expand All @@ -48,18 +55,34 @@ func hide_townie() -> void:
townie.process_mode = Node.PROCESS_MODE_DISABLED


## Walk the path to the loom and then emit [member loom_reached].
func go_to_the_loom() -> void:
## Prepare the townie's walking speed and calculate its travel time.
func prepare_walk() -> float:
path_walk_behavior.walking_path = enter_path

# Randomize the speed of each townie, for variation:
# Randomize the speed of each townie.
path_walk_behavior.speeds = CharacterSpeeds.new()
path_walk_behavior.speeds.walk_speed = randf_range(100, 200)
path_walk_behavior.speeds.walk_speed = randf_range(175, 264)

var path_distance: float = enter_path.curve.get_baked_length()
var walk_speed: float = path_walk_behavior.speeds.walk_speed
var travel_time: float = path_distance / walk_speed

print("Townie: ", name)
print("Distancia: ", path_distance, " px")
print("Velocidad: ", walk_speed, " px/s")
print("Tiempo estimado: ", travel_time, " s")

return travel_time


## Walk the path to the loom and then emit loom_reached.
func go_to_the_loom() -> void:
townie.randomize_character()
townie.visible = true
townie.process_mode = Node.PROCESS_MODE_INHERIT

await path_walk_behavior.ending_reached

path_walk_behavior.process_mode = Node.PROCESS_MODE_DISABLED
townie.velocity = Vector2.ZERO
loom_reached.emit()
Expand All @@ -72,16 +95,23 @@ func become_helper(type: InventoryItem.ItemType) -> void:
var closer_path := Path2D.new()
enter_path.add_sibling(closer_path)
closer_path.global_position = enter_path.global_position

var curve := Curve2D.new()
curve.add_point(Vector2.ZERO)

var player := get_tree().get_first_node_in_group("player") as Node2D
_closer_to_player_position = townie.global_position.direction_to(player.global_position) * 100.0
_closer_to_player_position = townie.global_position.direction_to(
player.global_position
) * 100.0

curve.add_point(_closer_to_player_position)
closer_path.curve = curve

path_walk_behavior.walking_path = closer_path
path_walk_behavior.process_mode = Node.PROCESS_MODE_INHERIT

await path_walk_behavior.ending_reached

path_walk_behavior.process_mode = Node.PROCESS_MODE_DISABLED
townie.velocity = Vector2.ZERO

Expand All @@ -94,9 +124,16 @@ func leave_the_loom() -> void:
leave_path.global_position = enter_path.global_position

if _closer_to_player_position:
leave_path.curve.add_point(_closer_to_player_position, Vector2.ZERO, Vector2.ZERO, 0)
leave_path.curve.add_point(
_closer_to_player_position,
Vector2.ZERO,
Vector2.ZERO,
0
)

path_walk_behavior.walking_path = leave_path
path_walk_behavior.process_mode = Node.PROCESS_MODE_INHERIT

await path_walk_behavior.ending_reached

hide_townie()
Loading