diff --git a/game/models/buildings/crypt/CryptEntrance.tres b/game/models/buildings/crypt/CryptEntrance.tres index a72718d8..abc98104 100644 --- a/game/models/buildings/crypt/CryptEntrance.tres +++ b/game/models/buildings/crypt/CryptEntrance.tres @@ -1,6 +1,6 @@ [gd_resource type="PropData" load_steps=39 format=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=1] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=1] [ext_resource path="res://models/core_models/wall_xp.tres" type="MeshDataResource" id=2] [ext_resource path="res://models/core_models/wall_xn.tres" type="MeshDataResource" id=3] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=4] diff --git a/game/models/buildings/crypt/CryptEntrance.tscn b/game/models/buildings/crypt/CryptEntrance.tscn index dd1d1e4b..f197b43c 100644 --- a/game/models/buildings/crypt/CryptEntrance.tscn +++ b/game/models/buildings/crypt/CryptEntrance.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://models/core_models/floor.tres" type="MeshDataResource" id=3] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=4] [ext_resource path="res://models/core_models/wall_zp.tres" type="MeshDataResource" id=5] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=6] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=6] [ext_resource path="res://models/buildings/crypt/CryptEntranceDoor.tscn" type="PackedScene" id=7] [sub_resource type="SpatialMaterial" id=7] diff --git a/game/models/buildings/crypt/CryptEntranceDoor.tscn b/game/models/buildings/crypt/CryptEntranceDoor.tscn index 170901e1..6481ea17 100644 --- a/game/models/buildings/crypt/CryptEntranceDoor.tscn +++ b/game/models/buildings/crypt/CryptEntranceDoor.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.gd" type="Script" id=1] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/test_brick_albedo.png" type="Texture" id=2] +[ext_resource path="res://worlds/test_world/dungeons/dung_teleporter.gd" type="Script" id=1] +[ext_resource path="res://worlds/test_world/voxel_library/textures/test_brick_albedo.png" type="Texture" id=2] [sub_resource type="CubeMesh" id=1] size = Vector3( 1, 1, 1 ) diff --git a/game/models/entities/human/models/Material_003.material b/game/models/entities/human/models/Material_003.material index 6f8a6286..d72ae3ba 100644 Binary files a/game/models/entities/human/models/Material_003.material and b/game/models/entities/human/models/Material_003.material differ diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres b/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres deleted file mode 100644 index 9eedc9ad..00000000 --- a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="PropData" load_steps=4 format=2] - -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png" type="Texture" id=2] - -[sub_resource type="PropDataMeshData" id=1] -mesh = ExtResource( 1 ) -texture = ExtResource( 2 ) - -[resource] -props = [ SubResource( 1 ) ] diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres b/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres deleted file mode 100644 index bf07bf0e..00000000 --- a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="PropData" load_steps=4 format=2] - -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png" type="Texture" id=2] - -[sub_resource type="PropDataMeshData" id=1] -mesh = ExtResource( 1 ) -texture = ExtResource( 2 ) - -[resource] -props = [ SubResource( 1 ) ] diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tscn b/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tscn deleted file mode 100644 index 8583266e..00000000 --- a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tscn +++ /dev/null @@ -1,12 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree.material" type="Material" id=1] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png" type="Texture" id=3] - -[node name="Spatial" type="Spatial"] - -[node name="MeshDataInstance" type="MeshDataInstance" parent="."] -mesh_data = ExtResource( 2 ) -texture = ExtResource( 3 ) -material = ExtResource( 1 ) diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree.material b/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree.material deleted file mode 100644 index a1f3619e..00000000 Binary files a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree.material and /dev/null differ diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2.material b/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2.material deleted file mode 100644 index 01b31f91..00000000 Binary files a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2.material and /dev/null differ diff --git a/game/modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png.import b/game/modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png.import deleted file mode 100644 index 9dbc0cc5..00000000 --- a/game/modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/stone_dungeon_1_albedo.png-a248bf80f0a570ffdec62e801e741ef5.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" -dest_files=[ "res://.import/stone_dungeon_1_albedo.png-a248bf80f0a570ffdec62e801e741ef5.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=false -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=false -svg/scale=1.0 diff --git a/game/tests/test_mdr/Spatial.tscn b/game/tests/test_mdr/Spatial.tscn index b8f700c9..1a9ed40d 100644 --- a/game/tests/test_mdr/Spatial.tscn +++ b/game/tests/test_mdr/Spatial.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] +[ext_resource path="res://worlds/test_world/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] [sub_resource type="MeshDataResource" id=1] array = [ PoolVector3Array( -0.5, -0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, -0.5 ), PoolVector3Array( 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, -1, 0, 0, -1 ), null, null, PoolVector2Array( 0.253049, 0.336022, 0.253049, 0.00806455, 0.5, 0.00806452, 0.5, 0.336022, 0.253049, 0.663978, 0.5, 0.991935, 0.253049, 0.991935, 0.5, 0.663978, 0.00609756, 0.336022, 0.993902, 0.336021, 0.746951, 0.336021, 0.746951, 0.663978, 0.00609758, 0.663979, 0.993902, 0.663978 ), null, null, null, PoolIntArray( 0, 1, 2, 2, 3, 0, 4, 5, 6, 4, 7, 5, 3, 10, 11, 11, 7, 3, 0, 12, 8, 0, 4, 12, 9, 13, 11, 11, 10, 9, 0, 7, 4, 0, 3, 7 ) ] diff --git a/game/tests/test_props/MeshDataInstance2.tres b/game/tests/test_props/MeshDataInstance2.tres index 3d17d58a..f1e5f6a0 100644 --- a/game/tests/test_props/MeshDataInstance2.tres +++ b/game/tests/test_props/MeshDataInstance2.tres @@ -2,7 +2,7 @@ [ext_resource path="res://models/entities/human/female/character_textures/head.png" type="Texture" id=1] [ext_resource path="res://models/entities/human/female/character_models/huf_head.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=3] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=3] [sub_resource type="PropDataMeshData" id=1] mesh = ExtResource( 2 ) diff --git a/game/tests/test_props/MeshDataInstance2.tscn b/game/tests/test_props/MeshDataInstance2.tscn index 28f1663d..d309542b 100644 --- a/game/tests/test_props/MeshDataInstance2.tscn +++ b/game/tests/test_props/MeshDataInstance2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://models/entities/human/female/character_textures/head.png" type="Texture" id=1] [ext_resource path="res://models/entities/human/female/character_models/huf_head.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=3] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=3] [sub_resource type="Image" id=9] data = { diff --git a/game/tests/test_props/mditest.tscn b/game/tests/test_props/mditest.tscn index b1faa4df..26177af4 100644 --- a/game/tests/test_props/mditest.tscn +++ b/game/tests/test_props/mditest.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png" type="Texture" id=2] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="MeshDataResource" id=1] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png" type="Texture" id=2] [sub_resource type="SpatialMaterial" id=2] albedo_texture = ExtResource( 2 ) diff --git a/game/tests/test_rooms/Room1.tres b/game/tests/test_rooms/Room1.tres index d4eb8a75..fa6fc227 100644 --- a/game/tests/test_rooms/Room1.tres +++ b/game/tests/test_rooms/Room1.tres @@ -2,7 +2,7 @@ [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=1] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=3] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=3] [sub_resource type="PropDataPortal" id=1] transform = Transform( -1, 0, -9.61651e-07, 0, 1, 0, 9.61651e-07, 0, -1, 2, 1, 0 ) diff --git a/game/tests/test_rooms/Room1.tscn b/game/tests/test_rooms/Room1.tscn index 039c414a..b34cc7d9 100644 --- a/game/tests/test_rooms/Room1.tscn +++ b/game/tests/test_rooms/Room1.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=4] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=4] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=5] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=10] diff --git a/game/tests/test_rooms/Room2.tres b/game/tests/test_rooms/Room2.tres index 5a6d5938..75284bfc 100644 --- a/game/tests/test_rooms/Room2.tres +++ b/game/tests/test_rooms/Room2.tres @@ -2,7 +2,7 @@ [ext_resource path="res://models/entities/human/female/character_models/huf_spine2.tres" type="MeshDataResource" id=1] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=3] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=3] [ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple.png" type="Texture" id=4] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=5] diff --git a/game/tests/test_rooms/Room2.tscn b/game/tests/test_rooms/Room2.tscn index 2e370d4b..645acc20 100644 --- a/game/tests/test_rooms/Room2.tscn +++ b/game/tests/test_rooms/Room2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://models/entities/human/female/character_models/huf_spine2.tres" type="MeshDataResource" id=1] [ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple.png" type="Texture" id=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=4] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=4] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=5] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=10] diff --git a/game/tests/test_rooms/Room3.tres b/game/tests/test_rooms/Room3.tres index 8d2fd80d..ef928de8 100644 --- a/game/tests/test_rooms/Room3.tres +++ b/game/tests/test_rooms/Room3.tres @@ -2,7 +2,7 @@ [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=1] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=3] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=3] [sub_resource type="PropDataTiledWall" id=1] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) diff --git a/game/tests/test_rooms/Room3.tscn b/game/tests/test_rooms/Room3.tscn index 2b074142..96d4aa0a 100644 --- a/game/tests/test_rooms/Room3.tscn +++ b/game/tests/test_rooms/Room3.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=4] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=4] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=5] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=10] diff --git a/game/tests/test_rooms/Room4.tres b/game/tests/test_rooms/Room4.tres index 27e1e828..9ea36a86 100644 --- a/game/tests/test_rooms/Room4.tres +++ b/game/tests/test_rooms/Room4.tres @@ -2,7 +2,7 @@ [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=1] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=3] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=3] [sub_resource type="PropDataTiledWall" id=1] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) diff --git a/game/tests/test_rooms/Room4.tscn b/game/tests/test_rooms/Room4.tscn index 7cf581bb..bc3eb6ae 100644 --- a/game/tests/test_rooms/Room4.tscn +++ b/game/tests/test_rooms/Room4.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=4] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=4] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=5] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=10] diff --git a/game/tests/test_rooms/Room5.tres b/game/tests/test_rooms/Room5.tres index dd7d19f2..398f6b10 100644 --- a/game/tests/test_rooms/Room5.tres +++ b/game/tests/test_rooms/Room5.tres @@ -2,7 +2,7 @@ [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=1] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=3] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=3] [sub_resource type="PropDataTiledWall" id=1] transform = Transform( -1, 0, 3.17865e-08, -3.17865e-08, -5.96046e-08, -1, 2.66454e-15, -1, 5.96046e-08, 5, 0, 0 ) diff --git a/game/tests/test_rooms/Room5.tscn b/game/tests/test_rooms/Room5.tscn index 730ecc5c..dc7f2f11 100644 --- a/game/tests/test_rooms/Room5.tscn +++ b/game/tests/test_rooms/Room5.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=4] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=4] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=5] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=10] diff --git a/game/tests/test_rooms/test2_tiledwalldata.tres b/game/tests/test_rooms/test2_tiledwalldata.tres index a4701e11..5f1ccd7c 100644 --- a/game/tests/test_rooms/test2_tiledwalldata.tres +++ b/game/tests/test_rooms/test2_tiledwalldata.tres @@ -1,6 +1,6 @@ [gd_resource type="TiledWallData" load_steps=2 format=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=1] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=1] [resource] tiling_type = 3 diff --git a/game/tw/new_terramanlibrarymerger.tres b/game/tw/new_terramanlibrarymerger.tres index 5f31302f..19b3441e 100644 --- a/game/tw/new_terramanlibrarymerger.tres +++ b/game/tw/new_terramanlibrarymerger.tres @@ -1,8 +1,8 @@ [gd_resource type="TerrainLibraryMerger" load_steps=10 format=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/dirt_albedo.png" type="Texture" id=3] +[ext_resource path="res://worlds/test_world/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_1_albedo.png" type="Texture" id=2] +[ext_resource path="res://worlds/test_world/voxel_library/textures/dirt_albedo.png" type="Texture" id=3] [ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=4] [ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=5] diff --git a/game/tw/new_terramanlibrarymergerpcm.tres b/game/tw/new_terramanlibrarymergerpcm.tres index 841ee09d..6bb10238 100644 --- a/game/tw/new_terramanlibrarymergerpcm.tres +++ b/game/tw/new_terramanlibrarymergerpcm.tres @@ -1,8 +1,8 @@ [gd_resource type="TerrainLibraryMergerPCM" load_steps=12 format=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/dirt_albedo.png" type="Texture" id=3] +[ext_resource path="res://worlds/test_world/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_1_albedo.png" type="Texture" id=2] +[ext_resource path="res://worlds/test_world/voxel_library/textures/dirt_albedo.png" type="Texture" id=3] [ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=4] [ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=5] [ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=6] diff --git a/game/tw/world_generator.tres b/game/tw/world_generator.tres index 33217e2d..a0618fdd 100644 --- a/game/tw/world_generator.tres +++ b/game/tw/world_generator.tres @@ -1,7 +1,7 @@ [gd_resource type="TerrainLevelGenerator" load_steps=3 format=2] [ext_resource path="res://scripts/world_generators/TerrainWorldGenerator.gd" type="Script" id=1] -[ext_resource path="res://modules/planets/test_planet/test_world.tres" type="Resource" id=2] +[ext_resource path="res://worlds/test_world/test_world.tres" type="Resource" id=2] [resource] script = ExtResource( 1 ) diff --git a/game/modules/planets/test_planet/biomes/simple_biome/Attributions.xml b/game/worlds/test_world/biomes/simple_biome/Attributions.xml similarity index 100% rename from game/modules/planets/test_planet/biomes/simple_biome/Attributions.xml rename to game/worlds/test_world/biomes/simple_biome/Attributions.xml diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres similarity index 100% rename from game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres rename to game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres diff --git a/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres new file mode 100644 index 00000000..003dce9d --- /dev/null +++ b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres @@ -0,0 +1,11 @@ +[gd_resource type="PropData" load_steps=4 format=2] + +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png" type="Texture" id=1] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="MeshDataResource" id=2] + +[sub_resource type="PropDataMeshData" id=1] +mesh = ExtResource( 2 ) +texture = ExtResource( 1 ) + +[resource] +props = [ SubResource( 1 ) ] diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tscn b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tscn similarity index 57% rename from game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tscn rename to game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tscn index 88301b4b..ab86c0a4 100644 --- a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tscn +++ b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree.material" type="Material" id=1] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png" type="Texture" id=3] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree.material" type="Material" id=1] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="MeshDataResource" id=2] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png" type="Texture" id=3] [sub_resource type="ArrayMesh" id=1] surfaces/0 = { diff --git a/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres new file mode 100644 index 00000000..a24a9556 --- /dev/null +++ b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres @@ -0,0 +1,11 @@ +[gd_resource type="PropData" load_steps=4 format=2] + +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png" type="Texture" id=1] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="MeshDataResource" id=2] + +[sub_resource type="PropDataMeshData" id=1] +mesh = ExtResource( 2 ) +texture = ExtResource( 1 ) + +[resource] +props = [ SubResource( 1 ) ] diff --git a/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tscn b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tscn new file mode 100644 index 00000000..7bf25da5 --- /dev/null +++ b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree.material" type="Material" id=1] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1.tres" type="MeshDataResource" id=2] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png" type="Texture" id=3] + +[node name="Spatial" type="Spatial"] + +[node name="MeshDataInstance" type="MeshDataInstance" parent="."] +mesh_data = ExtResource( 2 ) +texture = ExtResource( 3 ) +material = ExtResource( 1 ) diff --git a/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree.material b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree.material new file mode 100644 index 00000000..a43542b0 Binary files /dev/null and b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree.material differ diff --git a/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2.material b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2.material new file mode 100644 index 00000000..a68d88bf Binary files /dev/null and b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2.material differ diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png similarity index 100% rename from game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png rename to game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png.import b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png.import similarity index 66% rename from game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png.import rename to game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png.import index e5f4877e..e466eb81 100644 --- a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png.import +++ b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/tree256.png-49d8007470567ff78ad568e96913fa91.stex" +path="res://.import/tree256.png-1d7472393b475105dccfd0f92acf05af.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png" -dest_files=[ "res://.import/tree256.png-49d8007470567ff78ad568e96913fa91.stex" ] +source_file="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree256.png" +dest_files=[ "res://.import/tree256.png-1d7472393b475105dccfd0f92acf05af.stex" ] [params] diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png similarity index 100% rename from game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png rename to game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png diff --git a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png.import b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png.import similarity index 65% rename from game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png.import rename to game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png.import index 73f3d092..b3b9c156 100644 --- a/game/modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png.import +++ b/game/worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/tree2_256.png-3f3ae3419daaa3d2e1f9ea883f85a98e.stex" +path="res://.import/tree2_256.png-7d1d22586bd6d23a42fbd57e2147077a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png" -dest_files=[ "res://.import/tree2_256.png-3f3ae3419daaa3d2e1f9ea883f85a98e.stex" ] +source_file="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/tree2_256.png" +dest_files=[ "res://.import/tree2_256.png-7d1d22586bd6d23a42fbd57e2147077a.stex" ] [params] diff --git a/game/modules/planets/test_planet/dungeons/1_test.tres b/game/worlds/test_world/dungeons/1_test.tres similarity index 100% rename from game/modules/planets/test_planet/dungeons/1_test.tres rename to game/worlds/test_world/dungeons/1_test.tres diff --git a/game/modules/planets/test_planet/dungeons/dung_back_teleporter.gd b/game/worlds/test_world/dungeons/dung_back_teleporter.gd similarity index 100% rename from game/modules/planets/test_planet/dungeons/dung_back_teleporter.gd rename to game/worlds/test_world/dungeons/dung_back_teleporter.gd diff --git a/game/modules/planets/test_planet/dungeons/dung_back_teleporter.tscn b/game/worlds/test_world/dungeons/dung_back_teleporter.tscn similarity index 72% rename from game/modules/planets/test_planet/dungeons/dung_back_teleporter.tscn rename to game/worlds/test_world/dungeons/dung_back_teleporter.tscn index f5537835..29787447 100644 --- a/game/modules/planets/test_planet/dungeons/dung_back_teleporter.tscn +++ b/game/worlds/test_world/dungeons/dung_back_teleporter.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://modules/planets/test_planet/dungeons/dung_back_teleporter.gd" type="Script" id=1] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/test_brick_albedo.png" type="Texture" id=2] +[ext_resource path="res://worlds/test_world/dungeons/dung_back_teleporter.gd" type="Script" id=1] +[ext_resource path="res://worlds/test_world/voxel_library/textures/test_brick_albedo.png" type="Texture" id=2] [sub_resource type="CubeMesh" id=1] size = Vector3( 1, 1, 1 ) diff --git a/game/modules/planets/test_planet/dungeons/dung_teleporter.gd b/game/worlds/test_world/dungeons/dung_teleporter.gd similarity index 100% rename from game/modules/planets/test_planet/dungeons/dung_teleporter.gd rename to game/worlds/test_world/dungeons/dung_teleporter.gd diff --git a/game/modules/planets/test_planet/dungeons/dung_teleporter.tscn b/game/worlds/test_world/dungeons/dung_teleporter.tscn similarity index 64% rename from game/modules/planets/test_planet/dungeons/dung_teleporter.tscn rename to game/worlds/test_world/dungeons/dung_teleporter.tscn index d5b8bc6f..4c228924 100644 --- a/game/modules/planets/test_planet/dungeons/dung_teleporter.tscn +++ b/game/worlds/test_world/dungeons/dung_teleporter.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.gd" type="Script" id=1] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/test_brick_albedo.png" type="Texture" id=2] +[ext_resource path="res://worlds/test_world/dungeons/dung_teleporter.gd" type="Script" id=1] +[ext_resource path="res://worlds/test_world/dungeons/dung_back_teleporter.tscn" type="PackedScene" id=2] [ext_resource path="res://tests/test_dungeon/Dungeon.tscn" type="PackedScene" id=3] -[ext_resource path="res://modules/planets/test_planet/dungeons/dung_back_teleporter.tscn" type="PackedScene" id=4] +[ext_resource path="res://worlds/test_world/voxel_library/textures/test_brick_albedo.png" type="Texture" id=4] [sub_resource type="CubeMesh" id=1] size = Vector3( 1, 1, 1 ) @@ -11,7 +11,7 @@ size = Vector3( 1, 1, 1 ) [sub_resource type="SpatialMaterial" id=2] flags_vertex_lighting = true albedo_color = Color( 0.494118, 0.494118, 0.494118, 1 ) -albedo_texture = ExtResource( 2 ) +albedo_texture = ExtResource( 4 ) [sub_resource type="BoxShape" id=3] extents = Vector3( 0.5, 0.5, 0.5 ) @@ -20,7 +20,7 @@ extents = Vector3( 0.5, 0.5, 0.5 ) script = ExtResource( 1 ) default_albedo = Color( 0.521569, 0.521569, 0.521569, 1 ) dungeon = ExtResource( 3 ) -dungeon_back_teleporter = ExtResource( 4 ) +dungeon_back_teleporter = ExtResource( 2 ) [node name="MeshInstance" type="MeshInstance" parent="."] mesh = SubResource( 1 ) diff --git a/game/modules/planets/test_planet/dungeons/dungeon.gd b/game/worlds/test_world/dungeons/dungeon.gd similarity index 100% rename from game/modules/planets/test_planet/dungeons/dungeon.gd rename to game/worlds/test_world/dungeons/dungeon.gd diff --git a/game/modules/planets/test_planet/dungeons/dungeon.tres b/game/worlds/test_world/dungeons/dungeon.tres similarity index 73% rename from game/modules/planets/test_planet/dungeons/dungeon.tres rename to game/worlds/test_world/dungeons/dungeon.tres index b2de71d6..9356b899 100644 --- a/game/modules/planets/test_planet/dungeons/dungeon.tres +++ b/game/worlds/test_world/dungeons/dungeon.tres @@ -1,16 +1,16 @@ [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://worlds/test_world/dungeons/dungeon.gd" type="Script" id=1] [ext_resource path="res://models/entities/human/female/character_models/huf_calf_left.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.tscn" type="PackedScene" id=3] +[ext_resource path="res://worlds/test_world/dungeons/dung_teleporter.tscn" type="PackedScene" id=3] [ext_resource path="res://models/core_models/ceiling.tres" type="MeshDataResource" id=4] [ext_resource path="res://models/core_models/wall_xp.tres" type="MeshDataResource" id=5] [ext_resource path="res://models/core_models/wall_xn.tres" type="MeshDataResource" id=6] [ext_resource path="res://models/core_models/floor.tres" type="MeshDataResource" id=7] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=8] [ext_resource path="res://models/core_models/wall_zp.tres" type="MeshDataResource" id=9] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=10] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=11] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_1_albedo.png" type="Texture" id=10] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=11] [resource] posy = -45 diff --git a/game/modules/planets/test_planet/dungeons/dungeon_l2.tres b/game/worlds/test_world/dungeons/dungeon_l2.tres similarity index 73% rename from game/modules/planets/test_planet/dungeons/dungeon_l2.tres rename to game/worlds/test_world/dungeons/dungeon_l2.tres index 76e83850..67815e17 100644 --- a/game/modules/planets/test_planet/dungeons/dungeon_l2.tres +++ b/game/worlds/test_world/dungeons/dungeon_l2.tres @@ -1,16 +1,16 @@ [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://worlds/test_world/dungeons/dungeon.gd" type="Script" id=1] [ext_resource path="res://models/entities/human/female/character_models/huf_calf_left.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.tscn" type="PackedScene" id=3] +[ext_resource path="res://worlds/test_world/dungeons/dung_teleporter.tscn" type="PackedScene" id=3] [ext_resource path="res://models/core_models/ceiling.tres" type="MeshDataResource" id=4] [ext_resource path="res://models/core_models/wall_xp.tres" type="MeshDataResource" id=5] [ext_resource path="res://models/core_models/wall_xn.tres" type="MeshDataResource" id=6] [ext_resource path="res://models/core_models/floor.tres" type="MeshDataResource" id=7] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=8] [ext_resource path="res://models/core_models/wall_zp.tres" type="MeshDataResource" id=9] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=10] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=11] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_1_albedo.png" type="Texture" id=10] +[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=11] [resource] posy = -79 diff --git a/game/modules/planets/test_planet/dungeons/vman_dungeon.gd b/game/worlds/test_world/dungeons/vman_dungeon.gd similarity index 100% rename from game/modules/planets/test_planet/dungeons/vman_dungeon.gd rename to game/worlds/test_world/dungeons/vman_dungeon.gd diff --git a/game/modules/planets/test_planet/dungeons/vman_dungeon.tres b/game/worlds/test_world/dungeons/vman_dungeon.tres similarity index 58% rename from game/modules/planets/test_planet/dungeons/vman_dungeon.tres rename to game/worlds/test_world/dungeons/vman_dungeon.tres index 41b27273..2ec5a360 100644 --- a/game/modules/planets/test_planet/dungeons/vman_dungeon.tres +++ b/game/worlds/test_world/dungeons/vman_dungeon.tres @@ -1,7 +1,7 @@ [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] +[ext_resource path="res://worlds/test_world/dungeons/vman_dungeon.gd" type="Script" id=1] +[ext_resource path="res://worlds/test_world/dungeons/dung_teleporter.tscn" type="PackedScene" id=2] [resource] posy = -45 diff --git a/game/modules/planets/test_planet/environments/default_env.tres b/game/worlds/test_world/environments/default_env.tres similarity index 100% rename from game/modules/planets/test_planet/environments/default_env.tres rename to game/worlds/test_world/environments/default_env.tres diff --git a/game/modules/planets/test_planet/test_world.tres b/game/worlds/test_world/test_world.tres similarity index 60% rename from game/modules/planets/test_planet/test_world.tres rename to game/worlds/test_world/test_world.tres index 4841e747..e7f6e1d2 100644 --- a/game/modules/planets/test_planet/test_world.tres +++ b/game/worlds/test_world/test_world.tres @@ -1,39 +1,39 @@ [gd_resource type="Resource" load_steps=13 format=2] [ext_resource path="res://addons/world_generator/resources/world_gen_world.gd" type="Script" id=1] -[ext_resource path="res://world_generator/continents/test_continent.gd" type="Script" id=2] -[ext_resource path="res://world_generator/zones/test_zone.gd" type="Script" id=3] -[ext_resource path="res://world_generator/subzones/spawner.gd" type="Script" id=4] -[ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.tscn" type="PackedScene" id=5] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=6] -[ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres" type="PropData" id=7] -[ext_resource path="res://modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres" type="EntityData" id=8] -[ext_resource path="res://modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres" type="EntityData" id=9] +[ext_resource path="res://world_generator/subzones/spawner.gd" type="Script" id=2] +[ext_resource path="res://world_generator/continents/test_continent.gd" type="Script" id=3] +[ext_resource path="res://worlds/test_world/dungeons/dung_teleporter.tscn" type="PackedScene" id=4] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres" type="PropData" id=5] +[ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=6] +[ext_resource path="res://world_generator/zones/test_zone.gd" type="Script" id=7] +[ext_resource path="res://modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres" type="EntityData" id=8] +[ext_resource path="res://modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres" type="EntityData" id=9] [sub_resource type="Resource" id=2] resource_name = "Spawner" -script = ExtResource( 4 ) +script = ExtResource( 2 ) rect = Rect2( 165, 197, 5, 5 ) locked = false -trainer = ExtResource( 8 ) -vendor = ExtResource( 9 ) +trainer = ExtResource( 9 ) +vendor = ExtResource( 8 ) [sub_resource type="Resource" id=3] resource_name = "TestForest" -script = ExtResource( 3 ) +script = ExtResource( 7 ) rect = Rect2( 28.5, 27, 378, 407 ) locked = false subzones = [ SubResource( 2 ) ] [sub_resource type="Resource" id=1] resource_name = "Continent" -script = ExtResource( 2 ) +script = ExtResource( 3 ) rect = Rect2( 33.5, 19.5, 434, 459 ) locked = false zones = [ SubResource( 3 ) ] -dungeon_teleporter = ExtResource( 5 ) +dungeon_teleporter = ExtResource( 4 ) prop_tree = ExtResource( 6 ) -prop_tree2 = ExtResource( 7 ) +prop_tree2 = ExtResource( 5 ) [resource] resource_name = "TestWorld" diff --git a/game/modules/planets/test_planet/voxel_library/merger_library_mat.tres b/game/worlds/test_world/voxel_library/merger_library_mat.tres similarity index 100% rename from game/modules/planets/test_planet/voxel_library/merger_library_mat.tres rename to game/worlds/test_world/voxel_library/merger_library_mat.tres diff --git a/game/modules/planets/test_planet/voxel_library/merger_prop_mat.tres b/game/worlds/test_world/voxel_library/merger_prop_mat.tres similarity index 63% rename from game/modules/planets/test_planet/voxel_library/merger_prop_mat.tres rename to game/worlds/test_world/voxel_library/merger_prop_mat.tres index e2ac53f5..13789ac3 100644 --- a/game/modules/planets/test_planet/voxel_library/merger_prop_mat.tres +++ b/game/worlds/test_world/voxel_library/merger_prop_mat.tres @@ -1,6 +1,6 @@ [gd_resource type="SpatialMaterial" load_steps=2 format=2] -[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] +[ext_resource path="res://worlds/test_world/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] diff --git a/game/modules/planets/test_planet/voxel_library/textures/dirt.tres b/game/worlds/test_world/voxel_library/textures/dirt.tres similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/dirt.tres rename to game/worlds/test_world/voxel_library/textures/dirt.tres diff --git a/game/modules/planets/test_planet/voxel_library/textures/dirt_albedo.png b/game/worlds/test_world/voxel_library/textures/dirt_albedo.png similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/dirt_albedo.png rename to game/worlds/test_world/voxel_library/textures/dirt_albedo.png diff --git a/game/modules/planets/test_planet/voxel_library/textures/dirt_albedo.png.import b/game/worlds/test_world/voxel_library/textures/dirt_albedo.png.import similarity index 67% rename from game/modules/planets/test_planet/voxel_library/textures/dirt_albedo.png.import rename to game/worlds/test_world/voxel_library/textures/dirt_albedo.png.import index a556bb49..cb267e66 100644 --- a/game/modules/planets/test_planet/voxel_library/textures/dirt_albedo.png.import +++ b/game/worlds/test_world/voxel_library/textures/dirt_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/dirt_albedo.png-01681308b3a87a7d7965d3eb805860f7.stex" +path="res://.import/dirt_albedo.png-0fa25f1969c243129eb1f2cef45e4f02.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/planets/test_planet/voxel_library/textures/dirt_albedo.png" -dest_files=[ "res://.import/dirt_albedo.png-01681308b3a87a7d7965d3eb805860f7.stex" ] +source_file="res://worlds/test_world/voxel_library/textures/dirt_albedo.png" +dest_files=[ "res://.import/dirt_albedo.png-0fa25f1969c243129eb1f2cef45e4f02.stex" ] [params] diff --git a/game/modules/planets/test_planet/voxel_library/textures/grass.tres b/game/worlds/test_world/voxel_library/textures/grass.tres similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/grass.tres rename to game/worlds/test_world/voxel_library/textures/grass.tres diff --git a/game/modules/planets/test_planet/voxel_library/textures/grass_albedo.png b/game/worlds/test_world/voxel_library/textures/grass_albedo.png similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/grass_albedo.png rename to game/worlds/test_world/voxel_library/textures/grass_albedo.png diff --git a/game/modules/planets/test_planet/voxel_library/textures/grass_albedo.png.import b/game/worlds/test_world/voxel_library/textures/grass_albedo.png.import similarity index 66% rename from game/modules/planets/test_planet/voxel_library/textures/grass_albedo.png.import rename to game/worlds/test_world/voxel_library/textures/grass_albedo.png.import index 5c34fa12..4db1b35b 100644 --- a/game/modules/planets/test_planet/voxel_library/textures/grass_albedo.png.import +++ b/game/worlds/test_world/voxel_library/textures/grass_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/grass_albedo.png-e923df7587fc58ecffa47737c89aef28.stex" +path="res://.import/grass_albedo.png-7b7c1a3b62e50ce2656e87fc5c280425.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/planets/test_planet/voxel_library/textures/grass_albedo.png" -dest_files=[ "res://.import/grass_albedo.png-e923df7587fc58ecffa47737c89aef28.stex" ] +source_file="res://worlds/test_world/voxel_library/textures/grass_albedo.png" +dest_files=[ "res://.import/grass_albedo.png-7b7c1a3b62e50ce2656e87fc5c280425.stex" ] [params] diff --git a/game/modules/planets/test_planet/voxel_library/textures/grass_mossy.tres b/game/worlds/test_world/voxel_library/textures/grass_mossy.tres similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/grass_mossy.tres rename to game/worlds/test_world/voxel_library/textures/grass_mossy.tres diff --git a/game/modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png b/game/worlds/test_world/voxel_library/textures/grass_mossy_albedo.png similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png rename to game/worlds/test_world/voxel_library/textures/grass_mossy_albedo.png diff --git a/game/modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png.import b/game/worlds/test_world/voxel_library/textures/grass_mossy_albedo.png.import similarity index 65% rename from game/modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png.import rename to game/worlds/test_world/voxel_library/textures/grass_mossy_albedo.png.import index 2f4e9358..29fdd098 100644 --- a/game/modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png.import +++ b/game/worlds/test_world/voxel_library/textures/grass_mossy_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/grass_mossy_albedo.png-861c629de2ccc388005aa438b643021c.stex" +path="res://.import/grass_mossy_albedo.png-f0da5710d57a6b019978e471a1161776.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" -dest_files=[ "res://.import/grass_mossy_albedo.png-861c629de2ccc388005aa438b643021c.stex" ] +source_file="res://worlds/test_world/voxel_library/textures/grass_mossy_albedo.png" +dest_files=[ "res://.import/grass_mossy_albedo.png-f0da5710d57a6b019978e471a1161776.stex" ] [params] diff --git a/game/modules/planets/test_planet/voxel_library/textures/stone_1.tres b/game/worlds/test_world/voxel_library/textures/stone_1.tres similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/stone_1.tres rename to game/worlds/test_world/voxel_library/textures/stone_1.tres diff --git a/game/modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png b/game/worlds/test_world/voxel_library/textures/stone_1_albedo.png similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png rename to game/worlds/test_world/voxel_library/textures/stone_1_albedo.png diff --git a/game/modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png.import b/game/worlds/test_world/voxel_library/textures/stone_1_albedo.png.import similarity index 66% rename from game/modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png.import rename to game/worlds/test_world/voxel_library/textures/stone_1_albedo.png.import index a10bd42c..b47524b4 100644 --- a/game/modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png.import +++ b/game/worlds/test_world/voxel_library/textures/stone_1_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/stone_1_albedo.png-2005497c65e63455b863588ec992f956.stex" +path="res://.import/stone_1_albedo.png-8c64500eaccce690d75bb8bb1f6ccf3d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" -dest_files=[ "res://.import/stone_1_albedo.png-2005497c65e63455b863588ec992f956.stex" ] +source_file="res://worlds/test_world/voxel_library/textures/stone_1_albedo.png" +dest_files=[ "res://.import/stone_1_albedo.png-8c64500eaccce690d75bb8bb1f6ccf3d.stex" ] [params] diff --git a/game/modules/planets/test_planet/voxel_library/textures/stone_dungeon_1.tres b/game/worlds/test_world/voxel_library/textures/stone_dungeon_1.tres similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/stone_dungeon_1.tres rename to game/worlds/test_world/voxel_library/textures/stone_dungeon_1.tres diff --git a/game/modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png b/game/worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png rename to game/worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png diff --git a/game/worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png.import b/game/worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png.import new file mode 100644 index 00000000..1fa5a4a9 --- /dev/null +++ b/game/worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/stone_dungeon_1_albedo.png-221ab0602d2004f050cead17f06e8107.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://worlds/test_world/voxel_library/textures/stone_dungeon_1_albedo.png" +dest_files=[ "res://.import/stone_dungeon_1_albedo.png-221ab0602d2004f050cead17f06e8107.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +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=false +svg/scale=1.0 diff --git a/game/modules/planets/test_planet/voxel_library/textures/test.png.import b/game/worlds/test_world/voxel_library/textures/test.png.import similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/test.png.import rename to game/worlds/test_world/voxel_library/textures/test.png.import diff --git a/game/modules/planets/test_planet/voxel_library/textures/test_brick.tres b/game/worlds/test_world/voxel_library/textures/test_brick.tres similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/test_brick.tres rename to game/worlds/test_world/voxel_library/textures/test_brick.tres diff --git a/game/modules/planets/test_planet/voxel_library/textures/test_brick_albedo.png b/game/worlds/test_world/voxel_library/textures/test_brick_albedo.png similarity index 100% rename from game/modules/planets/test_planet/voxel_library/textures/test_brick_albedo.png rename to game/worlds/test_world/voxel_library/textures/test_brick_albedo.png diff --git a/game/modules/planets/test_planet/voxel_library/textures/test_brick_albedo.png.import b/game/worlds/test_world/voxel_library/textures/test_brick_albedo.png.import similarity index 65% rename from game/modules/planets/test_planet/voxel_library/textures/test_brick_albedo.png.import rename to game/worlds/test_world/voxel_library/textures/test_brick_albedo.png.import index 977fb168..ac3bff67 100644 --- a/game/modules/planets/test_planet/voxel_library/textures/test_brick_albedo.png.import +++ b/game/worlds/test_world/voxel_library/textures/test_brick_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/test_brick_albedo.png-a91e032f0cc919b0e30efae9485fabce.stex" +path="res://.import/test_brick_albedo.png-34908346a2e599b2437099267bc7061a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/planets/test_planet/voxel_library/textures/test_brick_albedo.png" -dest_files=[ "res://.import/test_brick_albedo.png-a91e032f0cc919b0e30efae9485fabce.stex" ] +source_file="res://worlds/test_world/voxel_library/textures/test_brick_albedo.png" +dest_files=[ "res://.import/test_brick_albedo.png-34908346a2e599b2437099267bc7061a.stex" ] [params]