From 86ab4b7c7d9db5e90a5403c3692e32ff0e1ad1b3 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 23 Dec 2022 23:43:28 +0100 Subject: [PATCH] Updated the engine. --- HEADS | 2 +- game/tests/test_rooms/Room1.tres | 14 +++++++------- game/tests/test_rooms/Room1.tscn | 14 +++++++------- game/tests/test_rooms/Room2.tres | 14 +++++++------- game/tests/test_rooms/Room2.tscn | 14 +++++++------- game/tests/test_rooms/Room3.tres | 16 ++++++++-------- game/tests/test_rooms/Room3.tscn | 16 ++++++++-------- game/tests/test_rooms/Room4.tres | 16 ++++++++-------- game/tests/test_rooms/Room4.tscn | 16 ++++++++-------- game/tests/test_rooms/Room5.tres | 20 ++++++++++---------- game/tests/test_rooms/Room5.tscn | 20 ++++++++++---------- game/tests/test_rooms/RoomPlug.tres | 2 +- game/tests/test_rooms/RoomPlug.tscn | 2 +- 13 files changed, 83 insertions(+), 83 deletions(-) diff --git a/HEADS b/HEADS index f9f7fbe4..f9c114d7 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "c7809991b23cd3a0908abd025e755e80ca094a18"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "b83c4f7ff82924a89ebd1b46b7b58292621b5063"}} \ No newline at end of file diff --git a/game/tests/test_rooms/Room1.tres b/game/tests/test_rooms/Room1.tres index b05687a7..79d704a9 100644 --- a/game/tests/test_rooms/Room1.tres +++ b/game/tests/test_rooms/Room1.tres @@ -11,44 +11,44 @@ points = PoolVector2Array( -1, 1, -1, -1, 0, -1, 0, 1 ) [sub_resource type="PropDataTiledWall" id=2] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) width = 6 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=3] transform = Transform( 1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 0, 0, -6 ) width = 6 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=4] transform = Transform( -1, 0, 3.17865e-08, 0, 1, 0, -3.17865e-08, 0, -1, 5, 0, -6 ) width = 5 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=5] transform = Transform( -1, 0, 3.17865e-08, -3.17865e-08, -5.96046e-08, -1, 2.66454e-15, -1, 5.96046e-08, 5, 0, 0 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=6] transform = Transform( -1, 0, 3.17865e-08, 3.17865e-08, 5.96046e-08, 1, -1.77636e-15, 1, -5.96046e-08, 5, 3, -6 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 2 ) collision = false [sub_resource type="PropDataTiledWall" id=7] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=8] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataMeshData" id=9] diff --git a/game/tests/test_rooms/Room1.tscn b/game/tests/test_rooms/Room1.tscn index f83ee6bf..09f6a5de 100644 --- a/game/tests/test_rooms/Room1.tscn +++ b/game/tests/test_rooms/Room1.tscn @@ -17,31 +17,31 @@ points = PoolVector2Array( -1, 1, -1, -1, 0, -1, 0, 1 ) [node name="WallXP" type="TiledWall" parent="."] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) width = 6 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallXN" type="TiledWall" parent="."] transform = Transform( 1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 0, 0, -6 ) width = 6 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, 0, 1, 0, -3.17865e-08, 0, -1, 5, 0, -6 ) width = 5 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="Floor" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, -3.17865e-08, -5.96046e-08, -1, 2.66454e-15, -1, 5.96046e-08, 5, 0, 0 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 10 ) [node name="Ceiling" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, 3.17865e-08, 5.96046e-08, 1, -1.77636e-15, 1, -5.96046e-08, 5, 3, -6 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 10 ) collision = false @@ -50,13 +50,13 @@ collision = false [node name="WallZN2" type="TiledWall" parent="wallzp"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN3" type="TiledWall" parent="wallzp"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="wallsegment3" type="Spatial" parent="wallzp"] diff --git a/game/tests/test_rooms/Room2.tres b/game/tests/test_rooms/Room2.tres index 5fe57da0..8f714d11 100644 --- a/game/tests/test_rooms/Room2.tres +++ b/game/tests/test_rooms/Room2.tres @@ -13,44 +13,44 @@ points = PoolVector2Array( -1, 1, -1, -1, 0, -1, 0, 1 ) [sub_resource type="PropDataTiledWall" id=2] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) width = 6 -heigth = 3 +height = 3 data = ExtResource( 5 ) [sub_resource type="PropDataTiledWall" id=3] transform = Transform( 1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 0, 0, -6 ) width = 6 -heigth = 3 +height = 3 data = ExtResource( 5 ) [sub_resource type="PropDataTiledWall" id=4] transform = Transform( -1, 0, 3.17865e-08, 0, 1, 0, -3.17865e-08, 0, -1, 5, 0, -6 ) width = 5 -heigth = 3 +height = 3 data = ExtResource( 5 ) [sub_resource type="PropDataTiledWall" id=5] transform = Transform( -1, 0, 3.17865e-08, -3.17865e-08, -5.96046e-08, -1, 2.66454e-15, -1, 5.96046e-08, 5, 0, 0 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 5 ) [sub_resource type="PropDataTiledWall" id=6] transform = Transform( -1, 0, 3.17865e-08, 3.17865e-08, 5.96046e-08, 1, -1.77636e-15, 1, -5.96046e-08, 5, 3, -6 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 5 ) collision = false [sub_resource type="PropDataTiledWall" id=7] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 5 ) [sub_resource type="PropDataTiledWall" id=8] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 5 ) [sub_resource type="PropDataMeshData" id=9] diff --git a/game/tests/test_rooms/Room2.tscn b/game/tests/test_rooms/Room2.tscn index 5d2581d8..94bf4cfc 100644 --- a/game/tests/test_rooms/Room2.tscn +++ b/game/tests/test_rooms/Room2.tscn @@ -45,31 +45,31 @@ points = PoolVector2Array( -1, 1, -1, -1, 0, -1, 0, 1 ) [node name="WallXP" type="TiledWall" parent="."] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) width = 6 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallXN" type="TiledWall" parent="."] transform = Transform( 1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 0, 0, -6 ) width = 6 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, 0, 1, 0, -3.17865e-08, 0, -1, 5, 0, -6 ) width = 5 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="Floor" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, -3.17865e-08, -5.96046e-08, -1, 2.66454e-15, -1, 5.96046e-08, 5, 0, 0 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 10 ) [node name="Ceiling" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, 3.17865e-08, 5.96046e-08, 1, -1.77636e-15, 1, -5.96046e-08, 5, 3, -6 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 10 ) collision = false @@ -78,13 +78,13 @@ collision = false [node name="WallZN2" type="TiledWall" parent="wallzp"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN3" type="TiledWall" parent="wallzp"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="wallsegment3" type="Spatial" parent="wallzp"] diff --git a/game/tests/test_rooms/Room3.tres b/game/tests/test_rooms/Room3.tres index 217eb366..57b39a25 100644 --- a/game/tests/test_rooms/Room3.tres +++ b/game/tests/test_rooms/Room3.tres @@ -7,38 +7,38 @@ [sub_resource type="PropDataTiledWall" id=1] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) width = 10 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=2] transform = Transform( 1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 0, 0, -10 ) width = 10 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=3] transform = Transform( -1, 0, 3.17865e-08, -3.17865e-08, -5.96046e-08, -1, 2.66454e-15, -1, 5.96046e-08, 5, 0, 0 ) width = 5 -heigth = 10 +height = 10 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=4] transform = Transform( -1, 0, 3.17865e-08, 3.17865e-08, 5.96046e-08, 1, -1.77636e-15, 1, -5.96046e-08, 5, 3, -10 ) width = 5 -heigth = 10 +height = 10 data = ExtResource( 2 ) collision = false [sub_resource type="PropDataTiledWall" id=5] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=6] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataMeshData" id=7] @@ -53,13 +53,13 @@ points = PoolVector2Array( -1, 1, -1, -1, 0, -1, 0, 1 ) [sub_resource type="PropDataTiledWall" id=9] transform = Transform( -1, 0, -1.43059e-07, 0, 1, 0, 1.43059e-07, 0, -1, 5, 0, -10 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=10] transform = Transform( -1, 0, -1.43059e-07, 0, 1, 0, 1.43059e-07, 0, -1, 2, 0, -10 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataMeshData" id=11] diff --git a/game/tests/test_rooms/Room3.tscn b/game/tests/test_rooms/Room3.tscn index 58c0c5db..dba28475 100644 --- a/game/tests/test_rooms/Room3.tscn +++ b/game/tests/test_rooms/Room3.tscn @@ -13,25 +13,25 @@ points = PoolVector3Array( 1.99, 3.01, 0.0100002, 1.99, 3.01, -10.01, 3.01, 3.01 [node name="WallXP" type="TiledWall" parent="."] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) width = 10 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallXN" type="TiledWall" parent="."] transform = Transform( 1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 0, 0, -10 ) width = 10 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="Floor" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, -3.17865e-08, -5.96046e-08, -1, 2.66454e-15, -1, 5.96046e-08, 5, 0, 0 ) width = 5 -heigth = 10 +height = 10 data = ExtResource( 10 ) [node name="Ceiling" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, 3.17865e-08, 5.96046e-08, 1, -1.77636e-15, 1, -5.96046e-08, 5, 3, -10 ) width = 5 -heigth = 10 +height = 10 data = ExtResource( 10 ) collision = false @@ -40,13 +40,13 @@ collision = false [node name="WallZN2" type="TiledWall" parent="wallzp"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN3" type="TiledWall" parent="wallzp"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="wallsegment3" type="Spatial" parent="wallzp"] @@ -68,13 +68,13 @@ transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 5, 0, - [node name="WallZN2" type="TiledWall" parent="wallzp2"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN3" type="TiledWall" parent="wallzp2"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="wallsegment3" type="Spatial" parent="wallzp2"] diff --git a/game/tests/test_rooms/Room4.tres b/game/tests/test_rooms/Room4.tres index 8710e217..971f623d 100644 --- a/game/tests/test_rooms/Room4.tres +++ b/game/tests/test_rooms/Room4.tres @@ -7,38 +7,38 @@ [sub_resource type="PropDataTiledWall" id=1] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) width = 16 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=2] transform = Transform( 1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 0, 0, -16 ) width = 16 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=3] transform = Transform( -1, 0, 3.17865e-08, -3.17865e-08, -5.96046e-08, -1, 2.66454e-15, -1, 5.96046e-08, 5, 0, 0 ) width = 5 -heigth = 16 +height = 16 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=4] transform = Transform( -1, 0, 3.17865e-08, 3.17865e-08, 5.96046e-08, 1, -1.77636e-15, 1, -5.96046e-08, 5, 3, -16 ) width = 5 -heigth = 16 +height = 16 data = ExtResource( 2 ) collision = false [sub_resource type="PropDataTiledWall" id=5] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=6] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataMeshData" id=7] @@ -53,13 +53,13 @@ points = PoolVector2Array( -1, 1, -1, -1, 0, -1, 0, 1 ) [sub_resource type="PropDataTiledWall" id=9] transform = Transform( -1, 0, -1.43059e-07, 0, 1, 0, 1.43059e-07, 0, -1, 5, 0, -16 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=10] transform = Transform( -1, 0, -1.43059e-07, 0, 1, 0, 1.43059e-07, 0, -1, 2, 0, -16 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataMeshData" id=11] diff --git a/game/tests/test_rooms/Room4.tscn b/game/tests/test_rooms/Room4.tscn index 6768bf11..315a69df 100644 --- a/game/tests/test_rooms/Room4.tscn +++ b/game/tests/test_rooms/Room4.tscn @@ -13,25 +13,25 @@ points = PoolVector3Array( 1.99, 3.01, 0.0100002, 1.99, 3.01, -16.01, 3.01, 3.01 [node name="WallXP" type="TiledWall" parent="."] transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 ) width = 16 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallXN" type="TiledWall" parent="."] transform = Transform( 1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 0, 0, -16 ) width = 16 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="Floor" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, -3.17865e-08, -5.96046e-08, -1, 2.66454e-15, -1, 5.96046e-08, 5, 0, 0 ) width = 5 -heigth = 16 +height = 16 data = ExtResource( 10 ) [node name="Ceiling" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, 3.17865e-08, 5.96046e-08, 1, -1.77636e-15, 1, -5.96046e-08, 5, 3, -16 ) width = 5 -heigth = 16 +height = 16 data = ExtResource( 10 ) collision = false @@ -40,13 +40,13 @@ collision = false [node name="WallZN2" type="TiledWall" parent="wallzp"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN3" type="TiledWall" parent="wallzp"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="wallsegment3" type="Spatial" parent="wallzp"] @@ -68,13 +68,13 @@ transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 5, 0, - [node name="WallZN2" type="TiledWall" parent="wallzp2"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN3" type="TiledWall" parent="wallzp2"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="wallsegment3" type="Spatial" parent="wallzp2"] diff --git a/game/tests/test_rooms/Room5.tres b/game/tests/test_rooms/Room5.tres index 594c5046..b5a67ce8 100644 --- a/game/tests/test_rooms/Room5.tres +++ b/game/tests/test_rooms/Room5.tres @@ -7,26 +7,26 @@ [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 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=2] transform = Transform( -1, 0, 3.17865e-08, 3.17865e-08, 5.96046e-08, 1, -1.77636e-15, 1, -5.96046e-08, 5, 3, -6 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 2 ) collision = false [sub_resource type="PropDataTiledWall" id=3] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=4] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataPortal" id=5] @@ -41,13 +41,13 @@ texture = ExtResource( 3 ) [sub_resource type="PropDataTiledWall" id=7] transform = Transform( -1, 0, -1.43059e-07, 0, 1, 0, 1.43059e-07, 0, -1, 5, 0, -6 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=8] transform = Transform( -1, 0, -1.43059e-07, 0, 1, 0, 1.43059e-07, 0, -1, 2, 0, -6 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataPortal" id=9] @@ -62,13 +62,13 @@ texture = ExtResource( 3 ) [sub_resource type="PropDataTiledWall" id=11] transform = Transform( 6.75612e-08, 0, -1, 0, 1, 0, 1, 0, 6.75612e-08, 0, 0, -6 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=12] transform = Transform( 6.75612e-08, 0, -1, 0, 1, 0, 1, 0, 6.75612e-08, 3.57747e-08, 0, -3 ) width = 3 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataPortal" id=13] @@ -83,13 +83,13 @@ texture = ExtResource( 3 ) [sub_resource type="PropDataTiledWall" id=15] transform = Transform( -9.93477e-08, 0, 1, 0, 1, 0, -1, 0, -9.93477e-08, 5, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataTiledWall" id=16] transform = Transform( -9.93477e-08, 0, 1, 0, 1, 0, -1, 0, -9.93477e-08, 5, 0, -3 ) width = 3 -heigth = 3 +height = 3 data = ExtResource( 2 ) [sub_resource type="PropDataPortal" id=17] diff --git a/game/tests/test_rooms/Room5.tscn b/game/tests/test_rooms/Room5.tscn index d9db50b6..8ee01380 100644 --- a/game/tests/test_rooms/Room5.tscn +++ b/game/tests/test_rooms/Room5.tscn @@ -13,13 +13,13 @@ points = PoolVector3Array( -0.01, 3.01, -4.29, -0.01, 2.255, -4.29, 1.66333, 0.7 [node name="Floor" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, -3.17865e-08, -5.96046e-08, -1, 2.66454e-15, -1, 5.96046e-08, 5, 0, 0 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 10 ) [node name="Ceiling" type="TiledWall" parent="."] transform = Transform( -1, 0, 3.17865e-08, 3.17865e-08, 5.96046e-08, 1, -1.77636e-15, 1, -5.96046e-08, 5, 3, -6 ) width = 5 -heigth = 6 +height = 6 data = ExtResource( 10 ) collision = false @@ -28,13 +28,13 @@ collision = false [node name="WallZN2" type="TiledWall" parent="wallzp"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN3" type="TiledWall" parent="wallzp"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="Portal" type="Portal" parent="wallzp"] @@ -56,13 +56,13 @@ transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 5, 0, - [node name="WallZN2" type="TiledWall" parent="wallzp2"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN3" type="TiledWall" parent="wallzp2"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="Portal" type="Portal" parent="wallzp2"] @@ -84,13 +84,13 @@ transform = Transform( 1.19249e-08, 0, -1, 0, 1, 0, 1, 0, 1.19249e-08, 0, 0, -6 [node name="WallZN2" type="TiledWall" parent="wallzp3"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN3" type="TiledWall" parent="wallzp3"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 3 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="Portal" type="Portal" parent="wallzp3"] @@ -112,13 +112,13 @@ transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5, 0, 0 [node name="WallZN2" type="TiledWall" parent="wallzp4"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 0, 0, 0 ) width = 2 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="WallZN3" type="TiledWall" parent="wallzp4"] transform = Transform( 1, 0, 5.56363e-08, 0, 1, 0, -5.56363e-08, 0, 1, 3, 0, 0 ) width = 3 -heigth = 3 +height = 3 data = ExtResource( 10 ) [node name="Portal" type="Portal" parent="wallzp4"] diff --git a/game/tests/test_rooms/RoomPlug.tres b/game/tests/test_rooms/RoomPlug.tres index 49208c35..69b89494 100644 --- a/game/tests/test_rooms/RoomPlug.tres +++ b/game/tests/test_rooms/RoomPlug.tres @@ -4,7 +4,7 @@ [sub_resource type="PropDataTiledWall" id=1] transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0.5, -1, 0 ) -heigth = 2 +height = 2 data = ExtResource( 1 ) [resource] diff --git a/game/tests/test_rooms/RoomPlug.tscn b/game/tests/test_rooms/RoomPlug.tscn index f4c7d0ae..672b1731 100644 --- a/game/tests/test_rooms/RoomPlug.tscn +++ b/game/tests/test_rooms/RoomPlug.tscn @@ -6,5 +6,5 @@ [node name="Floor" type="TiledWall" parent="."] transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0.5, -1, 0 ) -heigth = 2 +height = 2 data = ExtResource( 10 )