From df06be7542e74a1e8f874cfa011e82419bfa9f7d Mon Sep 17 00:00:00 2001 From: teatov Date: Sat, 15 Feb 2025 00:16:38 +1000 Subject: [PATCH] add `_` to private variables --- scripts/globals/inputer.gd | 29 +++++++++++++++-------------- scripts/main.gd | 7 ++++--- scripts/title.gd | 4 ---- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/scripts/globals/inputer.gd b/scripts/globals/inputer.gd index 29aa7b2..f6fae51 100644 --- a/scripts/globals/inputer.gd +++ b/scripts/globals/inputer.gd @@ -10,14 +10,15 @@ const RIGHT_TRIGGER_SPRITE_INDEX: int = 21 const LEFT_STICK_SPRITE_INDEX: int = 23 const RIGHT_STICK_SPRITE_INDEX: int = 24 -@export var prompt_grid_size: int = 5 -@export var prompt_icon_size: int = 60 - @export var mode: Mode = Mode.KB_MOUSE -@export var controller: ControllerType = ControllerType.XBOX: + +@export var _controller: ControllerType = ControllerType.XBOX: set(value): _set_current_prompts(value) - controller = value + _controller = value + +@export var _prompt_grid_size: int = 5 +@export var _prompt_icon_size: int = 60 var _prompts_xbox := preload("res://assets/textures/ui/prompts_xbox.png") var _prompts_sony := preload("res://assets/textures/ui/prompts_sony.png") @@ -131,17 +132,17 @@ func _get_prompt_sprite(index: int) -> String: region.position.y, region.size.x, region.size.y, - prompt_icon_size, - prompt_icon_size, + _prompt_icon_size, + _prompt_icon_size, _current_prompts.resource_path ] ) func _get_prompt_sprite_region(index: int) -> Rect2i: - var corner_x: int = index % prompt_grid_size - var corner_y: int = index / prompt_grid_size - var sprite_size: int = _current_prompts.get_width() / prompt_grid_size + var corner_x: int = index % _prompt_grid_size + var corner_y: int = index / _prompt_grid_size + var sprite_size: int = _current_prompts.get_width() / _prompt_grid_size return Rect2i( corner_x * sprite_size, corner_y * sprite_size, @@ -157,13 +158,13 @@ func _get_controller_type() -> void: or controller_name.contains("sony") or controller_name.contains("playstation") ): - controller = ControllerType.SONY + _controller = ControllerType.SONY elif controller_name.contains("steam"): - controller = ControllerType.STEAM + _controller = ControllerType.STEAM elif controller_name.contains("nintendo"): - controller = ControllerType.NINTENDO + _controller = ControllerType.NINTENDO else: - controller = ControllerType.XBOX + _controller = ControllerType.XBOX func _set_current_prompts(type: ControllerType) -> void: diff --git a/scripts/main.gd b/scripts/main.gd index 1c6cdbc..cc6d490 100644 --- a/scripts/main.gd +++ b/scripts/main.gd @@ -4,12 +4,13 @@ extends Node var menu: Menu @onready var player_holder: Node = $Players -@onready var player_spawner: MultiplayerSpawner = $PlayerSpawner + +@onready var _player_spawner: MultiplayerSpawner = $PlayerSpawner func _ready() -> void: - player_spawner.spawned.connect(_on_player_spawner_spawned) - player_spawner.despawned.connect(_on_player_spawner_despawned) + _player_spawner.spawned.connect(_on_player_spawner_spawned) + _player_spawner.despawned.connect(_on_player_spawner_despawned) Referencer.main = self diff --git a/scripts/title.gd b/scripts/title.gd index 335ca86..d497fd4 100644 --- a/scripts/title.gd +++ b/scripts/title.gd @@ -1,9 +1,5 @@ extends Node -@onready var _play_menu: Control = $Menu/PlayMenu - -@onready var _menus: Array[Control] = [_play_menu] - func _ready() -> void: print("Cadastery v", ProjectSettings.get_setting("application/config/version"))