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

Update WorldGenerator to the latest.

Browse Source
This commit is contained in:
Relintai 2020-07-10 02:40:12 +02:00
parent dc885e5300
commit 149d7f4bb2
16 changed files with 56 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "07b24de868457c0a190c88771e99ff09e5451c3b", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c10d7b7b8cb83e233cffd524f4931988208eb14a"}, "entity_spell_system": {"master": "ce2d652456b3bfb682433d69c2719c71ace56c7c"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "dee38b1588ef3224cf8022eaf227e1dcaead6277"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "85417ebee9198be3cd7cc643e0e0e934db64a620"}, "procedural_animations": {"master": "9226d21781ea05828570e592874aa319df0dc53d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "544654f49b13af2d25ac14152c8a5014474e6333"}, "mesh_utils": {"master": "4f69ec67b861ce4475cfd17946dfaa586c888d94"}, "broken_seals_module": {"master": "0e5c54a70f8e90f95cbf11419b959a5f67562d48"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}}
{"engine": {"3.2": "07b24de868457c0a190c88771e99ff09e5451c3b", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "9a4f9f9809cb4da6d0196a9b37ea480e3cd0c400"}, "entity_spell_system": {"master": "ce2d652456b3bfb682433d69c2719c71ace56c7c"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "dee38b1588ef3224cf8022eaf227e1dcaead6277"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "85417ebee9198be3cd7cc643e0e0e934db64a620"}, "procedural_animations": {"master": "9226d21781ea05828570e592874aa319df0dc53d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "544654f49b13af2d25ac14152c8a5014474e6333"}, "mesh_utils": {"master": "4f69ec67b861ce4475cfd17946dfaa586c888d94"}, "broken_seals_module": {"master": "0e5c54a70f8e90f95cbf11419b959a5f67562d48"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}}

5
game/modules/planets/test_planet/1_tdungeon.tres
View File

@ -1,10 +1,9 @@
[gd_resource type="PlanetData" load_steps=3 format=2]
[ext_resource path="res://modules/planets/test_planet/biomes/2_tdungb.tres" type="BiomeData" id=1]
[ext_resource path="res://modules/planets/test_planet/planets/dung_simple_planet.gd" type="Script" id=2]
[ext_resource path="res://modules/planets/test_planet/planets/simple_planet.tres" type="Planet" id=2]
[resource]
id = 1
target_script = ExtResource( 2 )
planet = ExtResource( 2 )
biome_datas = [ ExtResource( 1 ) ]

7
game/modules/planets/test_planet/biomes/1_test.tres
View File

@ -1,10 +1,7 @@
[gd_resource type="BiomeData" load_steps=2 format=2]
[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome.gd" type="Script" id=1]
[ext_resource path="res://modules/planets/test_planet/biomes/biome1.tres" type="BiomeBase" id=1]
[resource]
target_script = ExtResource( 1 )
biome = ExtResource( 1 )
voxel_surfaces = [ null, null, null, null ]

5
game/modules/planets/test_planet/biomes/2_tdungb.tres
View File

@ -1,10 +1,9 @@
[gd_resource type="BiomeData" load_steps=3 format=2]
[ext_resource path="res://modules/planets/test_planet/dungeons/1_test.tres" type="DungeonData" id=1]
[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome.gd" type="Script" id=2]
[ext_resource path="res://modules/planets/test_planet/biomes/biome1.tres" type="BiomeBase" id=2]
[resource]
target_script = ExtResource( 2 )
biome = ExtResource( 2 )
dungeon_datas = [ ExtResource( 1 ) ]
voxel_surfaces = [ null, null, null, null ]

6
game/modules/planets/test_planet/biomes/biome1.tres Normal file
View File

@ -0,0 +1,6 @@
[gd_resource type="BiomeBase" load_steps=2 format=2]
[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome.gd" type="Script" id=1]
[resource]
script = ExtResource( 1 )

5
game/modules/planets/test_planet/dungeon_rooms/1_test.tres
View File

@ -1,3 +1,6 @@
[gd_resource type="DungeonRoomData" format=2]
[gd_resource type="DungeonRoomData" load_steps=2 format=2]
[ext_resource path="res://modules/planets/test_planet/dungeon_rooms/dungeon_room.tres" type="DungeonRoom" id=1]
[resource]
dungeon_room = ExtResource( 1 )

5
game/modules/planets/test_planet/dungeon_rooms/2_test_start_room.tres
View File

@ -1,7 +1,6 @@
[gd_resource type="DungeonRoomData" load_steps=2 format=2]
[ext_resource path="res://modules/planets/test_planet/dungeon_start_rooms/start_room.gd" type="Script" id=1]
[ext_resource path="res://modules/planets/test_planet/dungeon_rooms/dungeon_room.tres" type="DungeonRoom" id=1]
[resource]
target_script = ExtResource( 1 )
dungeon_room = ExtResource( 1 )

3
game/modules/planets/test_planet/dungeon_rooms/dungeon_room.tres Normal file
View File

@ -0,0 +1,3 @@
[gd_resource type="DungeonRoom" format=2]
[resource]

6
game/modules/planets/test_planet/dungeon_start_rooms/start_room.tres Normal file
View File

@ -0,0 +1,6 @@
[gd_resource type="DungeonRoom" load_steps=2 format=2]
[ext_resource path="res://modules/planets/test_planet/dungeon_start_rooms/start_room.gd" type="Script" id=1]
[resource]
script = ExtResource( 1 )

5
game/modules/planets/test_planet/dungeons/1_test.tres
View File

@ -1,9 +1,8 @@
[gd_resource type="DungeonData" load_steps=3 format=2]
[ext_resource path="res://modules/planets/test_planet/dungeons/dungeon.gd" type="Script" id=1]
[ext_resource path="res://modules/planets/test_planet/dungeons/dungeon.tres" type="Dungeon" id=1]
[ext_resource path="res://modules/planets/test_planet/dungeon_rooms/2_test_start_room.tres" type="DungeonRoomData" id=2]
[resource]
target_script = ExtResource( 1 )
dungeon = ExtResource( 1 )
dungeon_start_room_datas = [ ExtResource( 2 ) ]

14
game/modules/planets/test_planet/dungeons/dungeon.gd
View File

@ -28,18 +28,8 @@ func _setup():
var drd : DungeonRoomData = data.get_dungeon_start_room_data(0)
var dung : DungeonRoom
if drd.target_script != null:
dung = drd.target_script.new()
if dung == null:
print("drd is null. wrong type? " + drd.resource_path)
return
elif drd.target_class_name != "":
if not ClassDB.class_exists(drd.target_class_name):
print("class doesnt exists" + drd.resource_path)
return
dung = ClassDB.instance(drd.target_class_name)
if drd.dungeon_room != null:
dung = drd.dungeon_room.duplicate()
else:
dung = DungeonRoom.new()

6
game/modules/planets/test_planet/dungeons/dungeon.tres Normal file
View File

@ -0,0 +1,6 @@
[gd_resource type="Dungeon" load_steps=2 format=2]
[ext_resource path="res://modules/planets/test_planet/dungeons/dungeon.gd" type="Script" id=1]
[resource]
script = ExtResource( 1 )

6
game/modules/planets/test_planet/planets/debug_simple_planet.tres Normal file
View File

@ -0,0 +1,6 @@
[gd_resource type="Planet" load_steps=2 format=2]
[ext_resource path="res://modules/planets/test_planet/planets/dung_simple_planet.gd" type="Script" id=1]
[resource]
script = ExtResource( 1 )

28
game/modules/planets/test_planet/planets/dung_simple_planet.gd
View File

@ -32,18 +32,8 @@ func _setup():
var b : Biome
if bdata.target_script != null:
b = bdata.target_script.new()
if b == null:
print("biome is null. wrong type? " + bdata.resource_path)
return
elif bdata.target_class_name != "":
if not ClassDB.class_exists(bdata.target_class_name):
print("class doesnt exists" + bdata.resource_path)
return
b = ClassDB.instance(bdata.target_class_name)
if bdata.biome != null:
b = bdata.biome.duplicate()
else:
b = Biome.new()
@ -58,18 +48,8 @@ func _setup():
var dd : DungeonData = bdata.get_dungeon_data(0)
var dung : Dungeon
if dd.target_script != null:
dung = dd.target_script.new()
if dung == null:
print("dd is null. wrong type? " + dd.resource_path)
return
elif dd.target_class_name != "":
if not ClassDB.class_exists(dd.target_class_name):
print("class doesnt exists" + dd.resource_path)
return
dung = ClassDB.instance(dd.target_class_name)
if dd.dungeon != null:
dung = dd.dungeon.duplicate()
else:
dung = Dungeon.new()

6
game/modules/planets/test_planet/planets/simple_planet.tres Normal file
View File

@ -0,0 +1,6 @@
[gd_resource type="Planet" load_steps=2 format=2]
[ext_resource path="res://modules/planets/test_planet/planets/dung_simple_planet.gd" type="Script" id=1]
[resource]
script = ExtResource( 1 )

14
game/scripts/world_generators/MainPlanetGenerator.gd
View File

@ -67,18 +67,8 @@ func create_planet():
print("planet loaded: " + planet_data.resource_path)
if planet_data.target_script != null:
_planet = planet_data.target_script.new()
if _planet == null:
print("_planet is null. wrong type? " + planet_data.resource_path)
return
elif planet_data.target_class_name != "":
if not ClassDB.class_exists(planet_data.target_class_name):
print("class doesnt exists" + planet_data.resource_path)
return
_planet = ClassDB.instance(planet_data.target_class_name)
if planet_data.planet != null:
_planet = planet_data.planet.duplicate()
else:
_planet = Planet.new()