Big refactor: Fix plugin issues when disabling/reenabling plugins (#598)

Co-authored-by: balloonpopper <5151242+balloonpopper@users.noreply.github.com>
Co-authored-by: Duncan Brown <duncan@prometheussoftware.ca>
This commit is contained in:
Julian Murgia
2022-07-10 20:40:08 +02:00
committed by GitHub
parent dfbceadd1c
commit ad79aa69d1
113 changed files with 2977 additions and 2072 deletions

View File

@@ -70,16 +70,11 @@ _global_script_classes=[ {
"path": "res://addons/escoria-core/game/core-scripts/esc/commands/custom.gd"
}, {
"base": "ESCBaseCommand",
"class": "DebugCommand",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/commands/debug.gd"
}, {
"base": "ESCBaseCommand",
"class": "DecGlobalCommand",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/commands/dec_global.gd"
}, {
"base": "Object",
"base": "Resource",
"class": "ESCActionManager",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/esc_action_manager.gd"
@@ -104,7 +99,7 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc_background.gd"
}, {
"base": "Node",
"base": "Resource",
"class": "ESCBaseCommand",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_base_command.gd"
@@ -114,7 +109,7 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/scenes/camera_player/esc_camera.gd"
}, {
"base": "Object",
"base": "Reference",
"class": "ESCCameraLimits",
"language": "GDScript",
"path": "res://addons/escoria-core/game/scenes/camera_player/esc_camera_limits.gd"
@@ -124,22 +119,22 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_command.gd"
}, {
"base": "Object",
"base": "Reference",
"class": "ESCCommandArgumentDescriptor",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_command_argument_descriptor.gd"
}, {
"base": "Object",
"base": "Reference",
"class": "ESCCommandRegistry",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/esc_command_registry.gd"
}, {
"base": "Object",
"base": "Resource",
"class": "ESCCompiler",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/esc_compiler.gd"
}, {
"base": "Object",
"base": "Reference",
"class": "ESCCondition",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_condition.gd"
@@ -189,7 +184,7 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/esc_event_manager.gd"
}, {
"base": "Object",
"base": "Resource",
"class": "ESCExecution",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_execution.gd"
@@ -214,10 +209,10 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_group.gd"
}, {
"base": "Node",
"base": "Resource",
"class": "ESCInputsManager",
"language": "GDScript",
"path": "res://addons/escoria-core/game/inputs_manager.gd"
"path": "res://addons/escoria-core/game/esc_inputs_manager.gd"
}, {
"base": "Control",
"class": "ESCInventory",
@@ -239,7 +234,7 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc_inventory_item.gd"
}, {
"base": "Object",
"base": "Resource",
"class": "ESCInventoryManager",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/esc_inventory_manager.gd"
@@ -254,17 +249,17 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc_location.gd"
}, {
"base": "Object",
"class": "ESCLogger",
"base": "Node",
"class": "ESCMain",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/log/esc_logger.gd"
"path": "res://addons/escoria-core/game/main_scene.gd"
}, {
"base": "Object",
"base": "Reference",
"class": "ESCMigration",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/migrations/esc_migration.gd"
}, {
"base": "Object",
"base": "Reference",
"class": "ESCMigrationManager",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/migrations/esc_migration_manager.gd"
@@ -279,12 +274,12 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/scenes/sound/esc_music_player.gd"
}, {
"base": "Node",
"base": "Reference",
"class": "ESCObject",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_object.gd"
}, {
"base": "Node",
"base": "Resource",
"class": "ESCObjectManager",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd"
@@ -294,17 +289,17 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc_player.gd"
}, {
"base": "Node",
"base": "Resource",
"class": "ESCProjectSettingsManager",
"language": "GDScript",
"path": "res://addons/escoria-core/game/project_settings_manager.gd"
"path": "res://addons/escoria-core/game/esc_project_settings_manager.gd"
}, {
"base": "Object",
"base": "Reference",
"class": "ESCResourceCache",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc_resource_cache.gd"
}, {
"base": "Object",
"base": "Resource",
"class": "ESCResourceDescriptor",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/resources/esc_resource_descriptor.gd"
@@ -314,7 +309,7 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc_room.gd"
}, {
"base": "Object",
"base": "Resource",
"class": "ESCRoomManager",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd"
@@ -344,12 +339,12 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/save_data/esc_savesettings.gd"
}, {
"base": "Object",
"base": "Reference",
"class": "ESCScheduledEvent",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_scheduled_event.gd"
}, {
"base": "Object",
"base": "Resource",
"class": "ESCScript",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_script.gd"
@@ -364,7 +359,7 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/scenes/sound/esc_speech_player.gd"
}, {
"base": "Object",
"base": "Reference",
"class": "ESCStatement",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_statement.gd"
@@ -384,12 +379,12 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/scenes/transitions/esc_transition_player.gd"
}, {
"base": "Object",
"base": "Reference",
"class": "ESCUtils",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/utils/esc_utils.gd"
}, {
"base": "Object",
"base": "Reference",
"class": "ESCWalkContext",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc_walk_context.gd"
@@ -404,6 +399,11 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://addons/escoria-core/game/escoria.gd"
}, {
"base": "Reference",
"class": "EscoriaPlugin",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/plugins/escoria_plugin.gd"
}, {
"base": "ESCBaseCommand",
"class": "HideMenuCommand",
"language": "GDScript",
@@ -430,6 +430,11 @@ _global_script_classes=[ {
"path": "res://addons/escoria-core/game/core-scripts/esc/commands/play_snd.gd"
}, {
"base": "ESCBaseCommand",
"class": "PrintCommand",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/commands/print.gd"
}, {
"base": "ESCBaseCommand",
"class": "QueueEventCommand",
"language": "GDScript",
"path": "res://addons/escoria-core/game/core-scripts/esc/commands/queue_event.gd"
@@ -597,7 +602,6 @@ _global_script_class_icons={
"CameraShiftCommand": "",
"ChangeSceneCommand": "",
"CustomCommand": "",
"DebugCommand": "",
"DecGlobalCommand": "",
"ESCActionManager": "",
"ESCAnimationName": "",
@@ -634,7 +638,7 @@ _global_script_class_icons={
"ESCInventoryManager": "",
"ESCItem": "res://addons/escoria-core/design/esc_item.svg",
"ESCLocation": "res://addons/escoria-core/design/esc_location.svg",
"ESCLogger": "",
"ESCMain": "",
"ESCMigration": "",
"ESCMigrationManager": "",
"ESCMovable": "",
@@ -664,11 +668,13 @@ _global_script_class_icons={
"ESCWalkContext": "",
"EnableTerrainCommand": "",
"Escoria": "",
"EscoriaPlugin": "",
"HideMenuCommand": "",
"IncGlobalCommand": "",
"InventoryAddCommand": "",
"InventoryRemoveCommand": "",
"PlaySndCommand": "",
"PrintCommand": "",
"QueueEventCommand": "",
"QueueResourceCommand": "",
"RandGlobalCommand": "",
@@ -710,7 +716,7 @@ boot_splash/image="res://addons/escoria-core/design/escoria-logo-small.png"
boot_splash/fullsize=false
boot_splash/use_filter=false
boot_splash/bg_color=Color( 0.960784, 0.384314, 0, 1 )
config/icon="res://icon.png"
config/icon="res://addons/escoria-player-creator/graphics/icon.png"
[audio]
@@ -718,7 +724,7 @@ default_bus_layout="res://addons/escoria-core/default_bus_layout.tres"
[autoload]
escoria="*res://addons/escoria-core/game/escoria.tscn"
escoria="*res://addons/escoria-core/game/esc_autoload.gd"
[display]
@@ -737,55 +743,55 @@ enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/e
[escoria]
main/game_version="0.1.0"
main/game_start_script="res://game/start_game.esc"
main/force_quit=true
main/command_directories=[ "res://addons/escoria-core/game/core-scripts/esc/commands" ]
main/text_lang="fr_FR"
main/voice_lang="fr_FR"
main/savegames_path="res://saves/"
main/settings_path="user://"
main/game_migration_path=""
debug/terminate_on_warnings=false
debug/terminate_on_errors=true
debug/development_lang="en"
ui/tooltip_follows_mouse=false
main/text_lang="fr_FR"
main/voice_lang="fr_FR"
sound/music_volume=1
sound/sfx_volume=1
sound/speech_volume=1
sound/master_volume=1
main/command_directories=[ "res://addons/escoria-core/game/core-scripts/esc/commands" ]
debug/log_level="TRACE"
platform/skip_cache=false
platform/skip_cache.mobile=true
ui/items_autoregister_path="res://game/items/inventory"
main/game_version="0.1.0"
main/savegames_path="res://saves/"
main/settings_path="user://"
main/escoria_version=""
sound/speech_enabled=1
ui/game_scene="res://addons/escoria-ui-9verbs/game.tscn"
ui/dialogs_chooser="res://addons/escoria-core/ui_library/dialogs/text_dialog_chooser.tscn"
sound/speech_folder="res://game/speech"
sound/speech_extension="ogg"
ui/default_transition="instant"
ui/transition_paths=[ "res://addons/escoria-core/game/scenes/transitions/shaders/" ]
ui/inventory_item_size=Vector2( 72, 72 )
debug/enable_room_selector=true
debug/room_selector_room_dir="res://game/rooms"
ui/dialog_managers=[ "res://addons/escoria-dialog-simple/esc_dialog_simple.gd" ]
ui/default_dialog_type="floating"
dialog_simple/avatars_path="res://game/dialog_avatars"
dialog_simple/text_speed_per_character=0.1
dialog_simple/fast_text_speed_per_character=0.25
dialog_simple/max_time_to_disappear=1.0
debug/log_file_path="user://"
debug/crash_message="We're sorry, but the game crashed. Please send us the following files:
%s"
debug/enable_room_selector=true
debug/room_selector_room_dir="res://game/rooms"
ui/game_scene="res://addons/escoria-ui-9verbs/game.tscn"
ui/items_autoregister_path="res://game/items/inventory"
ui/default_transition="instant"
ui/transition_paths=[ "res://addons/escoria-core/game/scenes/transitions/shaders/" ]
ui/inventory_item_size=Vector2( 72, 72 )
ui/dialog_managers=[ "res://addons/escoria-dialog-simple/esc_dialog_simple.gd" ]
sound/master_volume=1
sound/music_volume=1
sound/sfx_volume=1
sound/speech_volume=1
sound/speech_folder="res://game/speech"
sound/speech_extension="ogg"
platform/skip_cache=false
platform/skip_cache.mobile=true
ui/default_dialog_type="floating"
sound/speech_enabled=1
ui/tooltip_follows_mouse=false
main/escoria_version=""
ui/dialogs_chooser="res://addons/escoria-core/ui_library/dialogs/text_dialog_chooser.tscn"
ui/default_dialog_scene="res://addons/escoria-core/ui_library/dialogs/floating_dialog_player.tscn"
main/game_migration_path=""
dialog_simple/avatars_path=""
dialog_simple/text_speed_per_character=0.1
dialog_simple/fast_text_speed_per_character=0.25
dialog_simple/max_time_to_disappear=1.0
[input]
esc_show_debug_prompt={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777245,"unicode":0,"echo":false,"script":null)
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777245,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
switch_action_verb={