Feedback changes

This commit is contained in:
2026-02-17 15:46:16 -08:00
parent 8920b5057f
commit d39524ffe2
20 changed files with 94 additions and 83 deletions

View File

@@ -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

View File

@@ -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()

View File

@@ -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")

View File

@@ -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")

View File

@@ -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")

View File

@@ -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")

View File

@@ -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)

File diff suppressed because one or more lines are too long

View File

@@ -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

View File

@@ -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)

View File

@@ -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)
shape = SubResource("BoxShape3D_ueomb")
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 54.765, 6.94302, -60.8153)
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")

View File

@@ -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)

View File

@@ -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")

View File

@@ -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)