diff --git a/HEADS b/HEADS index 58188017..13505077 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": "d711c57d767734887fbf0955a7b9902c54498a0d", "world_generator": "63da1cc4a2084d1c2eb9430e436be22711e964f2", "entity_spell_system": "d008221f8db541924060a7412b891f3e9d69a680", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "a449a410372b4e79328b73dbfa5e7152d47f2a28", "texture_packer": "fbf5d0d634ab04db049099b814d2d58e2743f5b2", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "3fedb4c8534af36d89a1a1a34a6b5ed4d333927a", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49"} \ No newline at end of file +{"engine": "318c69351624f7794c51b5385d252af397c0404a", "world_generator": "63da1cc4a2084d1c2eb9430e436be22711e964f2", "entity_spell_system": "bc797e4ffbc9827d379c50e9e8bf76690c5b7111", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "a449a410372b4e79328b73dbfa5e7152d47f2a28", "texture_packer": "fbf5d0d634ab04db049099b814d2d58e2743f5b2", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "3fedb4c8534af36d89a1a1a34a6b5ed4d333927a", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49"} \ No newline at end of file diff --git a/game/data/planets/2_tdungeon.tres b/game/data/planets/1_tdungeon.tres similarity index 64% rename from game/data/planets/2_tdungeon.tres rename to game/data/planets/1_tdungeon.tres index 9093fb41..e82b9e8b 100644 --- a/game/data/planets/2_tdungeon.tres +++ b/game/data/planets/1_tdungeon.tres @@ -1,9 +1,9 @@ [gd_resource type="PlanetData" load_steps=3 format=2] -[ext_resource path="res://data/biomes/2_tdungb.tres" type="BiomeData" id=1] -[ext_resource path="res://scripts/planets/dung_simple_planet.gd" type="Script" id=2] +[ext_resource path="res://scripts/planets/dung_simple_planet.gd" type="Script" id=1] +[ext_resource path="res://data/biomes/2_tdungb.tres" type="BiomeData" id=2] [resource] -id = 2 -target_script = ExtResource( 2 ) -biome_datas = [ ExtResource( 1 ) ] +id = 1 +target_script = ExtResource( 1 ) +biome_datas = [ ExtResource( 2 ) ] diff --git a/game/data/planets/1_test.tres b/game/data/planets/1_test.tres deleted file mode 100644 index 0d2253c0..00000000 --- a/game/data/planets/1_test.tres +++ /dev/null @@ -1,9 +0,0 @@ -[gd_resource type="PlanetData" load_steps=3 format=2] - -[ext_resource path="res://data/biomes/1_test.tres" type="BiomeData" id=1] -[ext_resource path="res://scripts/planets/simple_planet.gd" type="Script" id=2] - -[resource] -id = 1 -target_script = ExtResource( 2 ) -biome_datas = [ ExtResource( 1 ) ] diff --git a/game/player/Player.gd b/game/player/Player.gd index dfa41f2d..2e6ce1aa 100644 --- a/game/player/Player.gd +++ b/game/player/Player.gd @@ -91,8 +91,6 @@ func _ready() -> void: world = get_node(world_path) as VoxelWorld -# set_process(true) - func _physics_process(delta : float) -> void: if not _on: return diff --git a/game/scripts/biomes/simple_biome.gd b/game/scripts/biomes/simple_biome.gd index c684242d..e72184c6 100644 --- a/game/scripts/biomes/simple_biome.gd +++ b/game/scripts/biomes/simple_biome.gd @@ -78,9 +78,14 @@ func generate_terrarin(chunk : VoxelChunk, spawn_mobs: bool) -> void: chunk.set_voxel(3, x, y, z, VoxelChunk.DEFAULT_CHANNEL_TYPE) else: chunk.set_voxel(2, x, y, z, VoxelChunk.DEFAULT_CHANNEL_TYPE) + + var val2 : float = (val - int(val)) * 3.0 + val2 = int(val2) + val2 /= 3.0 + chunk.set_voxel(int(255.0 * val2), x, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL) # chunk.set_voxel(int(255.0 * (val - int(val)) / 180.0) * 180, x, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL) - chunk.set_voxel(int(255.0 * (val - int(val))), x, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL) +# chunk.set_voxel(int(255.0 * (val - int(val))), x, y, z, VoxelChunk.DEFAULT_CHANNEL_ISOLEVEL) # box_blur(chunk)