Feedback changes

Zennysoft.Game.Ma/src/enemy/BossTypeA.cs

@@ -3,7 +3,6 @@ using Chickensoft.Introspection;
 using Godot;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Zennysoft.Ma.Adapter;
 
 namespace Zennysoft.Game.Ma;
@@ -38,8 +37,6 @@ public partial class BossTypeA : Enemy, IHaveEngagePlayerBehavior, IHaveFollowBe
 
   [Node] public Area3D PlayerDetector { get; set; } = default!;
 
-  [Node] public Label BossHP { get; set; } = default!;
-
   private Vector3 _previousPosition = Vector3.Zero;
 
   public void OnResolved()
@@ -60,8 +57,6 @@ public partial class BossTypeA : Enemy, IHaveEngagePlayerBehavior, IHaveFollowBe
         _enemyLogic.Input(new EnemyLogic.Input.Move());
       _previousPosition = GlobalPosition;
     }
-
-    BossHP.Text = HealthComponent.CurrentHP.Value + "/" + HealthComponent.MaximumHP.Value;
   }
 
   public void OnPhysicsProcess(double delta)

Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/Sara.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" uid="uid://jjulhqd5g3bd" path="res://src/enemy/enemy_types/04. sara/Sara.cs" id="1_3ejdn"]
 [ext_resource type="PackedScene" uid="uid://cn4fv2gv6raql" path="res://src/enemy/behaviors/PatrolBehavior.tscn" id="4_8ymq6"]
-[ext_resource type="PackedScene" path="res://src/enemy/enemy_types/04. sara/SaraModelView.tscn" id="4_82s0m"]
+[ext_resource type="PackedScene" uid="uid://g84hcmgo3gtl" path="res://src/enemy/enemy_types/04. sara/SaraModelView.tscn" id="4_82s0m"]
 [ext_resource type="PackedScene" uid="uid://cve5oouhowtff" path="res://src/enemy/behaviors/FollowBehavior.tscn" id="5_lxgpb"]
 [ext_resource type="PackedScene" uid="uid://cmhem5xknjsvc" path="res://src/enemy/behaviors/EngagePlayerBehavior.tscn" id="6_ddchx"]
 [ext_resource type="AudioStream" uid="uid://ba8xendacec6" path="res://src/audio/sfx/item_kyuu_layer_2.ogg" id="6_lxgpb"]

Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldOfHeaven.tscn

@@ -31,6 +31,17 @@ collision_mask = 11
 axis_lock_linear_y = true
 axis_lock_angular_x = true
 script = ExtResource("1_oxa5b")
+InitialHP = null
+InitialAttack = null
+InitialDefense = null
+ExpGiven = null
+AeolicResistance = null
+HydricResistance = null
+IgenousResistance = null
+FerrumResistance = null
+TelluricResistance = null
+HolyResistance = null
+CurseResistance = null
 
 [node name="CollisionShape" type="CollisionShape3D" parent="."]
 unique_name_in_owner = true
@@ -73,19 +84,29 @@ shape = SubResource("SphereShape3D_8vcnq")
 [node name="EnemyModelView" parent="." instance=ExtResource("3_r2swr")]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1154, 0)
+_upperThreshold = null
+_lowerThreshold = null
+CanMove = null
 
 [node name="Components" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1154, 0)
 
 [node name="PatrolBehavior" parent="Components" instance=ExtResource("4_jvpqg")]
 unique_name_in_owner = true
+_patrolSpeed = null
+_thinkTime = null
+_patrolRange = null
+_patrolTime = null
 
 [node name="FollowBehavior" parent="Components" instance=ExtResource("5_s5x4o")]
 unique_name_in_owner = true
 _followSpeed = 150.0
+_thinkTime = null
 
 [node name="EngagePlayerBehavior" parent="Components" instance=ExtResource("6_cacc5")]
 unique_name_in_owner = true
+_minimumAttackTime = null
+_maximumAttackTime = null
 _acquireTargetTime = 2.0
 
 [node name="NavigationAgent" type="NavigationAgent3D" parent="Components"]

Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFace.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=11 format=3 uid="uid://c1dekfjj5p42d"]
 
 [ext_resource type="Script" uid="uid://dveonnhcxcp08" path="res://src/enemy/BossTypeA.cs" id="1_x21p4"]
-[ext_resource type="PackedScene" path="res://src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn" id="2_x21p4"]
+[ext_resource type="PackedScene" uid="uid://c00olwjise7iv" path="res://src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn" id="2_x21p4"]
 [ext_resource type="PackedScene" uid="uid://cve5oouhowtff" path="res://src/enemy/behaviors/FollowBehavior.tscn" id="3_wp4vi"]
 [ext_resource type="PackedScene" uid="uid://cmhem5xknjsvc" path="res://src/enemy/behaviors/EngagePlayerBehavior.tscn" id="4_fne8i"]
 [ext_resource type="AudioStream" uid="uid://ba8xendacec6" path="res://src/audio/sfx/item_kyuu_layer_2.ogg" id="5_dm428"]
@@ -95,26 +95,3 @@ bus = &"SFX"
 [node name="AggroSFX" type="AudioStreamPlayer3D" parent="HitSounds"]
 unique_name_in_owner = true
 bus = &"SFX"
-
-[node name="Control" type="Control" parent="."]
-layout_mode = 3
-anchor_right = 0.149
-anchor_bottom = 0.129
-offset_left = 466.0
-offset_top = 1021.0
-offset_right = 393.92
-offset_bottom = 927.68
-
-[node name="Boss Health" type="Label" parent="Control"]
-layout_mode = 0
-offset_right = 40.0
-offset_bottom = 23.0
-text = "Horse Head HP:"
-
-[node name="BossHP" type="Label" parent="Control"]
-unique_name_in_owner = true
-layout_mode = 0
-offset_left = 128.0
-offset_top = 2.0
-offset_right = 203.0
-offset_bottom = 25.0

Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=11 format=3 uid="uid://cw8y8ogehp4hl"]
 
 [ext_resource type="Script" uid="uid://dveonnhcxcp08" path="res://src/enemy/BossTypeA.cs" id="1_v6b2s"]
-[ext_resource type="PackedScene" path="res://src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn" id="2_v6b2s"]
+[ext_resource type="PackedScene" uid="uid://bbvw38l6407s2" path="res://src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn" id="2_v6b2s"]
 [ext_resource type="PackedScene" uid="uid://cve5oouhowtff" path="res://src/enemy/behaviors/FollowBehavior.tscn" id="3_ow3fn"]
 [ext_resource type="PackedScene" uid="uid://cmhem5xknjsvc" path="res://src/enemy/behaviors/EngagePlayerBehavior.tscn" id="4_lwyi7"]
 [ext_resource type="AudioStream" uid="uid://ba8xendacec6" path="res://src/audio/sfx/item_kyuu_layer_2.ogg" id="5_7w7wv"]
@@ -95,26 +95,3 @@ bus = &"SFX"
 [node name="AggroSFX" type="AudioStreamPlayer3D" parent="HitSounds"]
 unique_name_in_owner = true
 bus = &"SFX"
-
-[node name="Control" type="Control" parent="."]
-layout_mode = 3
-anchor_right = 0.149
-anchor_bottom = 0.129
-offset_left = 6.0
-offset_top = 1021.0
-offset_right = -66.08
-offset_bottom = 927.68
-
-[node name="Boss Health" type="Label" parent="Control"]
-layout_mode = 0
-offset_right = 40.0
-offset_bottom = 23.0
-text = "Ox Face HP:"
-
-[node name="BossHP" type="Label" parent="Control"]
-unique_name_in_owner = true
-layout_mode = 0
-offset_left = 95.0
-offset_top = 1.0
-offset_right = 170.0
-offset_bottom = 24.0

Zennysoft.Game.Ma/src/map/Map.tscn

@@ -119,6 +119,7 @@ FloorOdds = Array[float]([0.5, 0.5])
 FilthEater = 0.25
 Sara = 0.5
 Ballos = 0.4
+RedAmbassador = 0.3
 AgniDemon = 0.5
 GoldSproingy = 0.05
 
@@ -128,6 +129,7 @@ FolderName = "Floor06"
 FloorOdds = Array[float]([0.2, 0.8, 0.5, 0.1])
 Sara = 0.5
 Ballos = 0.5
+RedAmbassador = 0.3
 AgniDemon = 0.5
 GoldSproingy = 0.05
 
@@ -137,6 +139,7 @@ FolderName = "Floor07"
 FloorOdds = Array[float]([0.33, 0.33, 0.33])
 Sara = 0.1
 Ballos = 0.5
+RedAmbassador = 0.3
 AgniDemon = 0.4
 GoldSproingy = 0.05
 

Zennysoft.Game.Ma/src/map/dungeon/code/JumpScareRoom.cs

@@ -26,7 +26,7 @@ public partial class JumpScareRoom : DungeonRoom
   {
     Player.PlayJumpScareAnimation();
     DialogueController.ShowDialogue(Dialogue, "general");
-    JumpScare.SetMonitoring(false);
+    JumpScare.CallDeferred(Area3D.MethodName.SetMonitoring, false);
   }
 
   public new void OnExitTree()

Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2A.tscn

@@ -182,7 +182,7 @@ mesh = SubResource("PlaneMesh_ru10l")
 skeleton = NodePath("../..")
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.81506, -0.678744, -3.07342)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.81506, -1.37518, -3.07342)
 layers = 2
 mesh = SubResource("PlaneMesh_5v5l6")
 

Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2C.tscn

@@ -158,7 +158,7 @@ mesh = SubResource("PlaneMesh_8a320")
 skeleton = NodePath("../..")
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.9476, -1.95209, 36.4698)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.9476, -12.2056, 36.4698)
 layers = 2
 mesh = SubResource("PlaneMesh_gw6gx")
 

Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3B.tscn

@@ -159,7 +159,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25.0495, 0.00426888, 40.0433)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -46.8255, 0.00953598, 4.12557)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.88379, -0.652309, 10.9144)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.88379, -10.8167, 10.9144)
 layers = 2
 mesh = SubResource("PlaneMesh_ferpc")
 

Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4C.tscn

@@ -157,7 +157,7 @@ skeleton = NodePath("../../..")
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 23.2383, 0.00511152, 20.0235)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.70335, -5.627, -3.95678)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.70335, -30.8385, -3.95678)
 layers = 2
 mesh = SubResource("PlaneMesh_nls0x")
 

Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 5Z.tscn

@@ -107,7 +107,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -51.2205, 0, 12.9037)
 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -51.2514, 0, -3.09628)
 
 [node name="Pit Room A" parent="NavigationRegion3D" instance=ExtResource("9_7rwna")]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -22.941, 3.505, -2.045)
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -22.941, 3.55, -2.045)
 
 [node name="Node3D5" parent="NavigationRegion3D" instance=ExtResource("10_max4y")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.2197, 0, -27.0956)

Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 08 Boss Floor A.tscn

@@ -1192,6 +1192,9 @@ script = ExtResource("1_0h3lb")
 [node name="15_A1_BOSS FLOOR A_VER_3" parent="Model" instance=ExtResource("2_r3w6s")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -157.601, -16.1094, 21.8408)
 
+[node name="LOCKED GATE" parent="Model/15_A1_BOSS FLOOR A_VER_3" index="0"]
+visible = false
+
 [node name="Socket" parent="Model/15_A1_BOSS FLOOR A_VER_3" instance=ExtResource("3_hjlh5")]
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 12.6001, 13.3617, -4.17398)
 
@@ -1299,7 +1302,6 @@ shape = SubResource("BoxShape3D_gshnr")
 
 [node name="LOCKED GATE2" type="MeshInstance3D" parent="Collision/NavigationRegion3D/BossDoor"]
 transform = Transform3D(0.816274, 0, 0, 0, 1.99383, 0, 0, 0, 1.99383, -144.771, -0.74227, 17.6053)
-visible = false
 mesh = SubResource("ArrayMesh_i5h1f")
 skeleton = NodePath("")
 
@@ -1418,7 +1420,19 @@ transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 10.2518,
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.5263, -2.15637, -2.35483)
 visible = false
+PrimaryAttackElementalType = null
+PrimaryAttackElementalDamageBonus = null
 InitialHP = 125
+InitialAttack = null
+InitialDefense = null
+ExpGiven = null
+AeolicResistance = null
+HydricResistance = null
+IgenousResistance = null
+FerrumResistance = null
+TelluricResistance = null
+HolyResistance = null
+CurseResistance = null
 
 [node name="HorseHead" type="Node3D" parent="Bosses"]
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -112.348, 0, -88.391)
@@ -1427,7 +1441,19 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -112.3
 unique_name_in_owner = true
 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -101.714, -1.38925, 10.8406)
 visible = false
+PrimaryAttackElementalType = null
+PrimaryAttackElementalDamageBonus = null
 InitialHP = 125
+InitialAttack = null
+InitialDefense = null
+ExpGiven = null
+AeolicResistance = null
+HydricResistance = null
+IgenousResistance = null
+FerrumResistance = null
+TelluricResistance = null
+HolyResistance = null
+CurseResistance = null
 
 [node name="HorseHeadStatue" parent="Bosses/HorseHead" instance=ExtResource("15_1ijgn")]
 unique_name_in_owner = true

Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/01. Small Block A1.tscn

@@ -177,7 +177,7 @@ 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)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.93274, -1.602, 6.16469)
 
 [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)

Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/05. Pit Room A.tscn

@@ -1629,15 +1629,15 @@ radius = 7.0
 size = Vector3(53.9292, 0.1, 53.7235)
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_ueomb"]
-size = Vector3(0.542557, 18.7412, 24.5964)
+size = Vector3(0.542557, 18.7412, 24.2655)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_udcrx"]
+size = Vector3(0.542557, 18.7412, 23.5346)
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_34j7u"]
 height = 4.7168
 radius = 0.452637
 
-[sub_resource type="BoxShape3D" id="BoxShape3D_34j7u"]
-size = Vector3(53.0972, 0.001, 53.1202)
-
 [sub_resource type="BoxShape3D" id="BoxShape3D_c4wqw"]
 size = Vector3(51.8721, 17.7382, 52.1556)
 
@@ -1840,7 +1840,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 68.7186, 5.42905, -34.6306)
 shape = SubResource("CylinderShape3D_454xj")
 
 [node name="CollisionShape3D20" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 69.8879, -2.02379, -34.8403)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 69.888, -2.4, -34.84)
 shape = SubResource("BoxShape3D_454xj")
 
 [node name="CollisionShape3D22" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
@@ -1848,11 +1848,11 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 83.817
 shape = SubResource("BoxShape3D_ueomb")
 
 [node name="CollisionShape3D23" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 55.2959, 6.94302, -60.8153)
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 54.765, 6.94302, -60.8153)
-shape = SubResource("BoxShape3D_ueomb")
+shape = SubResource("BoxShape3D_udcrx")
 
 [node name="CollisionShape3D24" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 83.8173, 7.58684, -61.894)
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 82.5321, 6.7394, -60.6618)
 shape = SubResource("BoxShape3D_ueomb")
 
 [node name="CollisionShape3D25" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
@@ -1875,6 +1875,14 @@ shape = SubResource("CylinderShape3D_34j7u")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 94.0265, -0.00124037, -37.1873)
 shape = SubResource("CylinderShape3D_34j7u")
 
+[node name="CollisionShape3D34" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 94.0265, -0.00124037, -32.039)
+shape = SubResource("CylinderShape3D_34j7u")
+
+[node name="CollisionShape3D35" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 94.0265, -0.00124037, -37.1873)
+shape = SubResource("CylinderShape3D_34j7u")
+
 [node name="CollisionShape3D31" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 43.0825, -0.00124037, -32.039)
 shape = SubResource("CylinderShape3D_34j7u")
@@ -1887,10 +1895,6 @@ shape = SubResource("CylinderShape3D_34j7u")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 65.9555, -0.00124037, -60.1903)
 shape = SubResource("CylinderShape3D_34j7u")
 
-[node name="CollisionShape3D33" type="CollisionShape3D" parent="Collisions/StaticBody3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 68.4854, -2.40291, -34.4774)
-shape = SubResource("BoxShape3D_34j7u")
-
 [node name="Spawn Points" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.02876, -28.8813)
 
@@ -1936,9 +1940,10 @@ shape = SubResource("BoxShape3D_c4wqw")
 
 [node name="MinimapShadow" type="Node3D" parent="Room"]
 unique_name_in_owner = true
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.432294, 0)
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="Room/MinimapShadow"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27, -6, -26)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27, -5.01933, -26)
 layers = 2
 sorting_offset = 100.0
 mesh = SubResource("PlaneMesh_ial2h")

Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/12. Jump Scare Room.tscn

@@ -127,6 +127,7 @@ shape = SubResource("BoxShape3D_3jg1k")
 
 [node name="MinimapShadow" type="Node3D" parent="Room"]
 unique_name_in_owner = true
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.39047, 0)
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="Room/MinimapShadow"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.020082, 0, 1.27829)

Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn

@@ -745,7 +745,7 @@ size = Vector3(6.88965, 2.62292, 12.3677)
 size = Vector3(5.96239, 4.04241, 0.991822)
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_tgauh"]
-size = Vector3(20, 20, 36)
+size = Vector3(7.50391, 20, 18.4697)
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_k6ywg"]
 albedo_color = Color(0, 0, 0, 1)
@@ -1306,14 +1306,14 @@ 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, -4.02862, -1.19209e-07)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.188238, -4.02862, 7.08845)
 shape = SubResource("BoxShape3D_tgauh")
 
 [node name="MinimapShadow" type="Node3D" parent="Room"]
 unique_name_in_owner = true
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="Room/MinimapShadow"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.020082, -2.55592, 3.41991)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.020082, -2.41028, 3.41991)
 layers = 2
 sorting_offset = 100.0
 mesh = SubResource("PlaneMesh_54fgm")

Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/Gallery A1.tscn

@@ -149,13 +149,13 @@ 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)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.67066, -3.4914, 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)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.6143, -3.79757, 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)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.9776, -3.78559, 11.068)
 
 [node name="Room" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3092, 2, -8.8875)

Zennysoft.Game.Ma/src/player/PlayerEffectService.cs

@@ -18,11 +18,17 @@ internal class PlayerEffectService
 
   public void Instakill(IEnemy enemy)
   {
+    if (enemy is BossTypeA || enemy is DemonWall)
+      return;
+
     var rng = new RandomNumberGenerator();
     rng.Randomize();
     var rand = rng.RandiRange(1, 100);
     if (rand <= _player.TotalLuck)
+    {
+      enemy.HealthComponent.SetCurrentHealth(0);
       enemy.Die();
+    }
   }
 
   public void Degrade()