diff --git a/Zennysoft.Game.Ma/src/items/armor/resources/RustedPlate.tres b/Zennysoft.Game.Ma/src/items/armor/resources/RustedPlate.tres new file mode 100644 index 000000000..c22b267a6 --- /dev/null +++ b/Zennysoft.Game.Ma/src/items/armor/resources/RustedPlate.tres @@ -0,0 +1,33 @@ +[gd_resource type="Resource" script_class="ArmorStats" load_steps=3 format=3 uid="uid://mxn5jkoejpx5"] + +[ext_resource type="Texture2D" uid="uid://ckt7wupdlylo2" path="res://src/items/armor/textures/HolyArmor2.png" id="1_twb8p"] +[ext_resource type="Script" uid="uid://dqtp6ewvttoyu" path="res://src/items/armor/ArmorStats.cs" id="2_hcsmi"] + +[resource] +script = ExtResource("2_hcsmi") +_telluricResistance = 0.0 +_aeolicResistance = 0.0 +_hydricResistance = 0.0 +_igneousResistance = 0.0 +_ferrumResistance = 0.0 +_holyResistance = 0.0 +_curseResistance = 0.0 +Name = "Rusted Plate" +Description = "" +SpawnRate = 0.5 +BonusAttack = 0 +BonusDefense = 4 +BonusLuck = 0 +BonusHP = 0 +BonusVT = 0 +AeolicResistance = 0 +TelluricResistance = 0 +HydricResistance = 0 +IgneousResistance = 0 +FerrumResistance = 0 +HolyResistance = 0 +CurseResistance = 0 +ThrowSpeed = 12.0 +ThrowDamage = 5 +ItemTag = 0 +Texture = ExtResource("1_twb8p") diff --git a/Zennysoft.Game.Ma/src/player/Player.tscn b/Zennysoft.Game.Ma/src/player/Player.tscn index 8e2e57d21..ca41b88ea 100644 --- a/Zennysoft.Game.Ma/src/player/Player.tscn +++ b/Zennysoft.Game.Ma/src/player/Player.tscn @@ -10846,10 +10846,12 @@ texture = ExtResource("508_sq73w") [node name="HitWallSound" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true +process_mode = 3 bus = &"SFX" [node name="WalkSFX" type="AudioStreamPlayer3D" parent="."] unique_name_in_owner = true +process_mode = 3 stream = ExtResource("6_v7rlw") [node name="Projectiles" type="Node3D" parent="."] @@ -10867,9 +10869,6 @@ unique_name_in_owner = true unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.125) -[node name="ProjectileHitbox" parent="Projectiles/PersuaderBullet/Bullet" index="0"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.1, 0) - [node name="BulletSFX" type="AudioStreamPlayer3D" parent="Projectiles/PersuaderBullet/Bullet/ProjectileHitbox" index="1"] process_mode = 3 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.1, 0) diff --git a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs index 4e5bf9892..2ba904b72 100644 --- a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs +++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs @@ -80,9 +80,9 @@ public partial class InventoryMenu : Control, IInventoryMenu { var validSelectableItems = _player.Inventory.Items.Except(_player.Inventory.Items.OfType().Where(x => x.Glued)).ToList(); - if (Input.IsActionJustPressed(GameInputs.MoveUp) && _currentlySelected.Item.Value != validSelectableItems.First()) + if (Input.IsActionJustPressed(GameInputs.MoveUp) && _currentlySelected != null && _currentlySelected.Item.Value != validSelectableItems.First()) SfxDatabase.Instance.Play(SoundEffect.MoveUI); - if (Input.IsActionJustPressed(GameInputs.MoveDown) && _currentlySelected.Item.Value != validSelectableItems.Last()) + if (Input.IsActionJustPressed(GameInputs.MoveDown) && _currentlySelected != null && _currentlySelected.Item.Value != validSelectableItems.Last()) SfxDatabase.Instance.Play(SoundEffect.MoveUI); if (Input.IsActionJustPressed(GameInputs.Interact)) SfxDatabase.Instance.Play(SoundEffect.CancelUI);