diff --git a/HEADS b/HEADS index 9249a8f0..cc606bd8 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "c726a4b2f1855668ad586a6185dc4234df9bdca9"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "e16d80eecbddc386d4d4c65c5b1e2ebc9f442cb6"}} \ No newline at end of file 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 8ccb000f..dab1575d 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.godot b/game/project.godot index 515c2d25..6550d926 100644 --- a/game/project.godot +++ b/game/project.godot @@ -11,312 +11,312 @@ config_version=4 Node="input/actionbar_5_11" _global_script_classes=[ { "base": "Reference", -"class": "BrushPrefabs", -"language": "GDScript", +"class": @"BrushPrefabs", +"language": @"GDScript", "path": "res://addons/Godoxel/BrushPrefabs.gd" }, { "base": "Spatial", -"class": "CharacterSkeketonAttachPoint", -"language": "GDScript", +"class": @"CharacterSkeketonAttachPoint", +"language": @"GDScript", "path": "res://player/CharacterSkeletonAttachPoint.gd" }, { "base": "ColorRect", -"class": "ColorTile", -"language": "GDScript", +"class": @"ColorTile", +"language": @"GDScript", "path": "res://addons/color-palette/ColorTile.gd" }, { "base": "Resource", -"class": "Continent", -"language": "GDScript", +"class": @"Continent", +"language": @"GDScript", "path": "res://addons/world_generator/resources/continent.gd" }, { "base": "Entity", -"class": "DisplayPlayerGD", -"language": "GDScript", +"class": @"DisplayPlayerGD", +"language": @"GDScript", "path": "res://player/DisplayPlayer.gd" }, { "base": "EntityAI", -"class": "EntityAIGD", -"language": "GDScript", +"class": @"EntityAIGD", +"language": @"GDScript", "path": "res://scripts/ai/EntityAIGD.gd" }, { "base": "EntityData", -"class": "EntityDataGD", -"language": "GDScript", +"class": @"EntityDataGD", +"language": @"GDScript", "path": "res://scripts/entities/EntityDataGD.gd" }, { "base": "Container", -"class": "FlexGridContainer", -"language": "GDScript", +"class": @"FlexGridContainer", +"language": @"GDScript", "path": "res://addons/color-palette/utilities/FlexGridContainer.gd" }, { "base": "Node", -"class": "GEAction", -"language": "GDScript", +"class": @"GEAction", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/Action.gd" }, { "base": "GEAction", -"class": "GEBrighten", -"language": "GDScript", +"class": @"GEBrighten", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/Brighten.gd" }, { "base": "GEAction", -"class": "GEBrush", -"language": "GDScript", +"class": @"GEBrush", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/Brush.gd" }, { "base": "GEAction", -"class": "GEBucket", -"language": "GDScript", +"class": @"GEBucket", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/Bucket.gd" }, { "base": "Control", -"class": "GECanvas", -"language": "GDScript", +"class": @"GECanvas", +"language": @"GDScript", "path": "res://addons/Godoxel/Canvas.gd" }, { "base": "GEAction", -"class": "GECut", -"language": "GDScript", +"class": @"GECut", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/Cut.gd" }, { "base": "GEAction", -"class": "GEDarken", -"language": "GDScript", +"class": @"GEDarken", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/Darken.gd" }, { "base": "Reference", -"class": "GELayer", -"language": "GDScript", +"class": @"GELayer", +"language": @"GDScript", "path": "res://addons/Godoxel/Layer.gd" }, { "base": "GEAction", -"class": "GELine", -"language": "GDScript", +"class": @"GELine", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/Line.gd" }, { "base": "GEAction", -"class": "GEMultiLine", -"language": "GDScript", +"class": @"GEMultiLine", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/MultiLine.gd" }, { "base": "GEAction", -"class": "GEPasteCut", -"language": "GDScript", +"class": @"GEPasteCut", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/PasteCut.gd" }, { "base": "GEAction", -"class": "GEPencil", -"language": "GDScript", +"class": @"GEPencil", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/Pencil.gd" }, { "base": "GEAction", -"class": "GERainbow", -"language": "GDScript", +"class": @"GERainbow", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/Rainbow.gd" }, { "base": "GEAction", -"class": "GERect", -"language": "GDScript", +"class": @"GERect", +"language": @"GDScript", "path": "res://addons/Godoxel/actions/Rect.gd" }, { "base": "Node", -"class": "GEUtils", -"language": "GDScript", +"class": @"GEUtils", +"language": @"GDScript", "path": "res://addons/Godoxel/Util.gd" }, { "base": "Resource", -"class": "GameModule", -"language": "GDScript", +"class": @"GameModule", +"language": @"GDScript", "path": "res://scripts/game_modules/GameModule.gd" }, { "base": "EntityResource", -"class": "HealthResource", -"language": "GDScript", +"class": @"HealthResource", +"language": @"GDScript", "path": "res://scripts/resources/HealthResource.gd" }, { "base": "ItemTemplate", -"class": "ItemTemplateGD", -"language": "GDScript", +"class": @"ItemTemplateGD", +"language": @"GDScript", "path": "res://scripts/items/ItemTemplateGD.gd" }, { "base": "Node2D", -"class": "LayeredTextureMaker", -"language": "GDScript", +"class": @"LayeredTextureMaker", +"language": @"GDScript", "path": "res://tools/texture_tools/LayeredTextureMaker.gd" }, { "base": "Resource", -"class": "MMMateial", -"language": "GDScript", +"class": @"MMMateial", +"language": @"GDScript", "path": "res://addons/mat_maker_gd/nodes/mm_material.gd" }, { "base": "Resource", -"class": "MMNode", -"language": "GDScript", +"class": @"MMNode", +"language": @"GDScript", "path": "res://addons/mat_maker_gd/nodes/mm_node.gd" }, { "base": "Resource", -"class": "MMNodeUniversalProperty", -"language": "GDScript", +"class": @"MMNodeUniversalProperty", +"language": @"GDScript", "path": "res://addons/mat_maker_gd/nodes/mm_node_universal_property.gd" }, { "base": "Node", -"class": "Main", -"language": "GDScript", +"class": @"Main", +"language": @"GDScript", "path": "res://scenes/MainScene.gd" }, { "base": "EntityResource", -"class": "ManaResource", -"language": "GDScript", +"class": @"ManaResource", +"language": @"GDScript", "path": "res://scripts/resources/ManaResource.gd" }, { "base": "Control", -"class": "Menu", -"language": "GDScript", +"class": @"Menu", +"language": @"GDScript", "path": "res://scenes/menu/Menu.gd" }, { "base": "Entity", -"class": "MobGD", -"language": "GDScript", +"class": @"MobGD", +"language": @"GDScript", "path": "res://player/Mob.gd" }, { "base": "", -"class": "NetworkedPlayerGD", -"language": "GDScript", +"class": @"NetworkedPlayerGD", +"language": @"GDScript", "path": "res://player/NetworkedPlayer.gd" }, { "base": "Reference", -"class": "Palette", -"language": "GDScript", +"class": @"Palette", +"language": @"GDScript", "path": "res://addons/color-palette/Palette.gd" }, { "base": "Reference", -"class": "PaletteImporter", -"language": "GDScript", +"class": @"PaletteImporter", +"language": @"GDScript", "path": "res://addons/color-palette/PaletteImporter.gd" }, { "base": "", -"class": "PlayerGD", -"language": "GDScript", +"class": @"PlayerGD", +"language": @"GDScript", "path": "res://player/Player.gd" }, { "base": "Resource", -"class": "PlayerMaster", -"language": "GDScript", +"class": @"PlayerMaster", +"language": @"GDScript", "path": "res://scripts/networking/PlayerMaster.gd" }, { "base": "EntityResource", -"class": "SpeedResource", -"language": "GDScript", +"class": @"SpeedResource", +"language": @"GDScript", "path": "res://scripts/resources/SpeedResource.gd" }, { "base": "SpellEffectVisual", -"class": "SpellEffectVisualBasic", -"language": "GDScript", +"class": @"SpellEffectVisualBasic", +"language": @"GDScript", "path": "res://scripts/resources/spell_effect_visual_basic.gd" }, { "base": "Spell", -"class": "SpellGD", -"language": "GDScript", +"class": @"SpellGD", +"language": @"GDScript", "path": "res://scripts/spells/gd_spell_script.gd" }, { "base": "Resource", -"class": "SubZone", -"language": "GDScript", +"class": @"SubZone", +"language": @"GDScript", "path": "res://addons/world_generator/resources/subzone.gd" }, { "base": "TerrainLevelGenerator", -"class": "TerrainWorldGenerator", -"language": "GDScript", +"class": @"TerrainWorldGenerator", +"language": @"GDScript", "path": "res://scripts/world_generators/TerrainWorldGenerator.gd" }, { "base": "GameModule", -"class": "UIGuiChildModule", -"language": "GDScript", +"class": @"UIGuiChildModule", +"language": @"GDScript", "path": "res://scripts/game_modules/ui_gui_child_module.gd" }, { "base": "GameModule", -"class": "UIWindowModule", -"language": "GDScript", +"class": @"UIWindowModule", +"language": @"GDScript", "path": "res://scripts/game_modules/ui_window_module.gd" }, { "base": "Resource", -"class": "WorldGenBaseResource", -"language": "GDScript", +"class": @"WorldGenBaseResource", +"language": @"GDScript", "path": "res://addons/world_generator/resources/world_gen_base_resource.gd" }, { "base": "Reference", -"class": "WorldGenRaycast", -"language": "GDScript", +"class": @"WorldGenRaycast", +"language": @"GDScript", "path": "res://addons/world_generator/raycast/world_gen_raycast.gd" }, { "base": "Resource", -"class": "WorldGenWorld", -"language": "GDScript", +"class": @"WorldGenWorld", +"language": @"GDScript", "path": "res://addons/world_generator/resources/world_gen_world.gd" }, { "base": "Resource", -"class": "WorldGeneratorSettings", -"language": "GDScript", +"class": @"WorldGeneratorSettings", +"language": @"GDScript", "path": "res://addons/world_generator/resources/world_generator_settings.gd" }, { "base": "Resource", -"class": "Zone", -"language": "GDScript", +"class": @"Zone", +"language": @"GDScript", "path": "res://addons/world_generator/resources/zone.gd" } ] _global_script_class_icons={ -"BrushPrefabs": "", -"CharacterSkeketonAttachPoint": "", -"ColorTile": "", -"Continent": "", -"DisplayPlayerGD": "", -"EntityAIGD": "", -"EntityDataGD": "", -"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png", -"GEAction": "", -"GEBrighten": "", -"GEBrush": "", -"GEBucket": "", -"GECanvas": "", -"GECut": "", -"GEDarken": "", -"GELayer": "", -"GELine": "", -"GEMultiLine": "", -"GEPasteCut": "", -"GEPencil": "", -"GERainbow": "", -"GERect": "", -"GEUtils": "", -"GameModule": "", -"HealthResource": "", -"ItemTemplateGD": "", -"LayeredTextureMaker": "", -"MMMateial": "", -"MMNode": "", -"MMNodeUniversalProperty": "", -"Main": "", -"ManaResource": "", -"Menu": "", -"MobGD": "", -"NetworkedPlayerGD": "", -"Palette": "", -"PaletteImporter": "", -"PlayerGD": "", -"PlayerMaster": "", -"SpeedResource": "", -"SpellEffectVisualBasic": "", -"SpellGD": "", -"SubZone": "", -"TerrainWorldGenerator": "", -"UIGuiChildModule": "", -"UIWindowModule": "", -"WorldGenBaseResource": "", -"WorldGenRaycast": "", -"WorldGenWorld": "", -"WorldGeneratorSettings": "", -"Zone": "" +@"BrushPrefabs": "", +@"GEBrighten": "", +@"CharacterSkeketonAttachPoint": "", +@"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png", +@"GEBrush": "", +@"GECanvas": "", +@"GECut": "", +@"GameModule": "", +@"MMNode": "", +@"PlayerGD": "", +@"WorldGeneratorSettings": "", +@"GEDarken": "", +@"GELayer": "", +@"MobGD": "", +@"PaletteImporter": "", +@"PlayerMaster": "", +@"SpeedResource": "", +@"WorldGenRaycast": "", +@"Continent": "", +@"EntityAIGD": "", +@"EntityDataGD": "", +@"GEAction": "", +@"GEBucket": "", +@"GERect": "", +@"WorldGenWorld": "", +@"NetworkedPlayerGD": "", +@"SpellEffectVisualBasic": "", +@"SpellGD": "", +@"GELine": "", +@"TerrainWorldGenerator": "", +@"UIWindowModule": "", +@"Zone": "", +@"ColorTile": "", +@"GEPasteCut": "", +@"GEUtils": "", +@"Main": "", +@"ManaResource": "", +@"Menu": "", +@"UIGuiChildModule": "", +@"WorldGenBaseResource": "", +@"DisplayPlayerGD": "", +@"GERainbow": "", +@"HealthResource": "", +@"ItemTemplateGD": "", +@"MMNodeUniversalProperty": "", +@"SubZone": "", +@"GEMultiLine": "", +@"GEPencil": "", +@"LayeredTextureMaker": "", +@"MMMateial": "", +@"Palette": "" } [application] diff --git a/game/scripts/networking/PlayerMaster.gd b/game/scripts/networking/PlayerMaster.gd index d5086a34..646ad8d2 100644 --- a/game/scripts/networking/PlayerMaster.gd +++ b/game/scripts/networking/PlayerMaster.gd @@ -24,7 +24,7 @@ class_name PlayerMaster # Player info, associate ID to data var player_info = {} # Info we send to other players -var my_info = { name = "Testname", selected_class = 1 } +var my_info = { "name": "Testname", "selected_class": 1 } var sid : int var player : Entity