diff options
Diffstat (limited to 'addons/escoria-core/game/scenes')
13 files changed, 41 insertions, 62 deletions
diff --git a/addons/escoria-core/game/scenes/camera_player/camera.tscn b/addons/escoria-core/game/scenes/camera_player/camera.tscn index 4dc2e9c..34def51 100644 --- a/addons/escoria-core/game/scenes/camera_player/camera.tscn +++ b/addons/escoria-core/game/scenes/camera_player/camera.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=2 format=3 uid="uid://dmw5gicuenj53"] +[gd_scene format=3 uid="uid://dmw5gicuenj53"] [ext_resource type="Script" uid="uid://b8xyisawuhtw3" path="res://addons/escoria-core/game/scenes/camera_player/esc_camera.gd" id="1"] -[node name="camera" type="Camera2D"] -current = true +[node name="camera" type="Camera2D" unique_id=636237273] drag_horizontal_enabled = true drag_vertical_enabled = true script = ExtResource("1") diff --git a/addons/escoria-core/game/scenes/camera_player/esc_camera.gd b/addons/escoria-core/game/scenes/camera_player/esc_camera.gd index 6473121..b97f050 100644 --- a/addons/escoria-core/game/scenes/camera_player/esc_camera.gd +++ b/addons/escoria-core/game/scenes/camera_player/esc_camera.gd @@ -1,6 +1,6 @@ ## Camera handling for Escoria scenes. -extends Camera2D class_name ESCCamera +extends Camera2D ## Reference to the tween node for animating camera movements. var _tween: Tween3: @@ -43,27 +43,6 @@ func _process(_delta): if is_instance_valid(_follow_target) and not _tween.is_running() and _follow_target.has_moved(): self.global_position = _follow_target.global_position -## Register this camera with the object manager so it can be used before being made active as part of the current scene tree.[br] -## [br] -## #### Parameters[br] -## [br] -## | Name | Type | Description | Required? |[br] -## |:-----|:-----|:------------|:----------|[br] -## |room|`Variant`|The room with which to register the camera|no|[br] -## [br] -## #### Returns[br] -## [br] -## Returns nothing. -func register(room = null): - escoria.object_manager.register_object( - ESCObject.new( - escoria.object_manager.CAMERA, - self - ), - room, - true - ) - ## The camera's tween instance.[br] ## [br] ## #### Parameters[br] diff --git a/addons/escoria-core/game/scenes/camera_player/esc_camera_limits.gd b/addons/escoria-core/game/scenes/camera_player/esc_camera_limits.gd index 316e392..292896c 100644 --- a/addons/escoria-core/game/scenes/camera_player/esc_camera_limits.gd +++ b/addons/escoria-core/game/scenes/camera_player/esc_camera_limits.gd @@ -1,6 +1,6 @@ ## Describes a bounding box that limits the camera movement in the scene. -extends RefCounted class_name ESCCameraLimits +extends RefCounted ## The left side of the bounding box. var limit_left: int = -10000 diff --git a/addons/escoria-core/game/scenes/dialogs/esc_dialog_manager.gd b/addons/escoria-core/game/scenes/dialogs/esc_dialog_manager.gd index 0a00456..375c967 100644 --- a/addons/escoria-core/game/scenes/dialogs/esc_dialog_manager.gd +++ b/addons/escoria-core/game/scenes/dialogs/esc_dialog_manager.gd @@ -1,7 +1,7 @@ ## A base class for dialog plugins to work with Escoria ## @MANAGER -extends Control class_name ESCDialogManager +extends Control ## Emitted when the say function has completed showing the text[br] ## [br] @@ -40,7 +40,7 @@ signal option_chosen(option) ## #### Returns[br] ## [br] ## Returns whether the type is supported or not. (`bool`) -func has_type(type: String) -> bool: +func has_type(_type: String) -> bool: return false ## Checks whether a specific chooser type is supported by the dialog plugin.[br] @@ -54,7 +54,7 @@ func has_type(type: String) -> bool: ## #### Returns[br] ## [br] ## Returns whether the type is supported or not. (`bool`) -func has_chooser_type(type: String) -> bool: +func has_chooser_type(_type: String) -> bool: return false ## Outputs a text said by the item specified by the global id and emits `say_finished` after finishing displaying the text.[br] @@ -72,7 +72,7 @@ func has_chooser_type(type: String) -> bool: ## #### Returns[br] ## [br] ## Returns nothing. -func say(dialog_player: Node, global_id: String, text: String, type: String, key: String): +func say(_dialog_player: Node, _global_id: String, _text: String, _type: String, _key: String): pass ## Instructs the dialog manager to preserve the next dialog box used by a `say` command until a call to `disable_preserve_dialog_box` is made. This method should be idempotent, i.e. if called after the first time and prior to `disable_preserve_dialog_box` being called, the result should be the same.[br] @@ -112,7 +112,7 @@ func disable_preserve_dialog_box() -> void: ## #### Returns[br] ## [br] ## Returns nothing. -func choose(dialog_player: Node, dialog: ESCDialog, type: String): +func choose(_dialog_player: Node, _dialog: ESCDialog, _type: String): pass ## Triggers running the dialogue faster.[br] diff --git a/addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd b/addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd index 44e2a3f..69f7127 100644 --- a/addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd +++ b/addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd @@ -1,6 +1,6 @@ ## Base class for all dialog options implementations -extends Control class_name ESCDialogOptionsChooser +extends Control ## Emitted when an option is chosen.[br] ## [br] diff --git a/addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd b/addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd index 70e61e2..3862696 100644 --- a/addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd +++ b/addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd @@ -1,6 +1,6 @@ ## Escoria dialog player -extends Control class_name ESCDialogPlayer +extends Control ## Emitted when an answer is chosen.[br] ## [br] @@ -158,9 +158,9 @@ func _determine_say_dialog_manager(type: String) -> void: ESCProjectSettingsManager.DIALOG_MANAGERS ): if ResourceLoader.exists(_manager_class): - var _manager: ESCDialogManager = load(_manager_class).new() - if _manager.has_type(type): - dialog_manager = _manager + var manager: ESCDialogManager = load(_manager_class).new() + if manager.has_type(type): + dialog_manager = manager else: dialog_manager = null @@ -191,9 +191,9 @@ func _determine_choose_dialog_manager(type: String) -> void: ESCProjectSettingsManager.DIALOG_MANAGERS ): if ResourceLoader.exists(_manager_class): - var _manager: ESCDialogManager = load(_manager_class).new() - if _manager.has_chooser_type(type): - dialog_manager = _manager + var manager: ESCDialogManager = load(_manager_class).new() + if manager.has_chooser_type(type): + dialog_manager = manager else: dialog_manager = null @@ -248,7 +248,8 @@ func _determine_dialog_manager(dialog_type: String, dialog_manager_type: String) if dialog_type == DIALOG_TYPE_SAY: _determine_say_dialog_manager(dialog_manager_type) return _say_dialog_manager - elif dialog_type == DIALOG_TYPE_CHOOSE: + + if dialog_type == DIALOG_TYPE_CHOOSE: _determine_choose_dialog_manager(dialog_manager_type) return _choose_dialog_manager diff --git a/addons/escoria-core/game/scenes/esc_prompt/esc_prompt_popup.gd b/addons/escoria-core/game/scenes/esc_prompt/esc_prompt_popup.gd index d538036..b8d92b2 100644 --- a/addons/escoria-core/game/scenes/esc_prompt/esc_prompt_popup.gd +++ b/addons/escoria-core/game/scenes/esc_prompt/esc_prompt_popup.gd @@ -1,14 +1,8 @@ ## A debug window which can run esc commands extends Window -## Reference to the past actions display -@onready var past_actions = $VBoxContainer/past_actions - -## Reference to the command input -@onready var command = $VBoxContainer/command - -## ESC commands kept around for references to their command names. -var _print: PrintCommand +## The maximum number of commands to keep in history +const COMMANDS_HISTORY_LENGTH: int = 20 ## History of typed commands var commands_history: PackedStringArray @@ -16,8 +10,14 @@ var commands_history: PackedStringArray ## The current index in the command history var commands_history_current_id: int -## The maximum number of commands to keep in history -const COMMANDS_HISTORY_LENGTH: int = 20 +## ESC commands kept around for references to their command names. +var _print: PrintCommand + +## Reference to the past actions display +@onready var past_actions = $VBoxContainer/past_actions + +## Reference to the command input +@onready var command = $VBoxContainer/command ## Called when the node is added to the scene tree for the first time.[br] ## [br] @@ -111,7 +111,7 @@ func _on_command_text_entered(p_command_str : String): if script: escoria.logger.dont_assert = true - escoria.event_manager.queue_event(script.events[escoria.event_manager.EVENT_PRINT]) + escoria.event_manager.queue_event(script.get_event_with_target(escoria.event_manager.EVENT_PRINT)) var ret = await escoria.event_manager.event_finished while ret[1] != _print.get_command_name(): ret = await escoria.event_manager.event_finished diff --git a/addons/escoria-core/game/scenes/inventory/inventory_ui.gd b/addons/escoria-core/game/scenes/inventory/inventory_ui.gd index 082c250..e3e8dcf 100644 --- a/addons/escoria-core/game/scenes/inventory/inventory_ui.gd +++ b/addons/escoria-core/game/scenes/inventory/inventory_ui.gd @@ -1,6 +1,6 @@ ## Manages the inventory on the GUI connected to the inventory_ui_container variable. -extends Control class_name ESCInventory +extends Control ## The actual container node to add items as children of. Should be a Container. @export var inventory_ui_container: NodePath @@ -167,7 +167,7 @@ func remove_item_by_id(item_id: String) -> void: ## #### Returns[br] ## [br] ## Returns nothing. -func _on_escoria_global_changed(global: String, old_value, new_value) -> void: +func _on_escoria_global_changed(global: String, _old_value, new_value) -> void: if !global.begins_with("i/"): return var item = global.rsplit("i/", false) diff --git a/addons/escoria-core/game/scenes/sound/esc_ambient_player.gd b/addons/escoria-core/game/scenes/sound/esc_ambient_player.gd index 298e7db..1ab7f32 100644 --- a/addons/escoria-core/game/scenes/sound/esc_ambient_player.gd +++ b/addons/escoria-core/game/scenes/sound/esc_ambient_player.gd @@ -1,6 +1,6 @@ ## Background ambient sound player -extends Control class_name ESCAmbientPlayer +extends Control ## Global id of the background ambient sound player. @export var global_id: String = "_ambient" diff --git a/addons/escoria-core/game/scenes/sound/esc_music_player.gd b/addons/escoria-core/game/scenes/sound/esc_music_player.gd index b8f6c45..5cef646 100644 --- a/addons/escoria-core/game/scenes/sound/esc_music_player.gd +++ b/addons/escoria-core/game/scenes/sound/esc_music_player.gd @@ -1,6 +1,6 @@ ## Background music player -extends Control class_name ESCMusicPlayer +extends Control ## Global id of the background music player. @export var global_id: String = "_music" diff --git a/addons/escoria-core/game/scenes/sound/esc_sound_player.gd b/addons/escoria-core/game/scenes/sound/esc_sound_player.gd index 2a9fa64..f18abcc 100644 --- a/addons/escoria-core/game/scenes/sound/esc_sound_player.gd +++ b/addons/escoria-core/game/scenes/sound/esc_sound_player.gd @@ -1,6 +1,6 @@ ## Background sound player -extends Control class_name ESCSoundPlayer +extends Control ## Global id of the sfx sound player. @export var global_id: String = "_sound" diff --git a/addons/escoria-core/game/scenes/sound/esc_speech_player.gd b/addons/escoria-core/game/scenes/sound/esc_speech_player.gd index 31fc668..34c0483 100644 --- a/addons/escoria-core/game/scenes/sound/esc_speech_player.gd +++ b/addons/escoria-core/game/scenes/sound/esc_speech_player.gd @@ -1,6 +1,6 @@ ## Speech player -extends Control class_name ESCSpeechPlayer +extends Control ## Global id of the speech player. @export var global_id: String = "_speech" @@ -21,7 +21,7 @@ class_name ESCSpeechPlayer ## #### Returns[br] ## [br] ## Returns nothing. -func set_state(p_state: String, from_seconds: float = 0.0, p_force: bool = false) -> void: +func set_state(p_state: String, from_seconds: float = 0.0, _p_force: bool = false) -> void: # If speech is disabled, return if not ESCProjectSettingsManager.get_setting( ESCProjectSettingsManager.SPEECH_ENABLED diff --git a/addons/escoria-core/game/scenes/transitions/esc_transition_player.gd b/addons/escoria-core/game/scenes/transitions/esc_transition_player.gd index 40b0b61..1bf71cf 100644 --- a/addons/escoria-core/game/scenes/transitions/esc_transition_player.gd +++ b/addons/escoria-core/game/scenes/transitions/esc_transition_player.gd @@ -1,6 +1,6 @@ ## A transition player for scene changes -extends ColorRect class_name ESCTransitionPlayer +extends ColorRect ## Emitted when the transition was played[br] ## [br] @@ -13,7 +13,7 @@ class_name ESCTransitionPlayer signal transition_done(transition_id) ## The valid transition modes -enum TRANSITION_MODE { +enum TransitionMode { IN, OUT } @@ -68,7 +68,7 @@ func _ready() -> void: ## Returns the transition id. (`int`) func transition( transition_name: String = "", - mode: int = TRANSITION_MODE.IN, + mode: int = TransitionMode.IN, duration: float = 1.0 ) -> int: @@ -105,7 +105,7 @@ func transition( var start = 0.0 var end = 1.0 - if mode == TRANSITION_MODE.OUT: + if mode == TransitionMode.OUT: start = 1.0 end = 0.0 |