Rework item descriptions, fix item rescue menu

This commit is contained in:
2026-02-18 02:41:22 -08:00
parent d39524ffe2
commit 104b9cf25e
172 changed files with 1336 additions and 915 deletions

View File

@@ -43,6 +43,7 @@ public partial class Overworld : SpecialFloor, IDungeonFloor
AddChild(RestoreTimer);
FloorIsLoaded = true;
Game.ItemRescueMenu.SetProcessInput(false);
ItemRescueInteractZone.AreaEntered += ItemRescueInteractZone_AreaEntered;
var dimmableAudio = DimmableAudio.GetChildren().OfType<IDimmableAudioStreamPlayer>();
foreach (var dimmable in dimmableAudio)
@@ -57,12 +58,14 @@ public partial class Overworld : SpecialFloor, IDungeonFloor
private void ItemRescueMenu_MenuClosing()
{
GameRepo.Resume();
Game.ItemRescueMenu.SetProcessInput(false);
}
private void ItemRescueInteractZone_AreaEntered(Area3D area)
{
GameRepo.Pause();
Game.ItemRescueMenu.Show();
Game.ItemRescueMenu.SetProcessInput(true);
}
private void RestoreTimer_Timeout()

View File

@@ -22,5 +22,4 @@ public partial class SpecialFloor : Node3D, IDungeonFloor
public bool FloorIsLoaded { get; set; }
public virtual (Vector3 Rotation, Vector3 Position) GetPlayerSpawnPoint() => (PlayerSpawnPoint.Rotation, new Vector3(PlayerSpawnPoint.Position.X, 0, PlayerSpawnPoint.Position.Z));
}

View File

@@ -101,12 +101,12 @@ script = ExtResource("1_5jip8")
Dialogue = ExtResource("2_7xfp0")
[node name="Model" type="Node3D" parent="."]
transform = Transform3D(1.6, 0, 0, 0, 1.6, 0, 0, 0, 1.6, 0, 4.91245, 0)
transform = Transform3D(1.4, 0, 0, 0, 1.4, 0, 0, 0, 1.4, 0, 4.31338, 0)
[node name="02_ALTAR_FLOOR_ZER0_VER_1" parent="Model" instance=ExtResource("2_xpi6o")]
[node name="Collision" type="Node3D" parent="."]
transform = Transform3D(1.6, 0, 0, 0, 1.6, 0, 0, 0, 1.6, 0, 4.91245, 0)
transform = Transform3D(1.4, 0, 0, 0, 1.4, 0, 0, 0, 1.4, 0, 4.31338, 0)
[node name="StaticBody3D" type="StaticBody3D" parent="Collision"]
transform = Transform3D(0.881211, 0, 0, 0, 0.881211, 0, 0, 0, 0.881211, -20.6816, -2.62104, -11.5685)
@@ -144,7 +144,7 @@ transform = Transform3D(0.857993, 0, 0.513661, 0, 1, 0, -0.513661, 0, 0.857993,
shape = SubResource("BoxShape3D_xh2ej")
[node name="Ground" type="StaticBody3D" parent="Collision"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.246962, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.269662, 0)
collision_layer = 5
collision_mask = 0
@@ -154,14 +154,14 @@ shape = SubResource("BoxShape3D_aqomv")
debug_color = Color(0.937255, 0, 0.623529, 1)
[node name="Spawn Points" type="Node3D" parent="."]
transform = Transform3D(1.6, 0, 0, 0, 1.6, 0, 0, 0, 1.6, 0, 4.30713, 0)
transform = Transform3D(1.4, 0, 0, 0, 1.4, 0, 0, 0, 1.4, 0, 3.70806, 0)
[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 39.3951, -2.89376, -1.035)
[node name="Room" type="Node3D" parent="."]
transform = Transform3D(1.6, 0, 0, 0, 1.6, 0, 0, 0, 1.6, 0, 4.91245, 0)
transform = Transform3D(1.4, 0, 0, 0, 1.4, 0, 0, 0, 1.4, 0, 4.31338, 0)
[node name="Room" type="Area3D" parent="Room"]
unique_name_in_owner = true
@@ -192,7 +192,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 72.5243, -2.06593, -2.02953)
shape = SubResource("BoxShape3D_tp2pi")
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(0.605989, 0.484254, 0.631091, -6.93572e-08, -0.793354, 0.608761, 0.795474, -0.368903, -0.480763, 0, 3.88968, -89.3095)
transform = Transform3D(0.605989, 0.484254, 0.631091, -6.93571e-08, -0.793353, 0.608762, 0.795473, -0.368903, -0.480763, 0, 4.08821, -89.3095)
light_color = Color(0.787638, 0.659992, 0.558925, 1)
light_energy = 4.776
shadow_enabled = true

View File

@@ -1420,19 +1420,7 @@ 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)
@@ -1441,19 +1429,7 @@ 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