From 8fd7a5133d037a8260f0c4c7440b93d3f615a865 Mon Sep 17 00:00:00 2001 From: Pal Date: Thu, 22 Jan 2026 17:54:12 -0800 Subject: [PATCH] A1 Floor Progress --- .../src/map/Placeables/A1-Socket.tscn | 58 ++++++++++++++ .../map/dungeon/floors/Floor01/Floor 1A.tscn | 78 ++++++++++++++----- .../map/dungeon/floors/Floor01/Floor 1B.tscn | 32 +++++--- .../map/dungeon/floors/Floor01/Floor 1C.tscn | 64 ++++++++------- .../floors/{Floor06 => Floor05}/Floor 6A.tscn | 0 .../floors/{Floor07 => Floor06}/Floor 7A.tscn | 0 .../floors/{Floor06 => Floor07}/Floor 8Z.tscn | 0 .../floors/{Floor06 => Floor07}/Floor 9A.tscn | 0 ...loor B.tscn => Floor 16 Boss Floor B.tscn} | 0 ...Floor A.tscn => Floor 8 Boss Floor A.tscn} | 0 10 files changed, 175 insertions(+), 57 deletions(-) create mode 100644 Zennysoft.Game.Ma/src/map/Placeables/A1-Socket.tscn rename Zennysoft.Game.Ma/src/map/dungeon/floors/{Floor06 => Floor05}/Floor 6A.tscn (100%) rename Zennysoft.Game.Ma/src/map/dungeon/floors/{Floor07 => Floor06}/Floor 7A.tscn (100%) rename Zennysoft.Game.Ma/src/map/dungeon/floors/{Floor06 => Floor07}/Floor 8Z.tscn (100%) rename Zennysoft.Game.Ma/src/map/dungeon/floors/{Floor06 => Floor07}/Floor 9A.tscn (100%) rename Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/{Floor 20 Boss Floor B.tscn => Floor 16 Boss Floor B.tscn} (100%) rename Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/{Floor 10 Boss Floor A.tscn => Floor 8 Boss Floor A.tscn} (100%) diff --git a/Zennysoft.Game.Ma/src/map/Placeables/A1-Socket.tscn b/Zennysoft.Game.Ma/src/map/Placeables/A1-Socket.tscn new file mode 100644 index 00000000..dc5bbf98 --- /dev/null +++ b/Zennysoft.Game.Ma/src/map/Placeables/A1-Socket.tscn @@ -0,0 +1,58 @@ +[gd_scene load_steps=6 format=4 uid="uid://cxwyge2s1yswu"] + +[ext_resource type="Texture2D" uid="uid://dhy1mnlu5586u" path="res://src/map/dungeon/models/Corridor Models/A1 Corridor Blocks/A1-SOCKET_darkbrick.png" id="1_sad7m"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3mb4u"] +resource_name = "Material" +cull_mode = 2 +albedo_texture = ExtResource("1_sad7m") +roughness = 0.0 + +[sub_resource type="ArrayMesh" id="ArrayMesh_1nmy1"] +_surfaces = [{ +"aabb": AABB(-2.11891, -1.30969, -0.108846, 4.23783, 4.21742, 0.219087), +"format": 34896613377, +"index_count": 156, +"index_data": PackedByteArray("AAAQAAIAEAARAAIABAAAAAIAEAABABEAAgARABIAAgASAAUABAACAAUAEwASABEAEQABABQAEwARABQAEwADABIABQASAAMAEwALAAMAFQATABQAFQALABMAFAABAAYAFQAUABYAFAAGABYABAAWAAYAFwAGAAEAFwABABAABAAGABcAFwAQAAgAAAAIABAACgAVABYACgAWAAQAGAAVAAoAGAALABUABAAFAAoADAAYAAoABQAMAAoAGQALABgAGQADAAsABQADABkAGQAYAA0ADAANABgABQAZAA8AGQANAA8ABQAOAAwABQAPAA4AAAAMAA4ADgAPAAgADgAIAAAABwAIAA8ABwAPAA0AFwAIAAcABAAXAAcAAAAJAAwABAAJAAAACQANAAwABAAHAAkACQAHAA0A"), +"lods": [0.0247026, PackedByteArray("AAABAAIAAQADAAIABAAAAAIAAgADAAUABAACAAUAAwABAAYABwAGAAEABAAGAAcAAAAIAAEABwABAAgABAAJAAAABAAHAAkACgAGAAQABAAFAAoABgALAAMACwAGAAoABQAMAAoADAALAAoAAAAJAAwAAwALAA0ADAANAAsACQANAAwACQAHAA0AAAAMAA4ABQAOAAwADgAIAAAABQADAA8ABQAPAA4AAwANAA8ADgAPAAgABwAPAA0ABwAIAA8A")], +"name": "Material", +"primitive": 3, +"uv_scale": Vector4(0, 0, 0, 0), +"vertex_count": 26, +"vertex_data": PackedByteArray("0PjH+Lb6AAD//wAA//8AAND4+gW2+gAAAAAAAPn6AADQ+PoFAAAAAC4H+gW2+gAA//8AAAADAAD/////AAMAAP/////5+gAA0PjH+AAAAAAuB/oFAAAAAAAAAAAAAwAALgfH+AAAAAAAAP//AAMAAC4Hx/i2+gAAAAD/////AAD///oF//8AAND4AAC2+gAALgcAALb6AAAuBwAAyIMAAND4AADIgwAALgcAAAAAAADQ+AAAAAAAAP//+gUAAwAAAAD6BQADAAAAAPoF+foAAA==") +}] +blend_shape_mode = 0 + +[sub_resource type="ArrayMesh" id="ArrayMesh_60r3a"] +resource_name = "A1-SOCKET_Cube" +_surfaces = [{ +"aabb": AABB(-2.11891, -1.30969, -0.108846, 4.23783, 4.21742, 0.219087), +"attribute_data": PackedByteArray("hPpkBv//uuKE+m7duTy64v//AAAzQm7dM0JkBrk8AACE+m7d//+64v//AAAzQm7dhPpkBrk8uuK5PAAAM0JkBkKjAABCo7riSJm64nuZAAD//7SduTy0nbk8HKn//1epe5m64kKjAABImQAAQqO64v//tJ25PFepuTy0nf//HKmE+pCdM0IZqTNCkJ2E+hmpYaNu3X6ZZAZ+mW7dYaNkBoT6GakzQpCdM0IZqYT6kJ1+mW7dYaNkBmGjbt1+mWQGhPpkBv//b92E+m7d//8AAIT6bt3//2/dhPq64v//AACE+mQGuTxv3TNCuuIzQm7dM0JkBrk8AAD//2/dhPq64oT6bt0zQm7duTwAADNCZAa5PG/dM0Kgo4T6GamE+qCjM0IZqTNCkJ2E+pCdhPqgo4T6kJ2E+hmpM0KgozNCGakzQpCdhPq64jNCuuIzQrrihPq64jNCbt25PG/dM0K64kKjb91ImW/de5lv3UKjb90="), +"format": 34896613399, +"index_count": 156, +"index_data": PackedByteArray("MAAxADIAMAAzADEABgAEAAAABgAHAAQANAAJADUANAA2AAkANAA1ADcANAA3ADgADAAOAA8ADAAKAA4AOQA6ADsAOQANADoAPAA5ADsAPAA9ADkAPgA/AEAAPgABAD8AQQBCAEMAQQBEAEIARQBGAEcARQBIAEYASQBFAEcASQBHAEoASwAUAEwASwAXABQATQAXAEsATgAWAE8ATgAVABYAUAAVAE4ACwBRAAgACwBSAFEAAgBTAAUAAgBUAFMAVQADAFYAVQBXAAMAWAASAFkAWAARABIAWABZABMAWAATABAAWgAbAFsAWgAYABsAWgBbABkAWgAZABoAHAAdAB4AHAAfAB0AIAAhACIAIAAjACEAJAAlACYAJAAnACUAKAApACoAKAArACkALAAtAC4ALAAvAC0A"), +"lods": [0.0247026, PackedByteArray("AAABAAIAAQADAAIAAAAEAAEAAgADAAUABgAEAAAABQADAAcABgAHAAQABQAHAAYACAAJAAoACwAJAAgACAAKAAwADQAJAAsADAAKAA4ADwANAAsADAAOAA8ADwAOAA0AEAARABIAEAASABMAFAAVABYAFgAXABQAGAAZABoAGAAbABkAHAAdAB4AHAAfAB0AIAAhACIAIAAjACEAJAAlACYAJAAnACUAKAApACoAKAArACkALAAtAC4ALAAvAC0A")], +"material": SubResource("StandardMaterial3D_3mb4u"), +"name": "Material", +"primitive": 3, +"uv_scale": Vector4(4.21577, 3.61338, 0, 0), +"vertex_count": 92, +"vertex_data": PackedByteArray("0PjH+Lb6z4D//wAA//+LgdD4+gW2+gCAAAAAAPn6E4D/////+frPgC4H+gW2+gCALgfH+Lb6z4AAAP/////PgND4+gUAAAAA//8AAAADAAD/////AAPhAC4H+gUAAAAA0PjH+AAA4QAAAAAAAAMAAAAA//8AA+EALgfH+AAA4QD/////AAP/v///AAAAA/+///8AAP///7//////+fr/v///AAAAA/8/AAAAAAAD/z8AAAAA+fr/P///AAD///8/AAAAAPn6AAAAAP//AAMAAAAA/////wAAAAAAAAADAAD/////AAP/vwAA//////+/AAD//wAD/7//////+fr/v9D4+gUAAP+/Lgf6Bbb6/78uB/oFAAD/v9D4+gW2+v+/0Pj6BQAAAADQ+Mf4tvoAAND4+gW2+gAA0PjH+AAAAADQ+Mf4tvr/Py4Hx/gAAP8/LgfH+Lb6/z/Q+Mf4AAD/Py4H+gW2+v+/LgfH+AAA/78uB/oFAAD/vy4Hx/i2+v+/0PjH+Lb60oD///oF///SgND4+gW2+tKA//////n60oDQ+PoFAAAAAP//+gUAAwAA0PgAAAAAAAD/////AAMAAND4x/gAAAAAAAD6BQADAAAuBwAAAAAAAC4H+gUAAAAALgfH+AAAAAAAAP//AAMAAP//+gX//4uB0PgAALb6i4HQ+PoFtvqLgS4H+gW2+syAAAD/////zYAuB8f4tvrMgAAA+gX5+s2ALgcAAMiD/z/Q+AAAtvr/P9D4AADIg/8/LgcAALb6/z8uBwAAAAD/P9D4AAAAAP8/0PgAAMiD/z/Q+AAAAAD/P9D4AAC2+v8/LgcAAMiD/z8uBwAAtvr/Py4HAAAAAP8/0PgAAAAAAAAuBwAAAAAAAC4HAAC2+gCA0PgAALb6AIAuB/oFtvoTgAAA+gX5+hOALgcAALb6E4D///oFAAP/v///+gX///+/AAD6Bfn6AAAAAPoFAAMAACID1Hz/f/7//3////9/AAAiA9V8/3///zoD3Hw7A9x8////f6D+/3////9/////f////3/+/12B////f////3//fwAA/38AAP9/AAD/fwAACQAEgAQA9X8EAPV/CQAEgP8//3//P/9//z//f/8//3////9/////f////3////9/////f////3////9/////f/8//3//P/9//z//f/8//38AAP9/AAD/fwAA/38AAP9//38AAP9/AAD/fwAA/38AAB2D5/wWg9L8FoPS/B2D5/yg/v9/oP7/f6D+/3+g/v9/oP7/f///XYH//6F+/v+hfv7/oX7+/6F+/3/+//9///8AgP7/z3wrA9V8QAPVfEEDz3wqAwAA/38AAP9/AAD/fwAA/38AAP9/AAD/fwkABIAJAASACQAEgAQA9X8EAPV/BAD1f////3////9//3////9////9fwAA/38KAPN/AAD/fwAA/38AAP8//3//P/9/") +}] +blend_shape_mode = 0 +shadow_mesh = SubResource("ArrayMesh_1nmy1") + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_h70sy"] +albedo_texture = ExtResource("1_sad7m") +metallic_specular = 0.0 + +[node name="Node3D" type="Node3D"] + +[node name="A1-SOCKET" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00562894, 0, 0.291303) + +[node name="CUBE" type="MeshInstance3D" parent="A1-SOCKET"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.21118, -0.341724) +mesh = SubResource("ArrayMesh_60r3a") +skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_h70sy") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1A.tscn index 2bc75739..fa9a961c 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1A.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1A.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://bb5xm6p81w671"] +[gd_scene load_steps=14 format=3 uid="uid://bb5xm6p81w671"] [ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_giyav"] [ext_resource type="PackedScene" uid="uid://dpec2lbt83dhe" path="res://src/map/dungeon/rooms/Set A/03. Antechamber A.tscn" id="2_tmolq"] @@ -7,43 +7,83 @@ [ext_resource type="PackedScene" uid="uid://cjxrkxr0bgeh1" path="res://src/map/dungeon/corridors/A1 - Corridor - Corner .tscn" id="5_5con5"] [ext_resource type="PackedScene" uid="uid://dlrd6vvwaqq3n" path="res://src/map/dungeon/corridors/A1 - Corridor - 3 Block .tscn" id="6_mq4q7"] [ext_resource type="PackedScene" uid="uid://8d6n4tk5aam0" path="res://src/map/dungeon/corridors/A1 - Corridor - 1 Block.tscn" id="9_ur6qm"] +[ext_resource type="PackedScene" uid="uid://tpgwccr6v43e" path="res://src/map/dungeon/rooms/Set A/04. Tree Antechamber.tscn" id="10_bn263"] [ext_resource type="PackedScene" uid="uid://dfjc54vc4yc45" path="res://src/map/dungeon/corridors/A1 - Corridor - 2 Block .tscn" id="10_qjcvn"] +[ext_resource type="PackedScene" uid="uid://cf28w6f6dvu5a" path="res://src/map/dungeon/corridors/A1 - Corridor - S-Block .tscn" id="11_csng8"] [ext_resource type="PackedScene" uid="uid://dv6umo0bmlyyj" path="res://src/map/dungeon/rooms/Set A/01. Small Block A1.tscn" id="11_uvfam"] [ext_resource type="PackedScene" uid="uid://cdkcvd7pwmr2r" path="res://src/map/dungeon/door/DOORA.tscn" id="11_xhpnf"] -[ext_resource type="PackedScene" uid="uid://nghm4vbxdvcx" path="res://src/map/dungeon/corridors/A1 - Corridor - Zag Block .tscn" id="12_5con5"] +[ext_resource type="PackedScene" uid="uid://cxwyge2s1yswu" path="res://src/map/Placeables/A1-Socket.tscn" id="13_buew1"] [node name="Floor1a" type="Node3D"] script = ExtResource("1_giyav") -[node name="Floor Exit A" parent="." instance=ExtResource("3_qjcvn")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -60.0561, 0, 50.043) - [node name="Antechamber A" parent="." instance=ExtResource("2_tmolq")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2, 0, 56) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.03533, -0.0182438, 52.0031) [node name="Statue Room" parent="." instance=ExtResource("4_3ke1n")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -25.8879, 0, 71.9623) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -25.8879, 0, 75.9623) [node name="Node3D5" parent="." instance=ExtResource("11_xhpnf")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 30, 0, 65.8897) +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 30, 0, 66.0032) [node name="Node3D7" parent="." instance=ExtResource("11_xhpnf")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 20, 0, 76) +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 19.9858, 0, 76) [node name="Node3D2" parent="." instance=ExtResource("6_mq4q7")] -transform = Transform3D(-1, 0, -4.37114e-08, 0, 1, 0, 4.37114e-08, 0, -1, -5.96229, 0, 71.9137) - -[node name="Node3D6" parent="." instance=ExtResource("9_ur6qm")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -29.8016, 0, 63.9414) +transform = Transform3D(-1, 0, -4.37114e-08, 0, 1, 0, 4.37114e-08, 0, -1, -5.96229, 0, 75.9979) [node name="Node3D" parent="." instance=ExtResource("10_qjcvn")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -45.8016, 0, 52) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -45.9135, 0, 52) [node name="01_SmallBlockA1" parent="." instance=ExtResource("11_uvfam")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19.9816, 0, 65.9449) - -[node name="Node3D8" parent="." instance=ExtResource("12_5con5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, 67.9054) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19.9816, 0.00938019, 66.0171) [node name="Node3D4" parent="." instance=ExtResource("5_5con5")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 22, 0, 48) +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 22, 0, 44) + +[node name="Floor Exit A2" parent="." instance=ExtResource("3_qjcvn")] +transform = Transform3D(-8.74228e-08, 0, 2, 0, 2, 0, -2, 0, -8.74228e-08, -74.4353, 0, 49.963) + +[node name="Antechamber B" parent="." instance=ExtResource("10_bn263")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -18.0505, -0.0475407, 59.9299) + +[node name="CA1_SBLOCK" parent="." instance=ExtResource("11_csng8")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.9293, 0, 52) + +[node name="A1C1BLOCK" parent="." instance=ExtResource("9_ur6qm")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 22, 0, 56) + +[node name="A1C1BLOCK2" parent="." instance=ExtResource("9_ur6qm")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.92934, 0, 40) + +[node name="CA1_CORNERBLOCK" parent="." instance=ExtResource("5_5con5")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 2, 0, 80) + +[node name="CA1_CORNERBLOCK2" parent="." instance=ExtResource("5_5con5")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -2, 0, 64) + +[node name="A1C1BLOCK3" parent="." instance=ExtResource("9_ur6qm")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, 68) + +[node name="CA1_2BLOCK" parent="." instance=ExtResource("10_qjcvn")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -30, 0, 60) + +[node name="Node3D3" parent="." instance=ExtResource("13_buew1")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -17.943, 0.01525, 49.9781) + +[node name="Node3D6" parent="." instance=ExtResource("13_buew1")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, -37.8122, -0.0254598, 50.1083) + +[node name="Node3D8" parent="." instance=ExtResource("13_buew1")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -46.0081, 0.145328, 50.0148) + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] + +[node name="Node3D9" parent="." instance=ExtResource("13_buew1")] +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 9.95955, 0.0374287, 66.1088) + +[node name="Node3D10" parent="." instance=ExtResource("13_buew1")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 14.0633, 0.0952542, 46.0135) + +[node name="Node3D11" parent="." instance=ExtResource("13_buew1")] +transform = Transform3D(0.96, 0, 0, 0, 1, 0, 0, 0, 1, -28.008, 0.0418303, 59.8829) diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1B.tscn index d845ca40..9e535ce6 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1B.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1B.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://d1jfmmhdjqktq"] +[gd_scene load_steps=12 format=3 uid="uid://d1jfmmhdjqktq"] [ext_resource type="PackedScene" uid="uid://cihbmyo0ltq4m" path="res://src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn" id="1_52jyt"] [ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_k4vyx"] @@ -10,36 +10,46 @@ [ext_resource type="PackedScene" uid="uid://cf28w6f6dvu5a" path="res://src/map/dungeon/corridors/A1 - Corridor - S-Block .tscn" id="7_so5vv"] [ext_resource type="PackedScene" uid="uid://b82dx66mgs2d7" path="res://src/map/dungeon/rooms/Set A/08. Basin Room.tscn" id="8_8y1dv"] [ext_resource type="PackedScene" uid="uid://cdkcvd7pwmr2r" path="res://src/map/dungeon/door/DOORA.tscn" id="9_qh6n2"] +[ext_resource type="PackedScene" uid="uid://cxwyge2s1yswu" path="res://src/map/Placeables/A1-Socket.tscn" id="11_ve300"] [node name="Floor1b" type="Node3D"] script = ExtResource("1_k4vyx") -[node name="Floor Exit A" parent="." instance=ExtResource("1_52jyt")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27.9055, 0, 9.75967) - [node name="Antechamber A" parent="." instance=ExtResource("2_qurvf")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -6.1456, 0, 52) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -6.1456, 0.0232176, 51.9572) [node name="Antechamber B" parent="." instance=ExtResource("3_dqrwe")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -38, 0, 40) [node name="Statue Room" parent="." instance=ExtResource("4_dcpft")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -57.9694, 0, 36.0695) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -57.9694, 0.00459909, 36.1136) [node name="Node3D" parent="." instance=ExtResource("5_qhw0h")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -30, 0, 24) +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -30.0437, 0.0287123, 24) [node name="Node3D2" parent="." instance=ExtResource("6_jugwp")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -50, 0, 40) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -50.0437, 0.0287123, 40) [node name="Node3D3" parent="." instance=ExtResource("7_so5vv")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18.021, 0, 52) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18.021, 0.0232176, 51.9572) [node name="BasinRoom" parent="." instance=ExtResource("8_8y1dv")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -60.0081, 0, 4) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -59.9822, -0.0183083, 4) [node name="Node3D4" parent="." instance=ExtResource("5_qhw0h")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -62.0081, 0, 12) +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -62.0081, -2.38419e-07, 12) [node name="Node3D5" parent="." instance=ExtResource("9_qh6n2")] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 9.97902, 0, 46) + +[node name="Floor Exit A" parent="." instance=ExtResource("1_52jyt")] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -27.9471, 0, -4.255) + +[node name="Node3D6" parent="." instance=ExtResource("11_ve300")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -18.0115, -0.0147288, 49.9624) + +[node name="Node3D7" parent="." instance=ExtResource("11_ve300")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -59.9942, -0.0174925, 27.8728) + +[node name="Node3D8" parent="." instance=ExtResource("11_ve300")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -59.9126, 0.0301168, 12.1208) diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1C.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1C.tscn index 50a2eed4..647dc937 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1C.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1C.tscn @@ -1,45 +1,55 @@ -[gd_scene load_steps=11 format=3 uid="uid://dcxbyels7w0oa"] +[gd_scene load_steps=12 format=3 uid="uid://dcxbyels7w0oa"] [ext_resource type="PackedScene" uid="uid://cihbmyo0ltq4m" path="res://src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn" id="1_crtd2"] [ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_ndvnk"] -[ext_resource type="PackedScene" uid="uid://dpec2lbt83dhe" path="res://src/map/dungeon/rooms/Set A/03. Antechamber A.tscn" id="2_ynhbs"] +[ext_resource type="PackedScene" uid="uid://b8u3sfhexlhfu" path="res://src/map/dungeon/rooms/Set A/Circle Room.tscn" id="3_7ysko"] [ext_resource type="PackedScene" uid="uid://tpgwccr6v43e" path="res://src/map/dungeon/rooms/Set A/04. Tree Antechamber.tscn" id="3_g0wcu"] -[ext_resource type="PackedScene" uid="uid://ce0cjm6v7ct6c" path="res://src/map/dungeon/rooms/Set A/07. CornerBlock Antechamber.tscn" id="4_vqx45"] [ext_resource type="PackedScene" uid="uid://b6tcqnvlc5ayk" path="res://src/map/dungeon/corridors/A1 - Corridor - 4 Block .tscn" id="5_vrrsb"] -[ext_resource type="PackedScene" uid="uid://8u5kue6pljh0" path="res://src/map/dungeon/corridors/A1 - Corridor - Z-Block.tscn" id="6_eu7gt"] -[ext_resource type="PackedScene" uid="uid://cf28w6f6dvu5a" path="res://src/map/dungeon/corridors/A1 - Corridor - S-Block .tscn" id="7_ggb6k"] +[ext_resource type="PackedScene" uid="uid://dv6umo0bmlyyj" path="res://src/map/dungeon/rooms/Set A/01. Small Block A1.tscn" id="6_cqa8w"] +[ext_resource type="PackedScene" uid="uid://dfjc54vc4yc45" path="res://src/map/dungeon/corridors/A1 - Corridor - 2 Block .tscn" id="7_54mxl"] +[ext_resource type="PackedScene" uid="uid://dlrd6vvwaqq3n" path="res://src/map/dungeon/corridors/A1 - Corridor - 3 Block .tscn" id="8_a5tiv"] [ext_resource type="PackedScene" uid="uid://b82dx66mgs2d7" path="res://src/map/dungeon/rooms/Set A/08. Basin Room.tscn" id="8_mm2su"] [ext_resource type="PackedScene" uid="uid://cdkcvd7pwmr2r" path="res://src/map/dungeon/door/DOORA.tscn" id="9_x2uvf"] +[ext_resource type="PackedScene" uid="uid://cxwyge2s1yswu" path="res://src/map/Placeables/A1-Socket.tscn" id="11_7ykih"] [node name="Floor1c" type="Node3D"] script = ExtResource("1_ndvnk") [node name="Floor Exit A" parent="." instance=ExtResource("1_crtd2")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27.9055, 0, 9.75967) +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -27.9429, 0, -4.39086) -[node name="Antechamber A" parent="." instance=ExtResource("2_ynhbs")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -6, 0, 52) - -[node name="Antechamber B" parent="." instance=ExtResource("3_g0wcu")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -38, 0, 40) - -[node name="Statue Room" parent="." instance=ExtResource("4_vqx45")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -57.9995, 0, 36.0695) - -[node name="Node3D" parent="." instance=ExtResource("5_vrrsb")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -30, 0, 24) - -[node name="Node3D2" parent="." instance=ExtResource("6_eu7gt")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -50, 0, 40) - -[node name="Node3D3" parent="." instance=ExtResource("7_ggb6k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18, 0, 52) +[node name="A1CircleRoom" parent="." instance=ExtResource("3_7ysko")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 4, 2.00561, 33.9984) [node name="BasinRoom" parent="." instance=ExtResource("8_mm2su")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -60, 0, 4) +transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 37.9683, 0, 34) -[node name="Node3D4" parent="." instance=ExtResource("5_vrrsb")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -62, 0, 12) +[node name="Antechamber B" parent="." instance=ExtResource("3_g0wcu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -37.9453, -0.0433989, 60) + +[node name="01_SmallBlockA1" parent="." instance=ExtResource("6_cqa8w")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -28, 0, 34.02) + +[node name="CA1_2BLOCK" parent="." instance=ExtResource("7_54mxl")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18, 0, 36) + +[node name="CA1_3BLOCK" parent="." instance=ExtResource("8_a5tiv")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18, 0, 36) + +[node name="CA1_4BLOCK" parent="." instance=ExtResource("5_vrrsb")] +transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, -30, -0.0152941, 44) + +[node name="Node3D" parent="." instance=ExtResource("9_x2uvf")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -38.383, -0.0281048, 70) + +[node name="Node3D2" parent="." instance=ExtResource("9_x2uvf")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -17.5316, -0.0281048, 70) + +[node name="Node3D3" parent="." instance=ExtResource("11_7ykih")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 18.0306, 0.00635421, 34) + +[node name="Node3D4" parent="." instance=ExtResource("11_7ykih")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -9.90905, -0.00944567, 33.9873) [node name="Node3D5" parent="." instance=ExtResource("9_x2uvf")] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 10, 0, 46) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -35.2776, 0.00105417, 33.9955) diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 6A.tscn similarity index 100% rename from Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6A.tscn rename to Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 6A.tscn diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 7A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 7A.tscn similarity index 100% rename from Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 7A.tscn rename to Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 7A.tscn diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 8Z.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 8Z.tscn similarity index 100% rename from Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 8Z.tscn rename to Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 8Z.tscn diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 9A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 9A.tscn similarity index 100% rename from Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 9A.tscn rename to Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 9A.tscn diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 20 Boss Floor B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 16 Boss Floor B.tscn similarity index 100% rename from Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 20 Boss Floor B.tscn rename to Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 16 Boss Floor B.tscn diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 10 Boss Floor A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 8 Boss Floor A.tscn similarity index 100% rename from Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 10 Boss Floor A.tscn rename to Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 8 Boss Floor A.tscn