Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2025-01-22 02:17:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated the engine. I added Vector2i, Vector3i, Rect2i, PoolVector2i, PoolVector3i, and StringName support for variants. Also smaller improvements, and backports.

Browse Source
This commit is contained in:
Relintai 2022-03-22 02:14:33 +01:00
parent 31ef84435e
commit f0b6dfa434
4 changed files with 169 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -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"}} {"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"}}

24
game/addons/data_manager/resources/data_manager_addon_settings.gd
View File

@ -27,12 +27,14 @@ func folder_get_name(index : int) -> String:
func folder_get_type(index : int) -> String: func folder_get_type(index : int) -> String:
return folders[index].type return folders[index].type
func _get(property): func _get(property : StringName):
if property == "folder_count": var sprop : String = property
if sprop == "folder_count":
return folders.size() return folders.size()
if property.begins_with("folders/"): if sprop.begins_with("folders/"):
var sindex : String = property.get_slice("/", 1) var sindex : String = sprop.get_slice("/", 1)
if sindex == "": if sindex == "":
return null return null
@ -42,7 +44,7 @@ func _get(property):
if index < 0 || index >= folders.size(): if index < 0 || index >= folders.size():
return null return null
var p : String = property.get_slice("/", 2) var p : String = sprop.get_slice("/", 2)
if p == "folder": if p == "folder":
return folders[index].folder return folders[index].folder
@ -57,16 +59,18 @@ func _get(property):
return null return null
func _set(property, val): func _set(property : StringName, val) -> bool:
var sprop : String = property
if property == "folder_count": if property == "folder_count":
set_folder_count(val) set_folder_count(val)
return true return true
if property.begins_with("folders/"): if sprop.begins_with("folders/"):
var sindex : String = property.get_slice("/", 1) var sindex : String = sprop.get_slice("/", 1)
if sindex == "": if sindex == "":
return null return false
var index : int = sindex.to_int() var index : int = sindex.to_int()
@ -76,7 +80,7 @@ func _set(property, val):
if index >= folders.size(): if index >= folders.size():
return false return false
var p : String = property.get_slice("/", 2) var p : String = sprop.get_slice("/", 2)
if p == "folder": if p == "folder":
folders[index].folder = val folders[index].folder = val

306
game/project.godot
View File

@ -11,312 +11,312 @@ config_version=4
Node="input/actionbar_5_11" Node="input/actionbar_5_11"
_global_script_classes=[ { _global_script_classes=[ {
"base": "Reference", "base": "Reference",
"class": "BrushPrefabs", "class": @"BrushPrefabs",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/BrushPrefabs.gd" "path": "res://addons/Godoxel/BrushPrefabs.gd"
}, { }, {
"base": "Spatial", "base": "Spatial",
"class": "CharacterSkeketonAttachPoint", "class": @"CharacterSkeketonAttachPoint",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/CharacterSkeletonAttachPoint.gd" "path": "res://player/CharacterSkeletonAttachPoint.gd"
}, { }, {
"base": "ColorRect", "base": "ColorRect",
"class": "ColorTile", "class": @"ColorTile",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/color-palette/ColorTile.gd" "path": "res://addons/color-palette/ColorTile.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "Continent", "class": @"Continent",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/continent.gd" "path": "res://addons/world_generator/resources/continent.gd"
}, { }, {
"base": "Entity", "base": "Entity",
"class": "DisplayPlayerGD", "class": @"DisplayPlayerGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/DisplayPlayer.gd" "path": "res://player/DisplayPlayer.gd"
}, { }, {
"base": "EntityAI", "base": "EntityAI",
"class": "EntityAIGD", "class": @"EntityAIGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/ai/EntityAIGD.gd" "path": "res://scripts/ai/EntityAIGD.gd"
}, { }, {
"base": "EntityData", "base": "EntityData",
"class": "EntityDataGD", "class": @"EntityDataGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/entities/EntityDataGD.gd" "path": "res://scripts/entities/EntityDataGD.gd"
}, { }, {
"base": "Container", "base": "Container",
"class": "FlexGridContainer", "class": @"FlexGridContainer",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/color-palette/utilities/FlexGridContainer.gd" "path": "res://addons/color-palette/utilities/FlexGridContainer.gd"
}, { }, {
"base": "Node", "base": "Node",
"class": "GEAction", "class": @"GEAction",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Action.gd" "path": "res://addons/Godoxel/actions/Action.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEBrighten", "class": @"GEBrighten",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Brighten.gd" "path": "res://addons/Godoxel/actions/Brighten.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEBrush", "class": @"GEBrush",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Brush.gd" "path": "res://addons/Godoxel/actions/Brush.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEBucket", "class": @"GEBucket",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Bucket.gd" "path": "res://addons/Godoxel/actions/Bucket.gd"
}, { }, {
"base": "Control", "base": "Control",
"class": "GECanvas", "class": @"GECanvas",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/Canvas.gd" "path": "res://addons/Godoxel/Canvas.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GECut", "class": @"GECut",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Cut.gd" "path": "res://addons/Godoxel/actions/Cut.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEDarken", "class": @"GEDarken",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Darken.gd" "path": "res://addons/Godoxel/actions/Darken.gd"
}, { }, {
"base": "Reference", "base": "Reference",
"class": "GELayer", "class": @"GELayer",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/Layer.gd" "path": "res://addons/Godoxel/Layer.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GELine", "class": @"GELine",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Line.gd" "path": "res://addons/Godoxel/actions/Line.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEMultiLine", "class": @"GEMultiLine",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/MultiLine.gd" "path": "res://addons/Godoxel/actions/MultiLine.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEPasteCut", "class": @"GEPasteCut",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/PasteCut.gd" "path": "res://addons/Godoxel/actions/PasteCut.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GEPencil", "class": @"GEPencil",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Pencil.gd" "path": "res://addons/Godoxel/actions/Pencil.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GERainbow", "class": @"GERainbow",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Rainbow.gd" "path": "res://addons/Godoxel/actions/Rainbow.gd"
}, { }, {
"base": "GEAction", "base": "GEAction",
"class": "GERect", "class": @"GERect",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/actions/Rect.gd" "path": "res://addons/Godoxel/actions/Rect.gd"
}, { }, {
"base": "Node", "base": "Node",
"class": "GEUtils", "class": @"GEUtils",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/Godoxel/Util.gd" "path": "res://addons/Godoxel/Util.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "GameModule", "class": @"GameModule",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/game_modules/GameModule.gd" "path": "res://scripts/game_modules/GameModule.gd"
}, { }, {
"base": "EntityResource", "base": "EntityResource",
"class": "HealthResource", "class": @"HealthResource",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/resources/HealthResource.gd" "path": "res://scripts/resources/HealthResource.gd"
}, { }, {
"base": "ItemTemplate", "base": "ItemTemplate",
"class": "ItemTemplateGD", "class": @"ItemTemplateGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/items/ItemTemplateGD.gd" "path": "res://scripts/items/ItemTemplateGD.gd"
}, { }, {
"base": "Node2D", "base": "Node2D",
"class": "LayeredTextureMaker", "class": @"LayeredTextureMaker",
"language": "GDScript", "language": @"GDScript",
"path": "res://tools/texture_tools/LayeredTextureMaker.gd" "path": "res://tools/texture_tools/LayeredTextureMaker.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "MMMateial", "class": @"MMMateial",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/mat_maker_gd/nodes/mm_material.gd" "path": "res://addons/mat_maker_gd/nodes/mm_material.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "MMNode", "class": @"MMNode",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/mat_maker_gd/nodes/mm_node.gd" "path": "res://addons/mat_maker_gd/nodes/mm_node.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "MMNodeUniversalProperty", "class": @"MMNodeUniversalProperty",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/mat_maker_gd/nodes/mm_node_universal_property.gd" "path": "res://addons/mat_maker_gd/nodes/mm_node_universal_property.gd"
}, { }, {
"base": "Node", "base": "Node",
"class": "Main", "class": @"Main",
"language": "GDScript", "language": @"GDScript",
"path": "res://scenes/MainScene.gd" "path": "res://scenes/MainScene.gd"
}, { }, {
"base": "EntityResource", "base": "EntityResource",
"class": "ManaResource", "class": @"ManaResource",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/resources/ManaResource.gd" "path": "res://scripts/resources/ManaResource.gd"
}, { }, {
"base": "Control", "base": "Control",
"class": "Menu", "class": @"Menu",
"language": "GDScript", "language": @"GDScript",
"path": "res://scenes/menu/Menu.gd" "path": "res://scenes/menu/Menu.gd"
}, { }, {
"base": "Entity", "base": "Entity",
"class": "MobGD", "class": @"MobGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/Mob.gd" "path": "res://player/Mob.gd"
}, { }, {
"base": "", "base": "",
"class": "NetworkedPlayerGD", "class": @"NetworkedPlayerGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/NetworkedPlayer.gd" "path": "res://player/NetworkedPlayer.gd"
}, { }, {
"base": "Reference", "base": "Reference",
"class": "Palette", "class": @"Palette",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/color-palette/Palette.gd" "path": "res://addons/color-palette/Palette.gd"
}, { }, {
"base": "Reference", "base": "Reference",
"class": "PaletteImporter", "class": @"PaletteImporter",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/color-palette/PaletteImporter.gd" "path": "res://addons/color-palette/PaletteImporter.gd"
}, { }, {
"base": "", "base": "",
"class": "PlayerGD", "class": @"PlayerGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/Player.gd" "path": "res://player/Player.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "PlayerMaster", "class": @"PlayerMaster",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/networking/PlayerMaster.gd" "path": "res://scripts/networking/PlayerMaster.gd"
}, { }, {
"base": "EntityResource", "base": "EntityResource",
"class": "SpeedResource", "class": @"SpeedResource",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/resources/SpeedResource.gd" "path": "res://scripts/resources/SpeedResource.gd"
}, { }, {
"base": "SpellEffectVisual", "base": "SpellEffectVisual",
"class": "SpellEffectVisualBasic", "class": @"SpellEffectVisualBasic",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/resources/spell_effect_visual_basic.gd" "path": "res://scripts/resources/spell_effect_visual_basic.gd"
}, { }, {
"base": "Spell", "base": "Spell",
"class": "SpellGD", "class": @"SpellGD",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/spells/gd_spell_script.gd" "path": "res://scripts/spells/gd_spell_script.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "SubZone", "class": @"SubZone",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/subzone.gd" "path": "res://addons/world_generator/resources/subzone.gd"
}, { }, {
"base": "TerrainLevelGenerator", "base": "TerrainLevelGenerator",
"class": "TerrainWorldGenerator", "class": @"TerrainWorldGenerator",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/world_generators/TerrainWorldGenerator.gd" "path": "res://scripts/world_generators/TerrainWorldGenerator.gd"
}, { }, {
"base": "GameModule", "base": "GameModule",
"class": "UIGuiChildModule", "class": @"UIGuiChildModule",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/game_modules/ui_gui_child_module.gd" "path": "res://scripts/game_modules/ui_gui_child_module.gd"
}, { }, {
"base": "GameModule", "base": "GameModule",
"class": "UIWindowModule", "class": @"UIWindowModule",
"language": "GDScript", "language": @"GDScript",
"path": "res://scripts/game_modules/ui_window_module.gd" "path": "res://scripts/game_modules/ui_window_module.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "WorldGenBaseResource", "class": @"WorldGenBaseResource",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/world_gen_base_resource.gd" "path": "res://addons/world_generator/resources/world_gen_base_resource.gd"
}, { }, {
"base": "Reference", "base": "Reference",
"class": "WorldGenRaycast", "class": @"WorldGenRaycast",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/raycast/world_gen_raycast.gd" "path": "res://addons/world_generator/raycast/world_gen_raycast.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "WorldGenWorld", "class": @"WorldGenWorld",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/world_gen_world.gd" "path": "res://addons/world_generator/resources/world_gen_world.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "WorldGeneratorSettings", "class": @"WorldGeneratorSettings",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/world_generator_settings.gd" "path": "res://addons/world_generator/resources/world_generator_settings.gd"
}, { }, {
"base": "Resource", "base": "Resource",
"class": "Zone", "class": @"Zone",
"language": "GDScript", "language": @"GDScript",
"path": "res://addons/world_generator/resources/zone.gd" "path": "res://addons/world_generator/resources/zone.gd"
} ] } ]
_global_script_class_icons={ _global_script_class_icons={
"BrushPrefabs": "", @"BrushPrefabs": "",
"CharacterSkeketonAttachPoint": "", @"GEBrighten": "",
"ColorTile": "", @"CharacterSkeketonAttachPoint": "",
"Continent": "", @"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png",
"DisplayPlayerGD": "", @"GEBrush": "",
"EntityAIGD": "", @"GECanvas": "",
"EntityDataGD": "", @"GECut": "",
"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png", @"GameModule": "",
"GEAction": "", @"MMNode": "",
"GEBrighten": "", @"PlayerGD": "",
"GEBrush": "", @"WorldGeneratorSettings": "",
"GEBucket": "", @"GEDarken": "",
"GECanvas": "", @"GELayer": "",
"GECut": "", @"MobGD": "",
"GEDarken": "", @"PaletteImporter": "",
"GELayer": "", @"PlayerMaster": "",
"GELine": "", @"SpeedResource": "",
"GEMultiLine": "", @"WorldGenRaycast": "",
"GEPasteCut": "", @"Continent": "",
"GEPencil": "", @"EntityAIGD": "",
"GERainbow": "", @"EntityDataGD": "",
"GERect": "", @"GEAction": "",
"GEUtils": "", @"GEBucket": "",
"GameModule": "", @"GERect": "",
"HealthResource": "", @"WorldGenWorld": "",
"ItemTemplateGD": "", @"NetworkedPlayerGD": "",
"LayeredTextureMaker": "", @"SpellEffectVisualBasic": "",
"MMMateial": "", @"SpellGD": "",
"MMNode": "", @"GELine": "",
"MMNodeUniversalProperty": "", @"TerrainWorldGenerator": "",
"Main": "", @"UIWindowModule": "",
"ManaResource": "", @"Zone": "",
"Menu": "", @"ColorTile": "",
"MobGD": "", @"GEPasteCut": "",
"NetworkedPlayerGD": "", @"GEUtils": "",
"Palette": "", @"Main": "",
"PaletteImporter": "", @"ManaResource": "",
"PlayerGD": "", @"Menu": "",
"PlayerMaster": "", @"UIGuiChildModule": "",
"SpeedResource": "", @"WorldGenBaseResource": "",
"SpellEffectVisualBasic": "", @"DisplayPlayerGD": "",
"SpellGD": "", @"GERainbow": "",
"SubZone": "", @"HealthResource": "",
"TerrainWorldGenerator": "", @"ItemTemplateGD": "",
"UIGuiChildModule": "", @"MMNodeUniversalProperty": "",
"UIWindowModule": "", @"SubZone": "",
"WorldGenBaseResource": "", @"GEMultiLine": "",
"WorldGenRaycast": "", @"GEPencil": "",
"WorldGenWorld": "", @"LayeredTextureMaker": "",
"WorldGeneratorSettings": "", @"MMMateial": "",
"Zone": "" @"Palette": ""
} }
[application] [application]

2
game/scripts/networking/PlayerMaster.gd
View File

@ -24,7 +24,7 @@ class_name PlayerMaster
# Player info, associate ID to data # Player info, associate ID to data
var player_info = {} var player_info = {}
# Info we send to other players # 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 sid : int
var player : Entity var player : Entity