Skip to content

refactor: ♻️ Move options classes + Rename options_current #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 2, 2023
Merged

refactor: ♻️ Move options classes + Rename options_current #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3329cbf
API: Options - Rename `options_current.tres` to `options.tres`
ithinkandicode Mar 2, 2023
2c61f29
Revert "API: Options - Rename `options_current.tres` to `options.tres`"
ithinkandicode Mar 2, 2023
3fcce02
API: Options - Rename `options_current.tres` to `options.tres`
ithinkandicode Mar 2, 2023
b0d51f9
API: Options - Move options classes to new `classes` dir
ithinkandicode Mar 2, 2023
d672a5b
Merge branch 'development' into api-options
ithinkandicode Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...loader/options/classes/options_current.gd → addons/mod_loader/classes/options_current.gd
View file
Open in desktop
File renamed without changes.
0 ...loader/options/classes/options_profile.gd → addons/mod_loader/classes/options_profile.gd
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion addons/mod_loader/mod_loader.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions addons/mod_loader/mod_loader_setup.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions addons/mod_loader/options/options.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 )
8 changes: 0 additions & 8 deletions addons/mod_loader/options/options_current.tres
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion addons/mod_loader/options/profiles/current.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 )
Expand Down
3 changes: 2 additions & 1 deletion addons/mod_loader/options/profiles/default.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 )
Expand Down
3 changes: 2 additions & 1 deletion addons/mod_loader/options/profiles/disable_mods.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 )
Expand Down
3 changes: 2 additions & 1 deletion addons/mod_loader/options/profiles/production_no_workshop.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 )
Expand Down
3 changes: 2 additions & 1 deletion addons/mod_loader/options/profiles/production_workshop.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 )
Expand Down