diff --git a/addons/mod_loader/options/classes/options_current.gd b/addons/mod_loader/classes/options_current.gd similarity index 100% rename from addons/mod_loader/options/classes/options_current.gd rename to addons/mod_loader/classes/options_current.gd diff --git a/addons/mod_loader/options/classes/options_profile.gd b/addons/mod_loader/classes/options_profile.gd similarity index 100% rename from addons/mod_loader/options/classes/options_profile.gd rename to addons/mod_loader/classes/options_profile.gd diff --git a/addons/mod_loader/mod_loader.gd b/addons/mod_loader/mod_loader.gd index f78c7620..1ff7c8eb 100644 --- a/addons/mod_loader/mod_loader.gd +++ b/addons/mod_loader/mod_loader.gd @@ -95,7 +95,7 @@ var logged_messages := [] # Path to the options resource # See: res://addons/mod_loader/options/options_current_data.gd -var ml_options_path := "res://addons/mod_loader/options/options_current.tres" +var ml_options_path := "res://addons/mod_loader/options/options.tres" # These variables handle various options, which can be changed via Godot's GUI # by adding a ModLoaderOptions resource to the resource file specified by diff --git a/addons/mod_loader/mod_loader_setup.gd b/addons/mod_loader/mod_loader_setup.gd index cf26d7b5..a41e0205 100644 --- a/addons/mod_loader/mod_loader_setup.gd +++ b/addons/mod_loader/mod_loader_setup.gd @@ -34,12 +34,12 @@ const new_global_classes := [ "base": "Resource", "class": "ModLoaderCurrentOptions", "language": "GDScript", - "path": "res://addons/mod_loader/options/classes/options_current.gd" + "path": "res://addons/mod_loader/classes/options_current.gd" }, { "base": "Resource", "class": "ModLoaderOptionsProfile", "language": "GDScript", - "path": "res://addons/mod_loader/options/classes/options_profile.gd" + "path": "res://addons/mod_loader/classes/options_profile.gd" }, { "base": "Node", "class": "ModLoaderSteam", diff --git a/addons/mod_loader/options/options.tres b/addons/mod_loader/options/options.tres new file mode 100644 index 00000000..95a8460f --- /dev/null +++ b/addons/mod_loader/options/options.tres @@ -0,0 +1,8 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://addons/mod_loader/options/profiles/current.tres" type="Resource" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_current.gd" type="Script" id=2] + +[resource] +script = ExtResource( 2 ) +current_options = ExtResource( 1 ) diff --git a/addons/mod_loader/options/options_current.tres b/addons/mod_loader/options/options_current.tres deleted file mode 100644 index 5cb9290b..00000000 --- a/addons/mod_loader/options/options_current.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="Resource" load_steps=3 format=2] - -[ext_resource path="res://addons/mod_loader/options/classes/options_current.gd" type="Script" id=1] -[ext_resource path="res://addons/mod_loader/options/profiles/current.tres" type="Resource" id=2] - -[resource] -script = ExtResource( 1 ) -current_options = ExtResource( 2 ) diff --git a/addons/mod_loader/options/profiles/current.tres b/addons/mod_loader/options/profiles/current.tres index d3f09c79..89457209 100644 --- a/addons/mod_loader/options/profiles/current.tres +++ b/addons/mod_loader/options/profiles/current.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" load_steps=2 format=2] -[ext_resource path="res://addons/mod_loader/options/classes/options_profile.gd" type="Script" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_profile.gd" type="Script" id=1] [resource] script = ExtResource( 1 ) diff --git a/addons/mod_loader/options/profiles/default.tres b/addons/mod_loader/options/profiles/default.tres index d3f09c79..a4f74609 100644 --- a/addons/mod_loader/options/profiles/default.tres +++ b/addons/mod_loader/options/profiles/default.tres @@ -1,6 +1,7 @@ [gd_resource type="Resource" load_steps=2 format=2] -[ext_resource path="res://addons/mod_loader/options/classes/options_profile.gd" type="Script" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_profile.gd" type="Script" id=1] + [resource] script = ExtResource( 1 ) diff --git a/addons/mod_loader/options/profiles/disable_mods.tres b/addons/mod_loader/options/profiles/disable_mods.tres index 1c7e5713..0547ff16 100644 --- a/addons/mod_loader/options/profiles/disable_mods.tres +++ b/addons/mod_loader/options/profiles/disable_mods.tres @@ -1,6 +1,7 @@ [gd_resource type="Resource" load_steps=2 format=2] -[ext_resource path="res://addons/mod_loader/options/classes/options_profile.gd" type="Script" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_profile.gd" type="Script" id=1] + [resource] script = ExtResource( 1 ) diff --git a/addons/mod_loader/options/profiles/production_no_workshop.tres b/addons/mod_loader/options/profiles/production_no_workshop.tres index 4c7b6f74..97dc1ca1 100644 --- a/addons/mod_loader/options/profiles/production_no_workshop.tres +++ b/addons/mod_loader/options/profiles/production_no_workshop.tres @@ -1,6 +1,7 @@ [gd_resource type="Resource" load_steps=2 format=2] -[ext_resource path="res://addons/mod_loader/options/classes/options_profile.gd" type="Script" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_profile.gd" type="Script" id=1] + [resource] script = ExtResource( 1 ) diff --git a/addons/mod_loader/options/profiles/production_workshop.tres b/addons/mod_loader/options/profiles/production_workshop.tres index 3de9900b..f5af83de 100644 --- a/addons/mod_loader/options/profiles/production_workshop.tres +++ b/addons/mod_loader/options/profiles/production_workshop.tres @@ -1,6 +1,7 @@ [gd_resource type="Resource" load_steps=2 format=2] -[ext_resource path="res://addons/mod_loader/options/classes/options_profile.gd" type="Script" id=1] +[ext_resource path="res://addons/mod_loader/classes/options_profile.gd" type="Script" id=1] + [resource] script = ExtResource( 1 )