diff --git a/src/map/dungeon/code/BossRoom.cs b/src/map/dungeon/code/BossRoom.cs index 21e5af38..6189b9e9 100644 --- a/src/map/dungeon/code/BossRoom.cs +++ b/src/map/dungeon/code/BossRoom.cs @@ -43,7 +43,7 @@ namespace GameJamDungeon private void BossHPUpdate(double obj) { if (OxFace.CurrentHP.Value <= 0 && HorseFace.CurrentHP.Value <= 0) - GateCollision.Hide(); + GateCollision.CallDeferred(MethodName.QueueFree); } private void SpawnItems() @@ -65,10 +65,5 @@ namespace GameJamDungeon OxFace.Activate(); HorseFace.Activate(); } - - private void EndBossFight() - { - GateCollision.Hide(); - } } } diff --git a/src/map/dungeon/scenes/BossRoom.tscn b/src/map/dungeon/scenes/BossRoom.tscn index 8aadfdc8..8ffb29b3 100644 --- a/src/map/dungeon/scenes/BossRoom.tscn +++ b/src/map/dungeon/scenes/BossRoom.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=137 format=4 uid="uid://5ja3qxn8h7iw"] +[gd_scene load_steps=147 format=4 uid="uid://5ja3qxn8h7iw"] [ext_resource type="Script" path="res://src/map/dungeon/code/BossRoom.cs" id="1_54g2q"] [ext_resource type="Texture2D" uid="uid://dq0nn4lvfqxn" path="res://src/map/dungeon/models/boss/FLOOR 11 (BOSS FLOOR)_FLOOR1.jpg" id="2_1w0ee"] @@ -2120,6 +2120,46 @@ size = Vector3(3, 5.76923, 8.57678) [sub_resource type="BoxShape3D" id="BoxShape3D_pkvyy"] size = Vector3(6.25977, 15.6429, 37.6357) +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_371o6"] +transparency = 1 +albedo_color = Color(1, 1, 1, 0) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vdjhg"] +transparency = 1 +albedo_color = Color(1, 1, 1, 0) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_gnq4d"] +transparency = 1 +albedo_color = Color(1, 1, 1, 0) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jotjv"] +transparency = 1 +albedo_color = Color(1, 1, 1, 0) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m4nqj"] +transparency = 1 +albedo_color = Color(1, 1, 1, 0) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_o0lpf"] +transparency = 1 +albedo_color = Color(1, 1, 1, 0) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_joanf"] +transparency = 1 +albedo_color = Color(1, 1, 1, 0) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bd5ek"] +transparency = 1 +albedo_color = Color(1, 1, 1, 0) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_s1k1t"] +transparency = 1 +albedo_color = Color(1, 1, 1, 0) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7tfd7"] +transparency = 1 +albedo_color = Color(1, 1, 1, 0) + [node name="BossFloor" type="Node3D"] script = ExtResource("1_54g2q") @@ -2132,6 +2172,7 @@ skeleton = NodePath("") [node name="COLISSION" type="MeshInstance3D" parent="FLOOR 11 (BOSS FLOOR)"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -88.3533, -1.72947, -0.620708) +visible = false mesh = SubResource("ArrayMesh_5p0ar") skeleton = NodePath("") @@ -2320,3 +2361,135 @@ collision_mask = 2 [node name="CollisionShape3D" type="CollisionShape3D" parent="ActivateTrap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -240.071, 36.4279, 34.624) shape = SubResource("BoxShape3D_pkvyy") + +[node name="CSGBox3D" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -119.222, 2.98662, 2.27893) +use_collision = true +size = Vector3(40.5361, 18.0034, 11.2211) +material = SubResource("StandardMaterial3D_371o6") + +[node name="CSGBox3D2" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -118.746, 3.018, 32.763) +use_collision = true +size = Vector3(41.5409, 17.9407, 11.4493) +material = SubResource("StandardMaterial3D_vdjhg") + +[node name="CSGBox3D3" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -51.4346, -1.081, 26.6544) +use_collision = true +size = Vector3(9.34301, 10.4596, 5.70709) +material = SubResource("StandardMaterial3D_gnq4d") + +[node name="CSGBox3D4" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -51.4346, -1.081, 8.61983) +use_collision = true +size = Vector3(9.34301, 10.4596, 5.70709) +material = SubResource("StandardMaterial3D_jotjv") + +[node name="CSGBox3D8" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -158.545, -1.081, 7.29395) +use_collision = true +size = Vector3(26.8797, 10.4596, 16.4546) +material = SubResource("StandardMaterial3D_m4nqj") + +[node name="CSGBox3D9" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -158.559, -1.081, 26.9122) +use_collision = true +size = Vector3(26.9065, 10.4596, 15.0629) +material = SubResource("StandardMaterial3D_o0lpf") + +[node name="CSGBox3D5" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -67.415, -1.081, 12.6382) +use_collision = true +size = Vector3(24.7494, 10.4596, 5.70709) +material = SubResource("StandardMaterial3D_joanf") + +[node name="CSGBox3D7" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -77.0616, -1.081, 26.4061) +use_collision = true +size = Vector3(43.9212, 10.4596, 14.0503) +material = SubResource("StandardMaterial3D_bd5ek") + +[node name="CSGBox3D10" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -42.7111, -1.081, 17.6945) +use_collision = true +size = Vector3(11.3908, 10.4596, 14.0503) +material = SubResource("StandardMaterial3D_s1k1t") + +[node name="CSGBox3D15" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -189.098, -1.081, 17.6945) +use_collision = true +size = Vector3(11.3908, 10.4596, 14.0503) +material = SubResource("StandardMaterial3D_s1k1t") + +[node name="CSGBox3D16" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -177.598, -1.081, 30.1102) +use_collision = true +size = Vector3(11.3908, 10.4596, 14.0503) +material = SubResource("StandardMaterial3D_s1k1t") + +[node name="CSGBox3D17" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -177.598, -1.081, 4.65836) +use_collision = true +size = Vector3(11.3908, 10.4596, 14.0503) +material = SubResource("StandardMaterial3D_s1k1t") + +[node name="CSGBox3D6" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -91.2361, -1.081, 11.5236) +use_collision = true +size = Vector3(15.5931, 10.4596, 7.93619) +material = SubResource("StandardMaterial3D_7tfd7") + +[node name="CSGBox3D18" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -85.8041, -1.081, 7.79476) +use_collision = true +size = Vector3(4.72908, 10.4596, 3.73518) +material = SubResource("StandardMaterial3D_7tfd7") + +[node name="CSGBox3D11" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -91.2361, -1.081, -3.67318) +use_collision = true +size = Vector3(15.5931, 10.4596, 7.93619) +material = SubResource("StandardMaterial3D_7tfd7") + +[node name="CSGBox3D13" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -83.8499, -1.081, 0.264292) +use_collision = true +size = Vector3(8.66395, 10.4596, 3.88486) +material = SubResource("StandardMaterial3D_7tfd7") + +[node name="CSGBox3D14" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -75.4524, -1.081, 5.70622) +use_collision = true +size = Vector3(8.66395, 10.4596, 14.7687) +material = SubResource("StandardMaterial3D_7tfd7") + +[node name="CSGBox3D12" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -95.9968, -1.24237, 3.58338) +use_collision = true +size = Vector3(6.09562, 10.4596, 12.2416) +material = SubResource("StandardMaterial3D_7tfd7") + +[node name="CSGBox3D19" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -138.482, 1.70537, 22.0364) +use_collision = true +size = Vector3(2.33372, 8.91922, 2.50858) +material = SubResource("StandardMaterial3D_7tfd7") + +[node name="CSGBox3D20" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -138.482, 1.70537, 12.5379) +use_collision = true +size = Vector3(2.33372, 8.91922, 2.50858) +material = SubResource("StandardMaterial3D_7tfd7") + +[node name="CSGBox3D21" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -142.334, 1.70537, 0.846578) +use_collision = true +size = Vector3(5.62908, 8.91922, 2.50858) +material = SubResource("StandardMaterial3D_7tfd7") + +[node name="CSGBox3D22" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -142.334, 1.70537, 33.9196) +use_collision = true +size = Vector3(5.62908, 8.91922, 2.50858) +material = SubResource("StandardMaterial3D_7tfd7")