Merge pull request #287 from Jeremi360/gut-fixes

GUT fixes

Author: Jeremi360

addons/Rakugo/Rakugo.gd

@@ -8,8 +8,10 @@ const save_folder = "application/addons/rakugo/save_folder"
 
 #Godot setting's strings
 const game_title = "application/config/name"
+const docks_text_files = "docks/filesystem/textfile_extensions"
+const editor_text_files = "editor/script/search_in_file_extensions"
 
-const version := "2.3.1"
+const version := "2.3"
 
 const StoreManager = preload("res://addons/Rakugo/lib/systems/StoreManager.gd")
 const Parser = preload("res://addons/Rakugo/lib/systems/Parser.gd")
@@ -220,7 +222,7 @@ func get_character_variable(character_tag: String, var_name: String):
 func _ready():
 	var version = ProjectSettings.get_setting(game_version)
 	var title = ProjectSettings.get_setting(game_title)
-	get_window().set_title(title + " " + str(version))
+	get_window().set_title("%s %s" % [title, version])
 
 	var narrator_name = ProjectSettings.get_setting(narrator_name)
 	define_character("narrator", narrator_name)

addons/Rakugo/lib/systems/StoreManager.gd

@@ -1,6 +1,6 @@
 extends RefCounted
 
-var save_folder_path:String
+var save_folder_path: String
 
 #store rakugo variables
 var variables: Dictionary
@@ -11,8 +11,7 @@ var characters: Dictionary
 var parsed_scripts: Dictionary
 
 func _init():
-	save_folder_path = ProjectSettings.get_setting("addons/rakugo/save_folder")
-
+	save_folder_path = ProjectSettings.get_setting(Rakugo.save_folder, "user://saves")
 
 ## Rk
 func load_rk(path: String) -> PackedStringArray:
@@ -73,8 +72,7 @@ func save_json(path: String, data: Dictionary) -> int:
 
 	return OK
 
-
-func save_game(thread_datas:Dictionary, save_name: String = "quick") -> int:
+func save_game(thread_datas: Dictionary, save_name: String = "quick") -> int:
 	var save_folder = save_folder_path + "/" + save_name
 
 	if !DirAccess.dir_exists_absolute(save_folder):
@@ -91,7 +89,6 @@ func save_game(thread_datas:Dictionary, save_name: String = "quick") -> int:
 
 	return save_json(save_folder + "/save.json", sava_datas)
 
-
 func load_game(save_name: String = "quick") -> Dictionary:
 	var save_folder = save_folder_path + "/" + save_name
 

addons/Rakugo/plugin.gd

@@ -1,68 +1,49 @@
 @tool
 extends EditorPlugin
 
-var script_types : PackedStringArray
-var text_types : String
-var editor_settings : EditorSettings
+var script_types: PackedStringArray
+var text_types: String
+var editor_settings: EditorSettings
 
 func _enter_tree():
 	# Initialization of the plugin goes here
 	add_autoload_singleton("Rakugo", "res://addons/Rakugo/Rakugo.gd")
 
 	# try to import setting from version 2.2
-	var game_version := ProjectSettings.get_setting(
-		"addons/rakugo/game_version",1.0)
-	var narrator_name := ProjectSettings.get_setting(
-		"addons/rakugo/narrator/name","narrator")
-	var debug := ProjectSettings.get_setting(
-		"addons/rakugo/debug", false)
-	var save_folder := ProjectSettings.get_setting(
-		"addons/rakugo/save_folder","user://saves")
+	var game_version := ProjectSettings.get_setting("addons/rakugo/game_version", 1.0)
+	var narrator_name := ProjectSettings.get_setting("addons/rakugo/narrator/name", "narrator")
+	var debug := ProjectSettings.get_setting("addons/rakugo/debug", false)
+	var save_folder := ProjectSettings.get_setting("addons/rakugo/save_folder", "user://saves")
 
-	# remvove old seetings
+	# remove old settings
 	ProjectSettings.set_setting("addons/rakugo/game_version", null)
 	ProjectSettings.set_setting("addons/rakugo/history_length", null)
 	ProjectSettings.set_setting("addons/rakugo/narrator/name", null)
 	ProjectSettings.set_setting("addons/rakugo/debug", null)
 	ProjectSettings.set_setting("addons/rakugo/save_folder", null)
 
-	ProjectSettings.set_setting(
-		"application/addons/rakugo/game_version", game_version)
-	ProjectSettings.set_setting(
-		"application/addons/rakugo/narrator_name", narrator_name)
-	ProjectSettings.set_setting(
-		"application/addons/rakugo/debug", debug)
-	ProjectSettings.set_setting(
-		"application/addons/rakugo/save_folder", save_folder)
+	ProjectSettings.set_setting(Rakugo.game_version, game_version)
+	ProjectSettings.set_setting(Rakugo.narrator_name, narrator_name)
+	ProjectSettings.set_setting(Rakugo.debug, debug)
+	ProjectSettings.set_setting(Rakugo.save_folder, save_folder)
 
-	script_types = ProjectSettings.get_setting(
-		"editor/script/search_in_file_extensions")
+	script_types = ProjectSettings.get_setting(Rakugo.editor_text_files)
 	if !("rk" in script_types):
 		script_types.append("rk")
-		ProjectSettings.set_setting(
-			"editor/script/search_in_file_extensions",
-			script_types
-		)
+		ProjectSettings.set_setting(Rakugo.editor_text_files, script_types)
 
 	editor_settings = get_editor_interface().get_editor_settings()
-	text_types = editor_settings.get(
-		"docks/filesystem/textfile_extensions")
+	text_types = editor_settings.get(Rakugo.docks_text_files)
 	if !("rk" in text_types):
 		text_types += ",rk"
-		ProjectSettings.set_setting(
-			"docks/filesystem/textfile_extensions",
-			text_types
-		)
+		ProjectSettings.set_setting(Rakugo.docks_text_files, text_types)
 
 	print("Rakugo is enabled")
 
-
 func _exit_tree():
-	ProjectSettings.set_setting(
-		"application/addons/rakugo/game_version", null)
-	ProjectSettings.set_setting(
-		"application/addons/rakugo/narrator_name", null)
-	ProjectSettings.set_setting(
-		"application/addons/rakugo/debug", null)
-	ProjectSettings.set_setting(
-		"application/addons/rakugo/save_folder", null)
+	ProjectSettings.set_setting(Rakugo.game_version, null)
+	ProjectSettings.set_setting(Rakugo.narrator_name, null)
+	ProjectSettings.set_setting(Rakugo.debug, null)
+	ProjectSettings.set_setting(Rakugo.save_folder, null)
+	remove_autoload_singleton("Rakugo")
+	print("Rakugo is disabled")