From ed2f539621e7dd2e654c5bbf6fd5a0e1633ba7ec Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2026 20:58:11 +0000 Subject: [PATCH] chore(combat_room): fix encapsulation by using public getter for room data Renamed `_get_current_room_data()` to `get_current_room_data()` in `_RunManager` and updated `CombatRoom` to use the public getter. This prevents cross-module access of private methods and ensures better maintainability. - Modified `scripts/state_machine/run_manager.gd`: renamed method and updated internal call. - Modified `scripts/core/combat_room.gd`: updated external call site. Co-authored-by: niyazmft <9331133+niyazmft@users.noreply.github.com> --- scripts/core/combat_room.gd | 2 +- scripts/state_machine/run_manager.gd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/core/combat_room.gd b/scripts/core/combat_room.gd index bdef331..0effde6 100644 --- a/scripts/core/combat_room.gd +++ b/scripts/core/combat_room.gd @@ -33,7 +33,7 @@ func _ready() -> void: run_manager.room_entered.connect(_on_room_entered) # If we are already in a room, trigger it manually if run_manager.current_state == _RunManager.RunState.ROOM: - _on_room_entered(run_manager.room_index, run_manager._get_current_room_data()) + _on_room_entered(run_manager.room_index, run_manager.get_current_room_data()) elif test_mode: _spawn_test_encounter() diff --git a/scripts/state_machine/run_manager.gd b/scripts/state_machine/run_manager.gd index f41ac16..ed05af7 100644 --- a/scripts/state_machine/run_manager.gd +++ b/scripts/state_machine/run_manager.gd @@ -316,7 +316,7 @@ func _enter_room(_ctx: Dictionary) -> void: # Reset one-shot flags that are room-scoped _combat_resolved = false - var room_data: Dictionary = _get_current_room_data() + var room_data: Dictionary = get_current_room_data() var room_id: String = room_data.get("room_id", "room_standard_01") # Load room definition and augment room_data @@ -558,7 +558,7 @@ func _get_current_biome_index() -> int: return 0 -func _get_current_room_data() -> Dictionary: +func get_current_room_data() -> Dictionary: if room_index >= 0 and room_index < room_queue.size(): return room_queue[room_index] return {}