From e3b95842967a17a2079399ad589151bc42e53376 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 31 Jan 2022 22:54:53 +0100 Subject: [PATCH] Enabled the addons and fixed script error. --- .../addons/color-palette/icons/Add.svg.import | 1 + .../color-palette/icons/Filesystem.svg.import | 1 + .../color-palette/icons/Override.svg.import | 1 + .../color-palette/icons/Reload.svg.import | 1 + .../FlexGridContainerIcon.png.import | 1 + .../resources/world_gen_base_resource.gd | 14 ++-- game/project.godot | 64 ++++++++++++++++++- 7 files changed, 73 insertions(+), 10 deletions(-) diff --git a/game/addons/color-palette/icons/Add.svg.import b/game/addons/color-palette/icons/Add.svg.import index 88c02b7..5b43644 100644 --- a/game/addons/color-palette/icons/Add.svg.import +++ b/game/addons/color-palette/icons/Add.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/addons/color-palette/icons/Filesystem.svg.import b/game/addons/color-palette/icons/Filesystem.svg.import index 3b9af03..df9e3c1 100644 --- a/game/addons/color-palette/icons/Filesystem.svg.import +++ b/game/addons/color-palette/icons/Filesystem.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/addons/color-palette/icons/Override.svg.import b/game/addons/color-palette/icons/Override.svg.import index 99d7142..49a3f21 100644 --- a/game/addons/color-palette/icons/Override.svg.import +++ b/game/addons/color-palette/icons/Override.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/addons/color-palette/icons/Reload.svg.import b/game/addons/color-palette/icons/Reload.svg.import index 8246c45..daf86d0 100644 --- a/game/addons/color-palette/icons/Reload.svg.import +++ b/game/addons/color-palette/icons/Reload.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/addons/color-palette/utilities/FlexGridContainerIcon.png.import b/game/addons/color-palette/utilities/FlexGridContainerIcon.png.import index 8687fed..5900734 100644 --- a/game/addons/color-palette/utilities/FlexGridContainerIcon.png.import +++ b/game/addons/color-palette/utilities/FlexGridContainerIcon.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/addons/world_generator/resources/world_gen_base_resource.gd b/game/addons/world_generator/resources/world_gen_base_resource.gd index 0b3f9b9..41c19a7 100644 --- a/game/addons/world_generator/resources/world_gen_base_resource.gd +++ b/game/addons/world_generator/resources/world_gen_base_resource.gd @@ -91,17 +91,17 @@ func duplicate_content_entry(entry : WorldGenBaseResource, add : bool = true) -> return de -func setup_terra_library(library : TerramanLibrary, pseed : int) -> void: +func setup_terra_library(library, pseed : int) -> void: _setup_terra_library(library, pseed) for c in get_content(): if c: c.setup_terra_library(library, pseed) -func _setup_terra_library(library : TerramanLibrary, pseed : int) -> void: +func _setup_terra_library(library, pseed : int) -> void: pass -func generate_terra_chunk(chunk: TerraChunk, pseed : int, spawn_mobs: bool) -> void: +func generate_terra_chunk(chunk, pseed : int, spawn_mobs: bool) -> void: var p : Vector2 = Vector2(chunk.get_position_x(), chunk.get_position_z()) var stack : Array = get_hit_stack(p) @@ -113,13 +113,11 @@ func generate_terra_chunk(chunk: TerraChunk, pseed : int, spawn_mobs: bool) -> v for i in range(stack.size()): stack[i]._generate_terra_chunk(chunk, pseed, spawn_mobs, stack, i) -func _generate_terra_chunk(chunk: TerraChunk, pseed : int, spawn_mobs: bool, stack : Array, stack_index : int) -> void: +func _generate_terra_chunk(chunk, pseed : int, spawn_mobs: bool, stack : Array, stack_index : int) -> void: pass -func _generate_terra_chunk_fallback(chunk: TerraChunk, pseed : int, spawn_mobs: bool) -> void: - chunk.channel_ensure_allocated(TerraChunkDefault.DEFAULT_CHANNEL_TYPE, 1) - chunk.channel_ensure_allocated(TerraChunkDefault.DEFAULT_CHANNEL_ISOLEVEL, 1) - chunk.set_voxel(1, 0, 0, TerraChunkDefault.DEFAULT_CHANNEL_ISOLEVEL) +func _generate_terra_chunk_fallback(chunk, pseed : int, spawn_mobs: bool) -> void: + pass func generate_map(pseed : int) -> Image: var img : Image = Image.new() diff --git a/game/project.godot b/game/project.godot index 1cdab70..f8f6436 100644 --- a/game/project.godot +++ b/game/project.godot @@ -34,6 +34,16 @@ _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", +"path": "res://addons/world_generator/resources/continent.gd" +}, { "base": "Entity", "class": "DisplayPlayerGD", "language": "GDScript", @@ -49,6 +59,11 @@ _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": "Node", "class": "GEAction", "language": "GDScript", @@ -344,6 +359,16 @@ _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", @@ -369,6 +394,11 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://scripts/spells/gd_spell_script.gd" }, { +"base": "Resource", +"class": "SubZone", +"language": "GDScript", +"path": "res://addons/world_generator/resources/subzone.gd" +}, { "base": "GameModule", "class": "UIGuiChildModule", "language": "GDScript", @@ -378,6 +408,26 @@ _global_script_classes=[ { "class": "UIWindowModule", "language": "GDScript", "path": "res://scripts/game_modules/ui_window_module.gd" +}, { +"base": "Resource", +"class": "WorldGenBaseResource", +"language": "GDScript", +"path": "res://addons/world_generator/resources/world_gen_base_resource.gd" +}, { +"base": "Resource", +"class": "WorldGenWorld", +"language": "GDScript", +"path": "res://addons/world_generator/resources/world_gen_world.gd" +}, { +"base": "Resource", +"class": "WorldGeneratorSettings", +"language": "GDScript", +"path": "res://addons/world_generator/resources/world_generator_settings.gd" +}, { +"base": "Resource", +"class": "Zone", +"language": "GDScript", +"path": "res://addons/world_generator/resources/zone.gd" } ] _global_script_class_icons={ "BrushPrefabs": "", @@ -385,9 +435,12 @@ _global_script_class_icons={ "CharacterAtlasEntry2D": "", "CharacterSkeketonAttachPoint": "", "CharacterSkeleton2DGD": "", +"ColorTile": "", +"Continent": "", "DisplayPlayerGD": "", "EntityAIGD": "", "EntityDataGD": "", +"FlexGridContainer": "res://addons/color-palette/utilities/FlexGridContainerIcon.png", "GEAction": "", "GEBrighten": "", "GEBrush": "", @@ -447,13 +500,20 @@ _global_script_class_icons={ "Menu": "", "MobGD": "", "NetworkedPlayerGD": "", +"Palette": "", +"PaletteImporter": "", "PlayerGD": "", "PlayerMaster": "", "SpeedResource": "", "SpellEffectVisualBasic": "", "SpellGD": "", +"SubZone": "", "UIGuiChildModule": "", -"UIWindowModule": "" +"UIWindowModule": "", +"WorldGenBaseResource": "", +"WorldGenWorld": "", +"WorldGeneratorSettings": "", +"Zone": "" } Node="input/actionbar_5_11" @@ -497,7 +557,7 @@ window/size/ui_scale_touch=1.0 [editor_plugins] -enabled=PoolStringArray( "res://addons/Godoxel/plugin.cfg", "res://addons/mat_maker_gd/plugin.cfg", "res://addons/tile_generator/plugin.cfg" ) +enabled=PoolStringArray( "res://addons/Godoxel/plugin.cfg", "res://addons/color-palette/plugin.cfg", "res://addons/data_manager/plugin.cfg", "res://addons/mat_maker_gd/plugin.cfg", "res://addons/tile_generator/plugin.cfg", "res://addons/world_generator/plugin.cfg" ) [ess]