mirror of
https://github.com/Relintai/broken_seals.git
synced 2025-01-08 01:49:35 +01:00
Removed most of the old world generator. only kept a few classes around, these now inherit from resource.
This commit is contained in:
parent
3ef478074f
commit
0ed5e814b8
@ -1,9 +0,0 @@
|
||||
[gd_resource type="Planet" load_steps=3 format=2]
|
||||
|
||||
[ext_resource path="res://modules/planets/test_planet/planets/dung_simple_planet.gd" type="Script" id=1]
|
||||
[ext_resource path="res://modules/planets/test_planet/biomes/2_tdungb.tres" type="Biome" id=2]
|
||||
|
||||
[resource]
|
||||
id = 1
|
||||
biomes = [ ExtResource( 2 ) ]
|
||||
script = ExtResource( 1 )
|
||||
@ -1,9 +0,0 @@
|
||||
[gd_resource type="Planet" load_steps=3 format=2]
|
||||
|
||||
[ext_resource path="res://modules/planets/test_planet/planets/dung_simple_planet.gd" type="Script" id=1]
|
||||
[ext_resource path="res://modules/planets/test_planet/biomes/1_test.tres" type="Biome" id=2]
|
||||
|
||||
[resource]
|
||||
id = 1
|
||||
biomes = [ ExtResource( 2 ) ]
|
||||
script = ExtResource( 1 )
|
||||
@ -1,8 +0,0 @@
|
||||
[gd_resource type="Biome" load_steps=3 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/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="PropData" id=2]
|
||||
|
||||
[resource]
|
||||
script = ExtResource( 1 )
|
||||
prop_tree = ExtResource( 2 )
|
||||
@ -1,14 +0,0 @@
|
||||
[gd_resource type="Biome" load_steps=6 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/villages/village.tres" type="Building" id=2]
|
||||
[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="PropData" id=3]
|
||||
[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2.tres" type="PropData" id=4]
|
||||
[ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.tscn" type="PackedScene" id=5]
|
||||
|
||||
[resource]
|
||||
buildings = [ ExtResource( 2 ) ]
|
||||
script = ExtResource( 1 )
|
||||
dungeon_teleporter = ExtResource( 5 )
|
||||
prop_tree = ExtResource( 3 )
|
||||
prop_tree2 = ExtResource( 4 )
|
||||
@ -1,167 +0,0 @@
|
||||
tool
|
||||
extends Biome
|
||||
|
||||
# Copyright (c) 2019-2021 Péter Magyar
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in all
|
||||
# copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
export(PackedScene) var tree : PackedScene
|
||||
export(PackedScene) var dungeon_teleporter : PackedScene
|
||||
export(PropData) var prop_tree : PropData
|
||||
export(PropData) var prop_tree2 : PropData
|
||||
|
||||
var terrarin_gen : BiomeTerrarinGenerator = BiomeTerrarinGenerator.new()
|
||||
|
||||
var voxel_scale : float = -1
|
||||
|
||||
func _setup():
|
||||
terrarin_gen.set_current_seed(current_seed)
|
||||
|
||||
for i in range(get_building_count()):
|
||||
var d : Building = get_building(i)
|
||||
d.setup()
|
||||
|
||||
func _instance(p_seed, p_instance):
|
||||
p_instance.tree = tree
|
||||
p_instance.prop_tree = prop_tree
|
||||
p_instance.prop_tree2 = prop_tree2
|
||||
p_instance.dungeon_teleporter = dungeon_teleporter
|
||||
|
||||
return ._instance(p_seed, p_instance)
|
||||
|
||||
func _generate_terra_chunk(chunk, spawn_mobs):
|
||||
if voxel_scale < 0:
|
||||
voxel_scale = chunk.voxel_scale
|
||||
|
||||
# #todo generate this properly
|
||||
# var entrance_position : Vector3 = Vector3(7, 5, 7)
|
||||
#
|
||||
# for i in range(get_building_count()):
|
||||
# var d : Building = get_building(i)
|
||||
#
|
||||
# if d.has_method("has_entrance_position"):
|
||||
# d.entrance_position.origin = entrance_position
|
||||
#
|
||||
# entrance_position = d.next_level_teleporter_position_data_space
|
||||
# entrance_position *= voxel_scale
|
||||
|
||||
var cx : int = chunk.get_position_x()
|
||||
var cz : int = chunk.get_position_z()
|
||||
|
||||
var chunk_seed : int = 123 + (cx * 231) + (cz * 123)
|
||||
|
||||
var rng : RandomNumberGenerator = RandomNumberGenerator.new()
|
||||
rng.seed = chunk_seed
|
||||
|
||||
#terrarin_gen.generate_simple_terrarin(chunk, spawn_mobs)
|
||||
gen_terra_chunk(chunk, rng)
|
||||
|
||||
if chunk.position_x == 0 && chunk.position_z == 0:
|
||||
#test
|
||||
spawn_dungeon(chunk, chunk_seed, spawn_mobs)
|
||||
else:
|
||||
if rng.randi() % 10 == 0:
|
||||
spawn_dungeon(chunk, chunk_seed, spawn_mobs)
|
||||
|
||||
for i in range(get_building_count()):
|
||||
get_building(i).generate_terra_chunk(chunk, spawn_mobs)
|
||||
|
||||
if not Engine.editor_hint and spawn_mobs and rng.randi() % 4 == 0:
|
||||
var level : int = 1
|
||||
|
||||
if chunk.get_voxel_world().has_method("get_mob_level"):
|
||||
level = chunk.get_voxel_world().get_mob_level()
|
||||
|
||||
ESS.entity_spawner.spawn_mob(0, level, \
|
||||
Vector3(chunk.position_x * chunk.size_x * chunk.voxel_scale + chunk.size_x / 2,\
|
||||
100, \
|
||||
chunk.position_z * chunk.size_z * chunk.voxel_scale + chunk.size_z / 2))
|
||||
|
||||
func gen_terra_chunk(chunk: TerraChunk, rng : RandomNumberGenerator) -> void:
|
||||
chunk.channel_ensure_allocated(TerraChunkDefault.DEFAULT_CHANNEL_TYPE, 1)
|
||||
chunk.channel_ensure_allocated(TerraChunkDefault.DEFAULT_CHANNEL_ISOLEVEL, 0)
|
||||
|
||||
var s : FastNoise = FastNoise.new()
|
||||
s.set_noise_type(FastNoise.TYPE_SIMPLEX)
|
||||
s.set_seed(current_seed)
|
||||
|
||||
var sdet : FastNoise = FastNoise.new()
|
||||
sdet.set_noise_type(FastNoise.TYPE_SIMPLEX)
|
||||
sdet.set_seed(current_seed)
|
||||
|
||||
for x in range(-chunk.margin_start, chunk.size_x + chunk.margin_end):
|
||||
for z in range(-chunk.margin_start, chunk.size_x + chunk.margin_end):
|
||||
var vx : int = x + (chunk.position_x * chunk.size_x)
|
||||
var vz : int = z + (chunk.position_z * chunk.size_z)
|
||||
|
||||
var val : float = (s.get_noise_2d(vx * 0.05, vz * 0.05) + 2)
|
||||
val *= val
|
||||
val *= 20.0
|
||||
val += abs(sdet.get_noise_2d(vx * 0.8, vz * 0.8)) * 20
|
||||
|
||||
chunk.set_voxel(val, x, z, TerraChunkDefault.DEFAULT_CHANNEL_ISOLEVEL)
|
||||
|
||||
if val < 50:
|
||||
chunk.set_voxel(2, x, z, TerraChunkDefault.DEFAULT_CHANNEL_TYPE)
|
||||
elif val > 90:
|
||||
chunk.set_voxel(4, x, z, TerraChunkDefault.DEFAULT_CHANNEL_TYPE)
|
||||
else:
|
||||
if chunk.position_x == 0 && chunk.position_z == 0:
|
||||
continue
|
||||
|
||||
if rng.randf() > 0.992:
|
||||
var tr : Transform = Transform()
|
||||
|
||||
tr = tr.rotated(Vector3(0, 1, 0), rng.randf() * PI)
|
||||
tr = tr.rotated(Vector3(1, 0, 0), rng.randf() * 0.2 - 0.1)
|
||||
tr = tr.rotated(Vector3(0, 0, 1), rng.randf() * 0.2 - 0.1)
|
||||
tr = tr.scaled(Vector3(0.9 + rng.randf() * 0.2, 0.9 + rng.randf() * 0.2, 0.9 + rng.randf() * 0.2))
|
||||
tr.origin = Vector3((x + chunk.position_x * chunk.size_x), ((val - 2) / 255.0) * chunk.world_height, (z + chunk.position_z * chunk.size_z))
|
||||
|
||||
chunk.voxel_world.prop_add(tr, prop_tree)
|
||||
|
||||
# Uncomment to test the prop texture merger system:
|
||||
# if randf() > 0.5:
|
||||
# chunk.voxel_world.prop_add(tr, prop_tree)
|
||||
# else:
|
||||
# chunk.voxel_world.prop_add(tr, prop_tree2)
|
||||
|
||||
|
||||
func spawn_dungeon(chunk: TerraChunk, dungeon_seed : int, spawn_mobs : bool) -> void:
|
||||
var x : float = chunk.position_x * chunk.voxel_scale * chunk.size_x
|
||||
var z : float = chunk.position_z * chunk.voxel_scale * chunk.size_z
|
||||
|
||||
var vh : int = chunk.get_voxel(6, 6, TerraChunkDefault.DEFAULT_CHANNEL_ISOLEVEL)
|
||||
var vwh : float = chunk.get_voxel_scale() * chunk.get_world_height() * (vh / 256.0)
|
||||
|
||||
var dt : Spatial = dungeon_teleporter.instance()
|
||||
chunk.voxel_world.add_child(dt)
|
||||
dt.owner_chunk = chunk
|
||||
|
||||
var level : int = 2
|
||||
|
||||
if chunk.get_voxel_world().has_method("get_mob_level"):
|
||||
level = chunk.get_voxel_world().get_mob_level()
|
||||
|
||||
dt.min_level = level - 1
|
||||
dt.max_level = level + 1
|
||||
dt.dungeon_seed = dungeon_seed
|
||||
dt.spawn_mobs = spawn_mobs
|
||||
dt.transform = Transform(Basis().scaled(Vector3(chunk.voxel_scale, chunk.voxel_scale, chunk.voxel_scale)), Vector3(x, vwh, z))
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
tool
|
||||
extends Building
|
||||
#extends Building
|
||||
extends Resource
|
||||
|
||||
# Copyright (c) 2019-2021 Péter Magyar
|
||||
#
|
||||
@ -60,6 +61,14 @@ var enemy_data : Array = []
|
||||
enum NeighbourCaseCodeFlags { WallXP = 1, WallXN = 2, WallZP = 4, WallZN = 8 }
|
||||
enum Tile { Wall, Floor, Door, Empty }
|
||||
|
||||
var sizex : int = 0
|
||||
var sizey : int = 0
|
||||
var sizez : int = 0
|
||||
|
||||
var posx : int = 0
|
||||
var posy : int = 0
|
||||
var posz : int = 0
|
||||
|
||||
func _instance(p_seed, p_instance):
|
||||
._instance(p_seed, p_instance)
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
tool
|
||||
extends Building
|
||||
#extends Building
|
||||
extends Resource
|
||||
|
||||
# Copyright (c) 2019-2021 Péter Magyar
|
||||
#
|
||||
@ -53,6 +54,14 @@ var enemy_data : Array = []
|
||||
|
||||
enum Tile { Wall, Floor, Door, Empty }
|
||||
|
||||
var sizex : int = 0
|
||||
var sizey : int = 0
|
||||
var sizez : int = 0
|
||||
|
||||
var posx : int = 0
|
||||
var posy : int = 0
|
||||
var posz : int = 0
|
||||
|
||||
func _instance(p_seed, p_instance):
|
||||
._instance(p_seed, p_instance)
|
||||
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
[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 )
|
||||
@ -1,72 +0,0 @@
|
||||
tool
|
||||
extends Planet
|
||||
|
||||
# Copyright (c) 2019-2021 Péter Magyar
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in all
|
||||
# copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
func _setup():
|
||||
if get_biome_count() == 0:
|
||||
return
|
||||
|
||||
var b : Biome = get_biome(0)
|
||||
|
||||
if !b:
|
||||
return
|
||||
|
||||
b.current_seed = current_seed
|
||||
b.setup()
|
||||
|
||||
# if bdata.get_dungeon_data_count() == 0:
|
||||
# return
|
||||
#
|
||||
# var dd : Dungeon = bdata.get_dungeon_data(0)
|
||||
#
|
||||
# var dung : Dungeon = dd.instance()
|
||||
#
|
||||
# dung.posx = 0
|
||||
# dung.posy = -4
|
||||
# dung.posz = 0
|
||||
# dung.current_seed = current_seed
|
||||
# dung.setup()
|
||||
#
|
||||
# add_dungeon(dung)
|
||||
|
||||
func _generate_voxel_chunk(chunk, spawn_mobs):
|
||||
if (get_biome_count() == 0):
|
||||
return
|
||||
|
||||
var b : Biome = get_biome(0)
|
||||
|
||||
b.generate_voxel_chunk(chunk, spawn_mobs)
|
||||
|
||||
for i in range(get_building_count()):
|
||||
get_building(i).generate_voxel_chunk(chunk, spawn_mobs)
|
||||
|
||||
func _generate_terra_chunk(chunk, spawn_mobs):
|
||||
if (get_biome_count() == 0):
|
||||
return
|
||||
|
||||
var b : Biome = get_biome(0)
|
||||
|
||||
b.generate_terra_chunk(chunk, spawn_mobs)
|
||||
|
||||
for i in range(get_building_count()):
|
||||
get_building(i).generate_terra_chunk(chunk, spawn_mobs)
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
tool
|
||||
extends Planet
|
||||
|
||||
# Copyright (c) 2019-2021 Péter Magyar
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in all
|
||||
# copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
func _setup():
|
||||
if get_biome_count() == 0:
|
||||
return
|
||||
|
||||
var b : Biome = get_biome(0)
|
||||
b.setup()
|
||||
|
||||
#func _setup_library(library):
|
||||
# ._setup_library(library)
|
||||
#
|
||||
# for i in range(get_biome_count()):
|
||||
# var b : Biome = get_biome(i)
|
||||
#
|
||||
# if b != null:
|
||||
# b.setup_library(library)
|
||||
|
||||
func _generate_chunk(chunk, spawn_mobs):
|
||||
if (get_biome_count() == 0):
|
||||
return
|
||||
|
||||
var b : Biome = get_biome(0)
|
||||
|
||||
b.generate_chunk(chunk, spawn_mobs)
|
||||
@ -1,6 +0,0 @@
|
||||
[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 )
|
||||
@ -1,26 +0,0 @@
|
||||
tool
|
||||
extends Building
|
||||
|
||||
export (EntityData) var trainer : EntityData
|
||||
export (EntityData) var vendor : EntityData
|
||||
|
||||
func _instance(p_seed, p_instance):
|
||||
._instance(p_seed, p_instance)
|
||||
|
||||
p_instance.trainer = trainer
|
||||
p_instance.vendor = vendor
|
||||
|
||||
return p_instance
|
||||
|
||||
func _generate_terra_chunk(chunk : TerraChunk, spawn_mobs : bool):
|
||||
if !spawn_mobs:
|
||||
return
|
||||
|
||||
if trainer == null || vendor == null:
|
||||
return
|
||||
|
||||
if chunk.position_x == 0 && chunk.position_z == 0:
|
||||
var pos : Vector3 = Vector3(4 * chunk.voxel_scale, 8 * chunk.voxel_scale, 4 * chunk.voxel_scale)
|
||||
ESS.entity_spawner.spawn_mob(trainer.id, 1, pos)
|
||||
pos = Vector3(2 * chunk.voxel_scale, 8 * chunk.voxel_scale, 2 * chunk.voxel_scale)
|
||||
ESS.entity_spawner.spawn_mob(vendor.id, 1, pos)
|
||||
@ -1,10 +0,0 @@
|
||||
[gd_resource type="Building" load_steps=4 format=2]
|
||||
|
||||
[ext_resource path="res://modules/planets/test_planet/villages/village.gd" type="Script" id=1]
|
||||
[ext_resource path="res://modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres" type="EntityData" id=2]
|
||||
[ext_resource path="res://modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres" type="EntityData" id=3]
|
||||
|
||||
[resource]
|
||||
script = ExtResource( 1 )
|
||||
trainer = ExtResource( 2 )
|
||||
vendor = ExtResource( 3 )
|
||||
Loading…
Reference in New Issue
Block a user