diff --git a/Zennysoft.Game.Ma/src/map/dungeon/code/Overworld.cs b/Zennysoft.Game.Ma/src/map/dungeon/code/Overworld.cs index f1474e64..0e693391 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/code/Overworld.cs +++ b/Zennysoft.Game.Ma/src/map/dungeon/code/Overworld.cs @@ -28,53 +28,50 @@ public partial class Overworld : Node3D, IDungeonFloor public void InitializeDungeon() { - Show(); - Exit.AreaEntered += Exit_AreaEntered; - RestoreArea.AreaEntered += RestoreArea_AreaEntered; - RestoreArea.AreaExited += RestoreArea_AreaExited; - RestoreTimer = new Timer(); - RestoreTimer.WaitTime = 0.3f; - RestoreTimer.Timeout += RestoreTimer_Timeout; - AddChild(RestoreTimer); - FloorIsLoaded = true; + Show(); + Exit.AreaEntered += Exit_AreaEntered; + RestoreArea.AreaEntered += RestoreArea_AreaEntered; + RestoreArea.AreaExited += RestoreArea_AreaExited; + RestoreTimer = new Timer(); + RestoreTimer.WaitTime = 0.3f; + RestoreTimer.Timeout += RestoreTimer_Timeout; + AddChild(RestoreTimer); + FloorIsLoaded = true; } private void RestoreTimer_Timeout() { - if (!Player.HealthComponent.AtFullHealth) - Player.HealthComponent.Heal(1); - if (!Player.VTComponent.AtFullVT) - Player.VTComponent.Restore(1); + if (!Player.HealthComponent.AtFullHealth) + Player.HealthComponent.Heal(1); + if (!Player.VTComponent.AtFullVT) + Player.VTComponent.Restore(1); } private void RestoreArea_AreaExited(Area3D area) { - if (area.GetOwner() is IPlayer) - { - RestoreTimer.Stop(); - Player.SetHealthTimerStatus(true); - } + if (area.GetOwner() is IPlayer) + { + RestoreTimer.Stop(); + Player.SetHealthTimerStatus(true); + } } private void RestoreArea_AreaEntered(Area3D area) { - if (area.GetOwner() is IPlayer) - { - RestoreTimer.Start(); - Player.SetHealthTimerStatus(false); - } + if (area.GetOwner() is IPlayer) + { + RestoreTimer.Start(); + Player.SetHealthTimerStatus(false); + } } private void Exit_AreaEntered(Area3D area) { - if (area.GetOwner() is IPlayer) - ExitReached(); + if (area.GetOwner() is IPlayer) + ExitReached(); } public void ExitReached() => Game.FloorExitReached(); - public Transform3D GetPlayerSpawnPoint() - { - return PlayerSpawnPoint.GlobalTransform; - } + public Transform3D GetPlayerSpawnPoint() => new Transform3D(PlayerSpawnPoint.Basis, new Vector3(PlayerSpawnPoint.GlobalPosition.X, 3.5f, PlayerSpawnPoint.GlobalPosition.Z)); } diff --git a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - 4 Block .tscn b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - 4 Block .tscn index 605172b3..1637632b 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - 4 Block .tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - 4 Block .tscn @@ -25,6 +25,7 @@ script = ExtResource("1_icfon") [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.8436, 0) +visible = false collision_layer = 0 collision_mask = 10 diff --git a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - 5 Block .tscn b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - 5 Block .tscn index d5109c3f..deafdfe9 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - 5 Block .tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - 5 Block .tscn @@ -25,6 +25,7 @@ script = ExtResource("1_67h0r") [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.8436, 0) +visible = false collision_layer = 0 collision_mask = 10 diff --git a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Corner .tscn b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Corner .tscn index e3bd922c..9fa3a776 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Corner .tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Corner .tscn @@ -38,6 +38,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00333917, 0, 8.9407e-08) [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.8436, 0) +visible = false collision_layer = 0 collision_mask = 10 diff --git a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Cross Block.tscn b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Cross Block.tscn index 0d3c4439..69fbb9bd 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Cross Block.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Cross Block.tscn @@ -26,6 +26,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0113125, 0, 0) [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.8436, 0) +visible = false collision_layer = 0 collision_mask = 10 diff --git a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - T-Block.tscn b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - T-Block.tscn index 5f2923b3..daac586d 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - T-Block.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - T-Block.tscn @@ -30,6 +30,7 @@ script = ExtResource("1_jw60f") [node name="CA1_TBLOCK" parent="." instance=ExtResource("2_8iso1")] [node name="Room" type="Node3D" parent="."] +visible = false [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Z-Block.tscn b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Z-Block.tscn index 30d66569..d1535dfe 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Z-Block.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Z-Block.tscn @@ -16,7 +16,7 @@ size = Vector3(4.28414, 3.9892, 0.1) size = Vector3(11.9954, 3.9892, 0.1) [sub_resource type="BoxShape3D" id="BoxShape3D_8481d"] -size = Vector3(15.9967, 3.9892, 0.1) +size = Vector3(12.2947, 3.9892, 0.1) [sub_resource type="BoxShape3D" id="BoxShape3D_2p26a"] size = Vector3(4.30012, 3.9892, 0.1) @@ -43,6 +43,7 @@ script = ExtResource("1_q7f8v") [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.8436, 0) +visible = false collision_layer = 0 collision_mask = 10 @@ -79,7 +80,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 7.9567 shape = SubResource("BoxShape3D_tb32i") [node name="CollisionShape3D8" type="CollisionShape3D" parent="StaticBody3D"] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 4.03538, 1.97029, 4.00237) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 4.03538, 1.97029, 5.85335) shape = SubResource("BoxShape3D_8481d") [node name="CollisionShape3D9" type="CollisionShape3D" parent="StaticBody3D"] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Zag Block .tscn b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Zag Block .tscn index a1dfc2c5..2fa4f27e 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Zag Block .tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A1 - Corridor - Zag Block .tscn @@ -7,7 +7,7 @@ size = Vector3(1.98914, 3.98102, 3.88313) [sub_resource type="BoxShape3D" id="BoxShape3D_fvi2i"] -size = Vector3(8.01119, 3.9892, 0.1) +size = Vector3(4.34435, 3.9892, 0.1) [sub_resource type="BoxShape3D" id="BoxShape3D_jeg68"] size = Vector3(4.01451, 3.9892, 0.1) @@ -46,6 +46,7 @@ script = ExtResource("1_unmj6") [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.8436, 0) +visible = false collision_layer = 0 collision_mask = 10 @@ -70,7 +71,7 @@ skeleton = NodePath("../..") [node name="StaticBody3D" type="StaticBody3D" parent="."] [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.01671, 1.97029, -0.0430538) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.85013, 1.97029, -0.0430538) shape = SubResource("BoxShape3D_fvi2i") [node name="CollisionShape3D6" type="CollisionShape3D" parent="StaticBody3D"] @@ -86,7 +87,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 3.9481 shape = SubResource("BoxShape3D_hou4a") [node name="CollisionShape3D13" type="CollisionShape3D" parent="StaticBody3D"] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.11416, 1.97029, -1.96748) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.0341853, 1.97029, -1.96748) shape = SubResource("BoxShape3D_hou4a") [node name="CollisionShape3D14" type="CollisionShape3D" parent="StaticBody3D"] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A2 - Corridor - 1 Block.tscn b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A2 - Corridor - 1 Block.tscn index 5843e40d..d575e629 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/corridors/A2 - Corridor - 1 Block.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/corridors/A2 - Corridor - 1 Block.tscn @@ -17,6 +17,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.45451, 0) [node name="Room" type="Area3D" parent="Room"] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.8436, 0) +visible = false collision_layer = 0 collision_mask = 10 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 d783a43d..a8e783e9 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 @@ -4,7 +4,6 @@ [ext_resource type="PackedScene" uid="uid://dpec2lbt83dhe" path="res://src/map/dungeon/rooms/Set A/03. Antechamber A.tscn" id="2_tmolq"] [ext_resource type="PackedScene" uid="uid://cihbmyo0ltq4m" path="res://src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn" id="3_qjcvn"] [ext_resource type="PackedScene" uid="uid://ce0cjm6v7ct6c" path="res://src/map/dungeon/rooms/Set A/07. CornerBlock Antechamber.tscn" id="4_3ke1n"] -[ext_resource type="PackedScene" uid="uid://tpgwccr6v43e" path="res://src/map/dungeon/rooms/Set A/04. Tree Antechamber.tscn" id="4_uvfam"] [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"] @@ -12,6 +11,7 @@ [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/assets/Dungeon Doors/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://b8u3sfhexlhfu" path="res://src/map/dungeon/rooms/Set A/Circle Room.tscn" id="13_bn263"] [node name="Floor1a" type="Node3D"] script = ExtResource("1_giyav") @@ -22,9 +22,6 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -60.05 [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) -[node name="Antechamber B" parent="." instance=ExtResource("4_uvfam")] -transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, -17.8016, 0, 60) - [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) @@ -49,8 +46,8 @@ 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) -[node name="Node3D3" parent="." instance=ExtResource("12_5con5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.9081, 0, 48) - [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) + +[node name="A1CircleRoom" parent="." instance=ExtResource("13_bn263")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -16.1563, 2, 42.039) diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 1/WaterCircle/Flipped.glb b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 1/WaterCircle/Flipped.glb new file mode 100644 index 00000000..42aed0fe Binary files /dev/null and b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 1/WaterCircle/Flipped.glb differ diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 1/WaterCircle/Flipped.glb.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 1/WaterCircle/Flipped.glb.import new file mode 100644 index 00000000..025cca85 --- /dev/null +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 1/WaterCircle/Flipped.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://crt7ay2vmdqb3" +path="res://.godot/imported/Flipped.glb-2753515df41e7c92e1beabbd127a1bdc.scn" + +[deps] + +source_file="res://src/map/dungeon/models/Area 1/WaterCircle/Flipped.glb" +dest_files=["res://.godot/imported/Flipped.glb-2753515df41e7c92e1beabbd127a1bdc.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_TXTR0004.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_TXTR0004.png.import index 098dfd22..e7e12e29 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_TXTR0004.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_TXTR0004.png.import @@ -2,14 +2,11 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bog6kb64afid2" +uid="uid://behtdsijlror7" path="res://.godot/imported/A2 Donut_TXTR0004.png-36ae2c51fcd11bd5d251438cdce3f520.ctex" metadata={ "vram_texture": false } -generator_parameters={ -"md5": "bc592e2c2c30bfdacefac7b3515fb838" -} [deps] @@ -24,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_a1maerb.jpg.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_a1maerb.jpg.import index 995c288e..fe66c5b1 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_a1maerb.jpg.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Donut/A2 Donut_a1maerb.jpg.import @@ -2,14 +2,11 @@ importer="texture" type="CompressedTexture2D" -uid="uid://qoxljnf8oqib" +uid="uid://cvtk4osyex6hd" path="res://.godot/imported/A2 Donut_a1maerb.jpg-5a54684a66cf092067b123d29cd8d995.ctex" metadata={ "vram_texture": false } -generator_parameters={ -"md5": "60736847a7c6802e2655ac348481ab51" -} [deps] @@ -24,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Circle Room.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Circle Room.tscn index 8e4987fa..0bac77cd 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Circle Room.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Circle Room.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=17 format=3 uid="uid://b8u3sfhexlhfu"] +[gd_scene load_steps=22 format=3 uid="uid://b8u3sfhexlhfu"] [ext_resource type="PackedScene" uid="uid://cvajnig5nw537" path="res://src/map/dungeon/models/Area 1/WaterCircle/A1-WateryCircle.glb" id="1_1t1ov"] +[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="1_k4n66"] [ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="2_yramv"] [ext_resource type="Shader" uid="uid://blrcjqdo7emhs" path="res://src/map/overworld/Models/water.gdshader" id="3_k4n66"] [ext_resource type="CompressedTexture2DArray" uid="uid://c0kjnbpgaa6bs" path="res://src/map/assets/caustics.png" id="4_qjvxm"] [ext_resource type="Texture2D" uid="uid://cbsdc4uthojov" path="res://src/map/assets/waternormal2.jpg" id="5_j6fpi"] +[ext_resource type="PackedScene" uid="uid://crt7ay2vmdqb3" path="res://src/map/dungeon/models/Area 1/WaterCircle/Flipped.glb" id="7_qjvxm"] [sub_resource type="Curve" id="Curve_vo6nb"] _limits = [-2.0, 2.0, 0.0, 1.0] @@ -116,7 +118,18 @@ size = Vector2(33.455, 31.71) subdivide_width = 100 subdivide_depth = 100 +[sub_resource type="BoxShape3D" id="BoxShape3D_yramv"] +size = Vector3(12.0847, 8, 12.0664) + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_k4n66"] +height = 4.55005 +radius = 1.156 + +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_j6fpi"] +data = PackedVector3Array(-1, -0.4965, 0.4905, -1, 0.04, 0.4905, -1, 0.04, -0.478, -1, -0.4965, 0.4905, -1, 0.04, -0.478, -1, -0.4965, -0.478, 0.6796, -0.4965, -0.7988, 0.6796, 0.04, -0.7988, 1, 0.04, -0.478, 0.6796, -0.4965, -0.7988, 1, 0.04, -0.478, 1, -0.4965, -0.478, 1, -0.4965, -0.478, 1, 0.04, -0.478, 1, 0.04, 0.4905, 1, -0.4965, -0.478, 1, 0.04, 0.4905, 1, -0.4965, 0.4905, -0.673, -0.4965, 0.8019, -0.673, 0.04, 0.8019, -1, 0.04, 0.4905, -0.673, -0.4965, 0.8019, -1, 0.04, 0.4905, -1, -0.4965, 0.4905, 0.6796, -0.4965, -0.7988, 1, -0.4965, -0.478, 1, -0.4965, 0.4905, 0.6796, -0.4965, -0.7988, 1, -0.4965, 0.4905, 0.6796, -0.4965, 0.8208, 0.2085, -0.4965, -1, 0.6796, -0.4965, -0.7988, 0.6796, -0.4965, 0.8208, 0.2085, -0.4965, -1, 0.6796, -0.4965, 0.8208, 0.2085, -0.4965, 0.956, 0.2085, -0.4965, -1, -0.2076, -0.4965, -1.4465, 0.2085, -0.4965, -1.4465, 0.2085, -0.4965, -1, -0.2076, -0.4965, -1, -0.2076, -0.4965, -1.4465, -0.2076, -0.4965, -1, 0.2085, -0.4965, -1, 0.2085, -0.4965, 0.956, -0.2076, -0.4965, -1, 0.2085, -0.4965, 0.956, -0.2076, -0.4965, 0.956, -0.2076, -0.4965, 0.956, 0.2085, -0.4965, 0.956, 0.2085, -0.4965, 1.434, -0.2076, -0.4965, 0.956, 0.2085, -0.4965, 1.434, -0.2076, -0.4965, 1.434, -0.673, -0.4965, -0.7988, -0.2076, -0.4965, -1, -0.2076, -0.4965, 0.956, -0.673, -0.4965, -0.7988, -0.2076, -0.4965, 0.956, -0.673, -0.4965, 0.8019, -1, -0.4965, -0.478, -0.673, -0.4965, -0.7988, -0.673, -0.4965, 0.8019, -1, -0.4965, -0.478, -0.673, -0.4965, 0.8019, -1, -0.4965, 0.4905, 0.2085, -0.4965, 0.956, 0.2085, 0.04, 0.956, 0.2085, 0.04, 1.434, 0.2085, -0.4965, 0.956, 0.2085, 0.04, 1.434, 0.2085, -0.4965, 1.434, -0.673, -0.4965, -0.7988, -0.673, 0.04, -0.7988, -0.2076, 0.04, -1, -0.673, -0.4965, -0.7988, -0.2076, 0.04, -1, -0.2076, -0.4965, -1, 0.6796, -0.4965, 0.8208, 0.6796, 0.04, 0.8208, 0.2085, 0.04, 0.956, 0.6796, -0.4965, 0.8208, 0.2085, 0.04, 0.956, 0.2085, -0.4965, 0.956, -1, -0.4965, -0.478, -1, 0.04, -0.478, -0.673, 0.04, -0.7988, -1, -0.4965, -0.478, -0.673, 0.04, -0.7988, -0.673, -0.4965, -0.7988, -0.2076, -0.4965, 0.956, -0.2076, 0.04, 0.956, -0.673, 0.04, 0.8019, -0.2076, -0.4965, 0.956, -0.673, 0.04, 0.8019, -0.673, -0.4965, 0.8019, 1, -0.4965, 0.4905, 1, 0.04, 0.4905, 0.6796, 0.04, 0.8208, 1, -0.4965, 0.4905, 0.6796, 0.04, 0.8208, 0.6796, -0.4965, 0.8208, 0.2085, -0.4965, -1, 0.2085, 0.04, -1, 0.6796, 0.04, -0.7988, 0.2085, -0.4965, -1, 0.6796, 0.04, -0.7988, 0.6796, -0.4965, -0.7988, -0.2076, 0.04, 0.956, -0.2076, -0.4965, 0.956, -0.2076, -0.4965, 1.434, -0.2076, 0.04, 0.956, -0.2076, -0.4965, 1.434, -0.2076, 0.04, 1.434, 0.2085, 0.04, -1, 0.2085, -0.4965, -1, 0.2085, -0.4965, -1.4465, 0.2085, 0.04, -1, 0.2085, -0.4965, -1.4465, 0.2085, 0.04, -1.4465, -0.2076, -0.4965, -1, -0.2076, 0.04, -1, -0.2076, 0.04, -1.4465, -0.2076, -0.4965, -1, -0.2076, 0.04, -1.4465, -0.2076, -0.4965, -1.4465) + [node name="A1CircleRoom" type="Node3D"] +script = ExtResource("1_k4n66") [node name="A1-WateryCircle" parent="." instance=ExtResource("1_1t1ov")] @@ -140,3 +153,83 @@ unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.169727, -3.1, 0.0638962) mesh = SubResource("PlaneMesh_wbtug") skeleton = NodePath("../..") + +[node name="Spawn Points" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3092, 0, -8.8875) + +[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.95499, 0.615637, 7.621) + +[node name="ItemSpawnPoints" type="Node3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0) + +[node name="ItemSpawnPoint" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.89063, -1.37378, 3.63487) + +[node name="ItemSpawnPoint2" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.96292, -1.37378, 10.8984) + +[node name="ItemSpawnPoint3" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.0523, -1.37378, 11.6249) + +[node name="EnemySpawnPoints" type="Node3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0) + +[node name="EnemySpawn1" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.67066, -1.602, 3.35927) + +[node name="EnemySpawn2" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.6143, -1.602, 6.01731) + +[node name="EnemySpawn3" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.9752, -1.602, 11.0699) + +[node name="Room" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3092, 0, -8.8875) + +[node name="Room" type="Area3D" parent="Room"] +unique_name_in_owner = true +collision_layer = 0 +collision_mask = 10 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Room"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.3539, 4.09071, 8.84395) +visible = false +shape = SubResource("BoxShape3D_yramv") + +[node name="Minimap" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3092, 0, -8.8875) + +[node name="Minimap" type="MeshInstance3D" parent="Minimap"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.6337, 0.253369, 8.01052) +visible = false +layers = 2 + +[node name="Collisions" type="Node3D" parent="."] +visible = false + +[node name="StaticBody3D" type="StaticBody3D" parent="Collisions"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collisions/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.29082, -0.187378, 10.1468) +shape = SubResource("CylinderShape3D_k4n66") + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="Collisions/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.44773, -0.187378, 9.53615) +shape = SubResource("CylinderShape3D_k4n66") + +[node name="StaticBody3D2" type="StaticBody3D" parent="Collisions"] +transform = Transform3D(9.69048, 0, 0, 0, 9.69048, 0, 0, 0, 9.69048, -0.0314422, 2.84891, -0.00925446) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collisions/StaticBody3D2"] +shape = SubResource("ConcavePolygonShape3D_j6fpi") + +[node name="Flipped" parent="." instance=ExtResource("7_qjvxm")] +visible = false + +[editable path="A1-WateryCircle"] +[editable path="Flipped"] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Gallery A1.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Gallery A1.tscn index 43e3e104..9d7fb74f 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Gallery A1.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Gallery A1.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=14 format=3 uid="uid://d2fbbjlkiqlao"] +[gd_scene load_steps=20 format=3 uid="uid://d2fbbjlkiqlao"] [ext_resource type="PackedScene" uid="uid://c72vrk43ky2y0" path="res://src/map/dungeon/models/Area 1/Gallery/A1Gallery.glb" id="1_4yixp"] +[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="1_wk80w"] [ext_resource type="Shader" uid="uid://dj3ut2w0lnwq2" path="res://src/map/map shaders/Overworld God Rays.gdshader" id="2_5pjpw"] [ext_resource type="Texture2D" uid="uid://dw50ys561j8no" path="res://src/map/assets/DUST_1.png" id="3_wk80w"] @@ -64,7 +65,23 @@ size = Vector2(0.1, 0.1) subdivide_width = 1 subdivide_depth = 1 +[sub_resource type="BoxShape3D" id="BoxShape3D_5pjpw"] +size = Vector3(12.0074, 4.00659, 23.9081) + +[sub_resource type="BoxShape3D" id="BoxShape3D_wk80w"] +size = Vector3(0.25, 4.34705, 23.9713) + +[sub_resource type="BoxShape3D" id="BoxShape3D_w4hfg"] +size = Vector3(0.25, 4.34705, 11.9971) + +[sub_resource type="BoxShape3D" id="BoxShape3D_sh6pj"] +size = Vector3(0.25, 4.34705, 4.00736) + +[sub_resource type="BoxShape3D" id="BoxShape3D_q8qa6"] +size = Vector3(12.0425, 0.1, 23.948) + [node name="GalleryA1" type="Node3D"] +script = ExtResource("1_wk80w") [node name="A1Gallery" parent="." instance=ExtResource("1_4yixp")] @@ -118,3 +135,86 @@ lifetime = 41.19 local_coords = true process_material = SubResource("ParticleProcessMaterial_y0fmo") draw_pass_1 = SubResource("QuadMesh_sxgxx") + +[node name="Spawn Points" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3092, 0, -8.8875) + +[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.95499, 0.615637, 7.621) + +[node name="ItemSpawnPoints" type="Node3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0) + +[node name="ItemSpawnPoint" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.89063, -1.37378, 3.63487) + +[node name="ItemSpawnPoint2" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.96292, -1.37378, 10.8984) + +[node name="ItemSpawnPoint3" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.0523, -1.37378, 11.6249) + +[node name="EnemySpawnPoints" type="Node3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0) + +[node name="EnemySpawn1" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.67066, -1.602, 3.35927) + +[node name="EnemySpawn2" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.6143, -1.602, 6.01731) + +[node name="EnemySpawn3" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.9752, -1.602, 11.0699) + +[node name="Room" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3092, 0, -8.8875) + +[node name="Room" type="Area3D" parent="Room"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.3329, 0, 0.872263) +collision_layer = 0 +collision_mask = 10 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Room"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.98005, 0.0134397, 12.0133) +shape = SubResource("BoxShape3D_5pjpw") + +[node name="Minimap" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3092, 0, -8.8875) + +[node name="Minimap" type="MeshInstance3D" parent="Minimap"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.6337, 0.253369, 8.01052) +visible = false +layers = 2 + +[node name="Collisions" type="Node3D" parent="."] + +[node name="StaticBody3D" type="StaticBody3D" parent="Collisions"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collisions/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.88143, 0.194519, 3.9852) +shape = SubResource("BoxShape3D_wk80w") + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="Collisions/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.88746, 0.194519, 3.9852) +shape = SubResource("BoxShape3D_wk80w") + +[node name="CollisionShape3D3" type="CollisionShape3D" parent="Collisions/StaticBody3D"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.00156784, 0.194519, -7.89033) +shape = SubResource("BoxShape3D_w4hfg") + +[node name="CollisionShape3D4" type="CollisionShape3D" parent="Collisions/StaticBody3D"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 3.99332, 0.194519, 15.8974) +shape = SubResource("BoxShape3D_sh6pj") + +[node name="CollisionShape3D5" type="CollisionShape3D" parent="Collisions/StaticBody3D"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -4.00993, 0.194519, 15.8974) +shape = SubResource("BoxShape3D_sh6pj") + +[node name="CollisionShape3D6" type="CollisionShape3D" parent="Collisions/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.000244141, -2.04318, 4.00112) +shape = SubResource("BoxShape3D_q8qa6") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/27. Water Room B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/27. Water Room B.tscn index c088e514..ae5e45fb 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/27. Water Room B.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/27. Water Room B.tscn @@ -131,6 +131,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.265738, 0, 0.994221) [node name="Minimap" type="MeshInstance3D" parent="Minimap"] unique_name_in_owner = true +visible = false mesh = SubResource("PlaneMesh_gd85l") skeleton = NodePath("") surface_material_override/0 = SubResource("StandardMaterial3D_7j570") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/40. Donut Gallery.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/40. Donut Gallery.tscn index 9ece735d..7e31d3ce 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/40. Donut Gallery.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/40. Donut Gallery.tscn @@ -81,3 +81,5 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00845337, 15.2848, -6.46941 size = Vector3(35.5961, 7.12933, 48.7726) [node name="A2 Donut" parent="." instance=ExtResource("1_8nndw")] + +[editable path="A2 Donut"] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/41. Circle.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/41. Circle.tscn index 2b881322..52b48ba5 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/41. Circle.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/41. Circle.tscn @@ -1,8 +1,16 @@ -[gd_scene load_steps=2 format=3 uid="uid://cgp60ood1orpr"] +[gd_scene load_steps=5 format=3 uid="uid://cgp60ood1orpr"] +[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="1_e3spp"] [ext_resource type="PackedScene" uid="uid://u3h6q7df6h4y" path="res://src/map/dungeon/models/Area 2/Circle/A2 Circular Water Room.glb" id="1_wyllr"] +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_awssr"] +data = PackedVector3Array(-1, -0.4965, 0.4905, -1, 0.04, 0.4905, -1, 0.04, -0.478, -1, -0.4965, 0.4905, -1, 0.04, -0.478, -1, -0.4965, -0.478, 0.6796, -0.4965, -0.7988, 0.6796, 0.04, -0.7988, 1, 0.04, -0.478, 0.6796, -0.4965, -0.7988, 1, 0.04, -0.478, 1, -0.4965, -0.478, 1, -0.4965, -0.478, 1, 0.04, -0.478, 1, 0.04, 0.4905, 1, -0.4965, -0.478, 1, 0.04, 0.4905, 1, -0.4965, 0.4905, -0.673, -0.4965, 0.8019, -0.673, 0.04, 0.8019, -1, 0.04, 0.4905, -0.673, -0.4965, 0.8019, -1, 0.04, 0.4905, -1, -0.4965, 0.4905, 0.6796, -0.4965, -0.7988, 1, -0.4965, -0.478, 1, -0.4965, 0.4905, 0.6796, -0.4965, -0.7988, 1, -0.4965, 0.4905, 0.6796, -0.4965, 0.8208, 0.2085, -0.4965, -1, 0.6796, -0.4965, -0.7988, 0.6796, -0.4965, 0.8208, 0.2085, -0.4965, -1, 0.6796, -0.4965, 0.8208, 0.2085, -0.4965, 0.956, 0.2085, -0.4965, -1, -0.2076, -0.4965, -1.4465, 0.2085, -0.4965, -1.4465, 0.2085, -0.4965, -1, -0.2076, -0.4965, -1, -0.2076, -0.4965, -1.4465, -0.2076, -0.4965, -1, 0.2085, -0.4965, -1, 0.2085, -0.4965, 0.956, -0.2076, -0.4965, -1, 0.2085, -0.4965, 0.956, -0.2076, -0.4965, 0.956, -0.2076, -0.4965, 0.956, 0.2085, -0.4965, 0.956, 0.2085, -0.4965, 1.434, -0.2076, -0.4965, 0.956, 0.2085, -0.4965, 1.434, -0.2076, -0.4965, 1.434, -0.673, -0.4965, -0.7988, -0.2076, -0.4965, -1, -0.2076, -0.4965, 0.956, -0.673, -0.4965, -0.7988, -0.2076, -0.4965, 0.956, -0.673, -0.4965, 0.8019, -1, -0.4965, -0.478, -0.673, -0.4965, -0.7988, -0.673, -0.4965, 0.8019, -1, -0.4965, -0.478, -0.673, -0.4965, 0.8019, -1, -0.4965, 0.4905, 0.2085, -0.4965, 0.956, 0.2085, 0.04, 0.956, 0.2085, 0.04, 1.434, 0.2085, -0.4965, 0.956, 0.2085, 0.04, 1.434, 0.2085, -0.4965, 1.434, -0.673, -0.4965, -0.7988, -0.673, 0.04, -0.7988, -0.2076, 0.04, -1, -0.673, -0.4965, -0.7988, -0.2076, 0.04, -1, -0.2076, -0.4965, -1, 0.6796, -0.4965, 0.8208, 0.6796, 0.04, 0.8208, 0.2085, 0.04, 0.956, 0.6796, -0.4965, 0.8208, 0.2085, 0.04, 0.956, 0.2085, -0.4965, 0.956, -1, -0.4965, -0.478, -1, 0.04, -0.478, -0.673, 0.04, -0.7988, -1, -0.4965, -0.478, -0.673, 0.04, -0.7988, -0.673, -0.4965, -0.7988, -0.2076, -0.4965, 0.956, -0.2076, 0.04, 0.956, -0.673, 0.04, 0.8019, -0.2076, -0.4965, 0.956, -0.673, 0.04, 0.8019, -0.673, -0.4965, 0.8019, 1, -0.4965, 0.4905, 1, 0.04, 0.4905, 0.6796, 0.04, 0.8208, 1, -0.4965, 0.4905, 0.6796, 0.04, 0.8208, 0.6796, -0.4965, 0.8208, 0.2085, -0.4965, -1, 0.2085, 0.04, -1, 0.6796, 0.04, -0.7988, 0.2085, -0.4965, -1, 0.6796, 0.04, -0.7988, 0.6796, -0.4965, -0.7988, -0.2076, 0.04, 0.956, -0.2076, -0.4965, 0.956, -0.2076, -0.4965, 1.434, -0.2076, 0.04, 0.956, -0.2076, -0.4965, 1.434, -0.2076, 0.04, 1.434, 0.2085, 0.04, -1, 0.2085, -0.4965, -1, 0.2085, -0.4965, -1.4465, 0.2085, 0.04, -1, 0.2085, -0.4965, -1.4465, 0.2085, 0.04, -1.4465, -0.2076, -0.4965, -1, -0.2076, 0.04, -1, -0.2076, 0.04, -1.4465, -0.2076, -0.4965, -1, -0.2076, 0.04, -1.4465, -0.2076, -0.4965, -1.4465) + +[sub_resource type="BoxShape3D" id="BoxShape3D_a5ll2"] +size = Vector3(28, 6, 48) + [node name="40_DonutGallery" type="Node3D"] +script = ExtResource("1_e3spp") [node name="A2 Circular Water Room" parent="." instance=ExtResource("1_wyllr")] @@ -27,3 +35,54 @@ light_energy = 1.762 shadow_enabled = true omni_range = 17.759 omni_attenuation = 0.81 + +[node name="StaticBody3D" type="StaticBody3D" parent="."] +transform = Transform3D(9.69048, 0, 0, 0, 9.69048, 0, 0, 0, 9.69048, -0.0314422, 2.84891, -0.00925446) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"] +shape = SubResource("ConcavePolygonShape3D_awssr") + +[node name="Spawn Points" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0234127, 1.22904, 0) + +[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.336617, -1.37707, 0.928175) + +[node name="ItemSpawnPoints" type="Node3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -25.114, 0.496096, 10.8555) + +[node name="ItemSpawnPoint" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.4261, -1.87126, -14.9165) + +[node name="ItemSpawnPoint3" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.37, -1.58527, -14.1998) + +[node name="EnemySpawnPoints" type="Node3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -25.114, 0.496096, 10.8555) + +[node name="EnemySpawn1" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23.9514, -2.12568, -13.2894) + +[node name="Room" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0234127, 1.69409, 0) + +[node name="Room" type="Area3D" parent="Room"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.8436, 0) +collision_layer = 0 +collision_mask = 10 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Room"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.04566, -10.6408, -1.19209e-07) +shape = SubResource("BoxShape3D_a5ll2") + +[node name="Minimap" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.265738, 0, 0.994221) + +[node name="Minimap" type="MeshInstance3D" parent="Minimap"] +unique_name_in_owner = true +visible = false +skeleton = NodePath("") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/42. Small Block Room A2.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/42. Small Block Room A2.tscn index d5de69cc..86cbb7a2 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/42. Small Block Room A2.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/42. Small Block Room A2.tscn @@ -1,7 +1,135 @@ -[gd_scene load_steps=2 format=3 uid="uid://bp6h4at643bbo"] +[gd_scene load_steps=11 format=3 uid="uid://bp6h4at643bbo"] [ext_resource type="PackedScene" uid="uid://btrmq1rhdfdpt" path="res://src/map/dungeon/models/Area 2/BlockRoomSmall/A2-BlockRoomSmall.glb" id="1_jxmh2"] +[sub_resource type="BoxShape3D" id="BoxShape3D_jxmh2"] +size = Vector3(12.0847, 8, 12.0664) + +[sub_resource type="BoxShape3D" id="BoxShape3D_sabk0"] +size = Vector3(3.92139, 3.9624, 4.01892) + +[sub_resource type="BoxShape3D" id="BoxShape3D_7grvb"] +size = Vector3(4.00732, 3.9624, 4.03766) + +[sub_resource type="BoxShape3D" id="BoxShape3D_ibu4r"] +size = Vector3(3.9967, 3.9624, 4.01892) + +[sub_resource type="BoxShape3D" id="BoxShape3D_nun7e"] +size = Vector3(4.02051, 3.9624, 4.02655) + +[sub_resource type="BoxShape3D" id="BoxShape3D_3rcm8"] +size = Vector3(4.02051, 3.9624, 4.02655) + +[sub_resource type="BoxShape3D" id="BoxShape3D_1i15w"] +size = Vector3(4.02051, 3.9624, 4.02655) + +[sub_resource type="BoxShape3D" id="BoxShape3D_y7etk"] +size = Vector3(4.02051, 3.9624, 4.02655) + +[sub_resource type="BoxShape3D" id="BoxShape3D_f1d2a"] +size = Vector3(19.9524, 0.1, 19.9805) + [node name="42_SmallBlockRoomA2" type="Node3D"] [node name="A2-BlockRoomSmall" parent="." instance=ExtResource("1_jxmh2")] + +[node name="Spawn Points" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.2895, 0, -9.00508) +visible = false + +[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.95499, 0.615637, 7.621) + +[node name="ItemSpawnPoints" type="Node3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0) + +[node name="ItemSpawnPoint" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.89063, -1.37378, 3.63487) + +[node name="ItemSpawnPoint2" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.96292, -1.37378, 10.8984) + +[node name="ItemSpawnPoint3" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.0523, -1.37378, 11.6249) + +[node name="EnemySpawnPoints" type="Node3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0) + +[node name="EnemySpawn1" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.67066, -1.602, 3.35927) + +[node name="EnemySpawn2" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.6143, -1.602, 6.01731) + +[node name="EnemySpawn3" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.9752, -1.602, 11.0699) + +[node name="Room" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.2895, 0, -9.00508) +visible = false + +[node name="Room" type="Area3D" parent="Room"] +unique_name_in_owner = true +collision_layer = 0 +collision_mask = 10 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Room"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.3539, 4.09071, 8.84395) +shape = SubResource("BoxShape3D_jxmh2") + +[node name="Minimap" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.2895, 0, -9.00508) + +[node name="Minimap" type="MeshInstance3D" parent="Minimap"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.6337, 0.253369, 8.01052) +visible = false +layers = 2 + +[node name="Collision" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.785047, 2.10907, -0.117584) + +[node name="StaticBody3D" type="StaticBody3D" parent="Collision"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.1391, -0.142086, 3.98045) +shape = SubResource("BoxShape3D_sabk0") + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.18206, -0.142086, -4.0277) +shape = SubResource("BoxShape3D_7grvb") + +[node name="CollisionShape3D3" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.80376, -0.142086, 3.98045) +shape = SubResource("BoxShape3D_ibu4r") + +[node name="CollisionShape3D4" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.81566, -0.142086, -4.03325) +shape = SubResource("BoxShape3D_nun7e") + +[node name="CollisionShape3D5" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.80767, -0.142086, -8.02014) +shape = SubResource("BoxShape3D_3rcm8") + +[node name="CollisionShape3D7" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.17954, -0.142086, -8.02014) +shape = SubResource("BoxShape3D_1i15w") + +[node name="CollisionShape3D8" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.17954, -0.142086, 7.97142) +shape = SubResource("BoxShape3D_y7etk") + +[node name="CollisionShape3D9" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.81589, -0.142086, 7.97142) +shape = SubResource("BoxShape3D_y7etk") + +[node name="CollisionShape3D10" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.81748, -0.142086, 5.93779) +shape = SubResource("BoxShape3D_y7etk") + +[node name="CollisionShape3D6" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.833786, -2.14556, -0.00332832) +shape = SubResource("BoxShape3D_f1d2a") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/43. Large Block Room A2.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/43. Large Block Room A2.tscn index e3870bb0..883b56c6 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/43. Large Block Room A2.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set B/43. Large Block Room A2.tscn @@ -1,7 +1,114 @@ -[gd_scene load_steps=2 format=3 uid="uid://bbyjnuf1p6w3r"] +[gd_scene load_steps=8 format=3 uid="uid://bbyjnuf1p6w3r"] [ext_resource type="PackedScene" uid="uid://ddeqj2mmaw0vr" path="res://src/map/dungeon/models/Area 2/BlockRoomLarge/A2-BlockRoomLarge.glb" id="1_37pbi"] +[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="1_wvkq2"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_37pbi"] +size = Vector3(36.0175, 8, 20.0029) + +[sub_resource type="BoxShape3D" id="BoxShape3D_wvkq2"] +size = Vector3(3.96191, 3.96552, 8.00346) + +[sub_resource type="BoxShape3D" id="BoxShape3D_w7x07"] +size = Vector3(0.001, 3.96552, 28.0322) + +[sub_resource type="BoxShape3D" id="BoxShape3D_48eg6"] +size = Vector3(2.03163, 3.96552, 4.13477) + +[sub_resource type="BoxShape3D" id="BoxShape3D_yv0am"] +size = Vector3(2.03163, 3.96552, 6.03076) [node name="LargeBlockRoom" type="Node3D"] +script = ExtResource("1_wvkq2") [node name="A2-BlockRoomLarge" parent="." instance=ExtResource("1_37pbi")] + +[node name="Spawn Points" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.97031, 0) + +[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.022, -1.8, 7.621) + +[node name="ItemSpawnPoints" type="Node3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0) + +[node name="ItemSpawnPoint" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.89063, -3.71027, -4.99248) + +[node name="ItemSpawnPoint2" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.96292, -3.71027, 2.27105) + +[node name="ItemSpawnPoint3" type="Marker3D" parent="Spawn Points/ItemSpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.0523, -3.71027, 2.99755) + +[node name="EnemySpawnPoints" type="Node3D" parent="Spawn Points"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.00123, 0) + +[node name="EnemySpawn1" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.67066, -3.71027, 3.35927) + +[node name="EnemySpawn2" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.6143, -3.71027, 6.01731) + +[node name="EnemySpawn3" type="Marker3D" parent="Spawn Points/EnemySpawnPoints"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.9752, -3.71027, 11.0699) + +[node name="Room" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.749275, 2.10907, 0) + +[node name="Room" type="Area3D" parent="Room"] +unique_name_in_owner = true +collision_layer = 0 +collision_mask = 10 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Room"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.826404, 1.9843, -0.0330553) +shape = SubResource("BoxShape3D_37pbi") + +[node name="Minimap" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.61193, 0.859072, 0) + +[node name="Minimap" type="MeshInstance3D" parent="Minimap"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.6337, -0.983959, 8.01052) +visible = false +layers = 2 + +[node name="Collision" type="Node3D" parent="."] + +[node name="StaticBody3D" type="StaticBody3D" parent="Collision"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.8564, 1.99805, 5.7969) +shape = SubResource("BoxShape3D_wvkq2") + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.8564, 1.99805, -6.17724) +shape = SubResource("BoxShape3D_wvkq2") + +[node name="CollisionShape3D3" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.0897, 1.99805, 5.7969) +shape = SubResource("BoxShape3D_wvkq2") + +[node name="CollisionShape3D4" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.0897, 1.99805, -6.17724) +shape = SubResource("BoxShape3D_wvkq2") + +[node name="CollisionShape3D5" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.122485, 1.99805, -10.1741) +shape = SubResource("BoxShape3D_w7x07") + +[node name="CollisionShape3D6" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.122485, 1.99805, 9.80632) +shape = SubResource("BoxShape3D_w7x07") + +[node name="CollisionShape3D7" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 12.0712, 1.99805, 8.791) +shape = SubResource("BoxShape3D_48eg6") + +[node name="CollisionShape3D8" type="CollisionShape3D" parent="Collision/StaticBody3D"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -6.90235, 1.99805, 8.791) +shape = SubResource("BoxShape3D_yv0am")