diff --git a/src/base-environments/transition/code/dolly.gd b/src/base-environments/transition/code/dolly.gd index 35213a89..cac65c39 100644 --- a/src/base-environments/transition/code/dolly.gd +++ b/src/base-environments/transition/code/dolly.gd @@ -54,7 +54,7 @@ func _ready() -> void: func set_line(line: StringName): subway.set_line(line) - + ## One arrival and departure func cycle() -> void: await arrive() diff --git a/src/base-environments/transition/code/station.gd b/src/base-environments/transition/code/station.gd index df10f386..8c2e2ba1 100644 --- a/src/base-environments/transition/code/station.gd +++ b/src/base-environments/transition/code/station.gd @@ -5,4 +5,4 @@ class_name Station @export var train_labels : Dictionary[StringName,String] = {} func get_label(line: StringName, next_stop: Station) -> String: - return train_labels.get(line+next_stop.name, line+next_stop.name) \ No newline at end of file + return train_labels.get(line+next_stop.name, line+next_stop.name) diff --git a/src/base-environments/transition/code/subway_train.gd b/src/base-environments/transition/code/subway_train.gd index e1a8637d..f737e308 100644 --- a/src/base-environments/transition/code/subway_train.gd +++ b/src/base-environments/transition/code/subway_train.gd @@ -19,4 +19,3 @@ func set_line(line : StringName): $TrainModel/traun_hull.material_overlay = materials[line] $TrainModel/LineLabelBack.text = line.to_upper() $TrainModel/LineLabelFront.text = line.to_upper() - diff --git a/src/dev-util/room.gd b/src/dev-util/room.gd index b782c399..5159fee7 100644 --- a/src/dev-util/room.gd +++ b/src/dev-util/room.gd @@ -46,10 +46,10 @@ func start_room_async(): func play() -> String: for i in range(20): await get_tree().process_frame #HACK - can probably be removed - + await get_ready_async() await start_room_async() - + var next_room : StringName = await proceed prints("----------", "PROCEEDING", next_room, "--------------") return next_room diff --git a/src/internationalisation.de.translation b/src/internationalisation.de.translation index 858570cc..2870fb8a 100644 Binary files a/src/internationalisation.de.translation and b/src/internationalisation.de.translation differ diff --git a/src/internationalisation.en.translation b/src/internationalisation.en.translation index 9c56b8f3..34c012e7 100644 Binary files a/src/internationalisation.en.translation and b/src/internationalisation.en.translation differ diff --git a/src/internationalisation.es.translation b/src/internationalisation.es.translation index 0d9d6603..481d4a14 100644 Binary files a/src/internationalisation.es.translation and b/src/internationalisation.es.translation differ diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd index 7c604631..fa72409a 100644 --- a/src/logic-scenes/board/card-board.gd +++ b/src/logic-scenes/board/card-board.gd @@ -545,15 +545,22 @@ var dropzone_size: Vector2: var _selection_candidates : Array[Draggable]: get: match selection_state: - SelectionState.CARDS: return cards as Array[Draggable] - SelectionState.STICKIES: return notes as Array[Draggable] + SelectionState.CARDS: + return as_draggable(cards) + SelectionState.STICKIES: + return as_draggable(notes) SelectionState.FREE: print("switching from free selection to guided stickies selection") # Otherwise default to sticky selection selection_state = SelectionState.STICKIES - return notes as Array[Draggable] + return as_draggable(notes) +func as_draggable(items : Array) -> Array[Draggable]: + var result : Array[Draggable] = [] + for item in items: + result.append(item) + return result # === Util ===