From 69b7cbb388fb07cdf5f220b84934e2d9ea4a687c Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 27 Dec 2021 17:13:29 +0100 Subject: [PATCH] Removed the World Generator engine module. --- game/modules/dungeon/MainDungeon.gd | 16 ---------------- .../planets/test_planet/dungeons/1_test.tres | 2 +- .../planets/test_planet/dungeons/dungeon.tres | 2 +- .../planets/test_planet/dungeons/dungeon_l2.tres | 2 +- .../test_planet/dungeons/vman_dungeon.tres | 2 +- module_config.py | 2 +- 6 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 game/modules/dungeon/MainDungeon.gd diff --git a/game/modules/dungeon/MainDungeon.gd b/game/modules/dungeon/MainDungeon.gd deleted file mode 100644 index 7972bd94..00000000 --- a/game/modules/dungeon/MainDungeon.gd +++ /dev/null @@ -1,16 +0,0 @@ -extends Building - - -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" - - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass diff --git a/game/modules/planets/test_planet/dungeons/1_test.tres b/game/modules/planets/test_planet/dungeons/1_test.tres index d37c8552..20af6e3b 100644 --- a/game/modules/planets/test_planet/dungeons/1_test.tres +++ b/game/modules/planets/test_planet/dungeons/1_test.tres @@ -1,3 +1,3 @@ -[gd_resource type="Building" format=2] +[gd_resource type="Resource" format=2] [resource] diff --git a/game/modules/planets/test_planet/dungeons/dungeon.tres b/game/modules/planets/test_planet/dungeons/dungeon.tres index e07ebf60..6e74f7d1 100644 --- a/game/modules/planets/test_planet/dungeons/dungeon.tres +++ b/game/modules/planets/test_planet/dungeons/dungeon.tres @@ -1,4 +1,4 @@ -[gd_resource type="Building" load_steps=12 format=2] +[gd_resource type="Resource" load_steps=12 format=2] [ext_resource path="res://modules/planets/test_planet/dungeons/dungeon.gd" type="Script" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.gltf" type="MeshDataResource" id=2] diff --git a/game/modules/planets/test_planet/dungeons/dungeon_l2.tres b/game/modules/planets/test_planet/dungeons/dungeon_l2.tres index dbbf7cdf..60a9d20f 100644 --- a/game/modules/planets/test_planet/dungeons/dungeon_l2.tres +++ b/game/modules/planets/test_planet/dungeons/dungeon_l2.tres @@ -1,4 +1,4 @@ -[gd_resource type="Building" load_steps=12 format=2] +[gd_resource type="Resource" load_steps=12 format=2] [ext_resource path="res://modules/planets/test_planet/dungeons/dungeon.gd" type="Script" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.gltf" type="MeshDataResource" id=2] diff --git a/game/modules/planets/test_planet/dungeons/vman_dungeon.tres b/game/modules/planets/test_planet/dungeons/vman_dungeon.tres index 47bf4ace..41b27273 100644 --- a/game/modules/planets/test_planet/dungeons/vman_dungeon.tres +++ b/game/modules/planets/test_planet/dungeons/vman_dungeon.tres @@ -1,4 +1,4 @@ -[gd_resource type="Building" load_steps=3 format=2] +[gd_resource type="Resource" load_steps=3 format=2] [ext_resource path="res://modules/planets/test_planet/dungeons/vman_dungeon.gd" type="Script" id=1] [ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.tscn" type="PackedScene" id=2] diff --git a/module_config.py b/module_config.py index 2a2ec7c4..fede05cc 100644 --- a/module_config.py +++ b/module_config.py @@ -4,7 +4,6 @@ godot_branch = '3.x' engine_repository = [ ['https://github.com/Relintai/godot.git', 'git@github.com:Relintai/godot.git'], 'engine', '' ] module_repositories = [ - [ ['https://github.com/Relintai/world_generator.git', 'git@github.com:Relintai/world_generator.git'], 'world_generator', '' ], [ ['https://github.com/Relintai/entity_spell_system.git', 'git@github.com:Relintai/entity_spell_system.git'], 'entity_spell_system', '' ], [ ['https://github.com/Relintai/ui_extensions.git', 'git@github.com:Relintai/ui_extensions.git'], 'ui_extensions', '' ], [ ['https://github.com/Relintai/texture_packer.git', 'git@github.com:Relintai/texture_packer.git'], 'texture_packer', '' ], @@ -20,6 +19,7 @@ module_repositories = [ removed_modules = [ [ ['https://github.com/Relintai/voxelman.git', 'git@github.com:Relintai/voxelman.git'], 'voxelman', '' ], [ ['https://github.com/Relintai/procedural_animations.git', 'git@github.com:Relintai/procedural_animations.git'], 'procedural_animations', '' ], + [ ['https://github.com/Relintai/world_generator.git', 'git@github.com:Relintai/world_generator.git'], 'world_generator', '' ], ] addon_repositories = [