From 5bd643a22c2c7da4fa291063ee5f5d0846457b7b Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Sat, 16 Jul 2022 18:04:40 +0200
Subject: [PATCH] Updated and enabled the data manager addon.

---
 .../resources/data_manager_addon_settings.gd  | 24 ++++---
 game/project.pandemonium                      | 70 ++++++-------------
 2 files changed, 37 insertions(+), 57 deletions(-)

diff --git a/game/addons/data_manager/resources/data_manager_addon_settings.gd b/game/addons/data_manager/resources/data_manager_addon_settings.gd
index 8ccb000..dab1575 100644
--- a/game/addons/data_manager/resources/data_manager_addon_settings.gd
+++ b/game/addons/data_manager/resources/data_manager_addon_settings.gd
@@ -27,12 +27,14 @@ func folder_get_name(index : int) -> String:
 func folder_get_type(index : int) -> String:
 	return folders[index].type
 
-func _get(property):
-	if property == "folder_count":
+func _get(property : StringName):
+	var sprop : String = property
+	
+	if sprop == "folder_count":
 		return folders.size()
 		
-	if property.begins_with("folders/"):
-		var sindex : String = property.get_slice("/", 1)
+	if sprop.begins_with("folders/"):
+		var sindex : String = sprop.get_slice("/", 1)
 		
 		if sindex == "":
 			return null
@@ -42,7 +44,7 @@ func _get(property):
 		if index < 0 || index >= folders.size():
 			return null
 			
-		var p : String = property.get_slice("/", 2)
+		var p : String = sprop.get_slice("/", 2)
 		
 		if p == "folder":
 			return folders[index].folder
@@ -57,16 +59,18 @@ func _get(property):
 		
 	return null
 
-func _set(property, val):
+func _set(property : StringName, val) -> bool:
+	var sprop : String = property
+	
 	if property == "folder_count":
 		set_folder_count(val)
 		return true
 	
-	if property.begins_with("folders/"):
-		var sindex : String = property.get_slice("/", 1)
+	if sprop.begins_with("folders/"):
+		var sindex : String = sprop.get_slice("/", 1)
 		
 		if sindex == "":
-			return null
+			return false
 			
 		var index : int = sindex.to_int()
 		
@@ -76,7 +80,7 @@ func _set(property, val):
 		if index >= folders.size():
 			return false
 			
-		var p : String = property.get_slice("/", 2)
+		var p : String = sprop.get_slice("/", 2)
 		
 		if p == "folder":
 			folders[index].folder = val
diff --git a/game/project.pandemonium b/game/project.pandemonium
index 1869803..92915e9 100644
--- a/game/project.pandemonium
+++ b/game/project.pandemonium
@@ -29,11 +29,6 @@ _global_script_classes=[ {
 "language": @"GDScript",
 "path": "res://player/CharacterSkeleton2DGD.gd"
 }, {
-"base": "ColorRect",
-"class": @"ColorTile",
-"language": @"GDScript",
-"path": "res://addons/color-palette/ColorTile.gd"
-}, {
 "base": "Resource",
 "class": @"Continent",
 "language": @"GDScript",
@@ -54,11 +49,6 @@ _global_script_classes=[ {
 "language": @"GDScript",
 "path": "res://scripts/entities/EntityDataGD.gd"
 }, {
-"base": "Container",
-"class": @"FlexGridContainer",
-"language": @"GDScript",
-"path": "res://addons/color-palette/utilities/FlexGridContainer.gd"
-}, {
 "base": "Resource",
 "class": @"GameModule",
 "language": @"GDScript",
@@ -119,16 +109,6 @@ _global_script_classes=[ {
 "language": @"GDScript",
 "path": "res://player/NetworkedPlayer.gd"
 }, {
-"base": "Reference",
-"class": @"Palette",
-"language": @"GDScript",
-"path": "res://addons/color-palette/Palette.gd"
-}, {
-"base": "Reference",
-"class": @"PaletteImporter",
-"language": @"GDScript",
-"path": "res://addons/color-palette/PaletteImporter.gd"
-}, {
 "base": "",
 "class": @"PlayerGD",
 "language": @"GDScript",
@@ -190,42 +170,38 @@ _global_script_classes=[ {
 "path": "res://addons/world_generator/resources/zone.gd"
 } ]
 _global_script_class_icons={
-@"LayeredTextureMaker": "",
-@"Palette": "",
-@"CharacterAtlas2D": "",
-@"CharacterSkeketonAttachPoint": "",
-@"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png",
-@"GameModule": "",
-@"PlayerGD": "",
-@"WorldGeneratorSettings": "",
-@"ItemVisual2D": "",
-@"MobGD": "",
-@"PaletteImporter": "",
-@"PlayerMaster": "",
-@"SpeedResource": "",
 @"CharacterAtlasEntry2D": "",
 @"Continent": "",
 @"EntityAIGD": "",
 @"EntityDataGD": "",
 @"WorldGenWorld": "",
-@"CharacterSkeleton2DGD": "",
-@"ItemVisualEntry2D": "",
-@"NetworkedPlayerGD": "",
-@"SpellEffectVisualBasic": "",
-@"SpellGD": "",
-@"UIWindowModule": "",
-@"Zone": "",
-@"ColorTile": "",
+@"ItemVisual2D": "",
+@"MobGD": "",
+@"PlayerMaster": "",
+@"SpeedResource": "",
+@"CharacterAtlas2D": "",
+@"CharacterSkeketonAttachPoint": "",
+@"GameModule": "",
+@"PlayerGD": "",
+@"WorldGeneratorSettings": "",
+@"LayeredTextureMaker": "",
+@"HumanoidCharacterBones2D": "",
+@"DisplayPlayerGD": "",
+@"HealthResource": "",
+@"ItemTemplateGD": "",
+@"SubZone": "",
 @"Main": "",
 @"ManaResource": "",
 @"Menu": "",
 @"UIGuiChildModule": "",
 @"WorldGenBaseResource": "",
-@"DisplayPlayerGD": "",
-@"HealthResource": "",
-@"ItemTemplateGD": "",
-@"SubZone": "",
-@"HumanoidCharacterBones2D": ""
+@"UIWindowModule": "",
+@"Zone": "",
+@"CharacterSkeleton2DGD": "",
+@"ItemVisualEntry2D": "",
+@"NetworkedPlayerGD": "",
+@"SpellEffectVisualBasic": "",
+@"SpellGD": ""
 }
 Node="input/actionbar_5_11"
 
@@ -269,7 +245,7 @@ window/size/ui_scale_touch=1.0
 
 [editor_plugins]
 
-enabled=PoolStringArray( "res://addons/color-palette/plugin.cfg", "res://addons/tile_generator/plugin.cfg", "res://addons/world_generator/plugin.cfg" )
+enabled=PoolStringArray( "res://addons/data_manager/plugin.cfg", "res://addons/tile_generator/plugin.cfg", "res://addons/world_generator/plugin.cfg" )
 
 [ess]