From bfaa324e6aed1ff1ab734cd206ede97af826ac16 Mon Sep 17 00:00:00 2001 From: Zenny Date: Mon, 9 Feb 2026 22:16:49 -0800 Subject: [PATCH] Fix references and start more weapon tag implementation --- .../Equipment/Tags/WeaponTag.cs | 3 +- .../src/items/accessory/accessory.png | Bin 3240 -> 0 bytes .../src/items/accessory/accessory.png.import | 35 --------------- .../accessory/resources/MaskAvarice.tres | 9 ++-- .../accessory/resources/MaskDestruction.tres | 9 ++-- .../items/accessory/resources/MaskGuilt.tres | 5 +-- .../accessory/resources/MaskObstinance.tres | 9 ++-- .../accessory/resources/MaskShunned.tres | 22 ++++----- .../items/accessory/resources/MaskSloth.tres | 22 ++++----- .../accessory/resources/MaskSuffering.tres | 5 +-- .../items/accessory/resources/MaskZeal.tres | 5 +-- .../accessory/resources/MysteryAccessory.tres | 24 +++++----- .../src/items/armor/resources/Acceptance.tres | 10 +++-- .../armor/resources/AtonersAdornments.tres | 10 +++-- .../armor/resources/CeremonialVestments.tres | 4 +- .../src/items/armor/resources/DevicLayer.tres | 10 +++-- .../items/armor/resources/GoddessRobe.tres | 10 +++-- .../src/items/armor/resources/IronCage.tres | 10 +++-- .../armor/resources/LogisticiansGarb.tres | 10 +++-- .../items/armor/resources/MysteryArmor.tres | 21 ++++++--- .../src/items/armor/resources/Stoic.tres | 10 +++-- .../items/armor/resources/WoodenArmament.tres | 10 +++-- Zennysoft.Game.Ma/src/items/box/BoxItem.tscn | 4 +- .../src/items/box/resources/Malfunction.tres | 5 +-- .../src/items/dropped/DroppedItem.tscn | 8 +--- .../src/items/restorative/Restorative.tscn | 4 +- .../src/items/weapons/resources/Jiblett.tres | 30 ------------- .../dungeon/rooms/Set A/11. Long Room.tscn | 42 ++++++++++++++++++ Zennysoft.Game.Ma/src/player/Player.cs | 7 +++ .../src/ui/inventory_menu/ItemSlot.tscn | 4 +- 30 files changed, 175 insertions(+), 182 deletions(-) delete mode 100644 Zennysoft.Game.Ma/src/items/accessory/accessory.png delete mode 100644 Zennysoft.Game.Ma/src/items/accessory/accessory.png.import delete mode 100644 Zennysoft.Game.Ma/src/items/weapons/resources/Jiblett.tres diff --git a/Zennysoft.Game.Ma.Implementation/Equipment/Tags/WeaponTag.cs b/Zennysoft.Game.Ma.Implementation/Equipment/Tags/WeaponTag.cs index 7eee69488..d52b17fba 100644 --- a/Zennysoft.Game.Ma.Implementation/Equipment/Tags/WeaponTag.cs +++ b/Zennysoft.Game.Ma.Implementation/Equipment/Tags/WeaponTag.cs @@ -8,5 +8,6 @@ public enum WeaponTag IgnoreDefense, Knockback, InverseHPAttackPower, - RustChanceSelfAndEnemy + RustChanceSelfAndEnemy, + Instakill } diff --git a/Zennysoft.Game.Ma/src/items/accessory/accessory.png b/Zennysoft.Game.Ma/src/items/accessory/accessory.png deleted file mode 100644 index ae598adb3682dc6e157ff76b13d00db6c3c37009..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3240 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 knockbackable.Knockback(0.3f, -CurrentBasis.Z.Normalized()); if (((Weapon)EquipmentComponent.EquippedWeapon.Value).WeaponTag == WeaponTag.SelfDamage) HealthComponent.Damage(5); + if (((Weapon)EquipmentComponent.EquippedWeapon.Value).WeaponTag == WeaponTag.Instakill) + { + var rng = new RandomNumberGenerator(); + rng.Randomize(); + if (rng.Randf() <= LuckComponent.Luck.Value) + enemy.Die(); + } } private void CollisionDetector_AreaEntered(Area3D area) diff --git a/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.tscn b/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.tscn index 0a7987a3e..d418f3054 100644 --- a/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.tscn +++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=6 format=3 uid="uid://c005nd0m2eim"] +[gd_scene load_steps=5 format=3 uid="uid://c005nd0m2eim"] [ext_resource type="Script" uid="uid://cglxk7v8hpesn" path="res://src/ui/inventory_menu/ItemSlot.cs" id="1_yttxt"] -[ext_resource type="Texture2D" uid="uid://0r1dws4ajhdx" path="res://src/items/accessory/textures/MASK 01.PNG" id="2_7kdbd"] [ext_resource type="LabelSettings" uid="uid://dupifadnagodp" path="res://src/ui/label_settings/MainTextRegular.tres" id="3_rf22b"] [ext_resource type="Script" uid="uid://b0rrpkpsfdga8" path="res://src/ui/inventory_menu/ItemLabel.cs" id="3_xlgl0"] @@ -43,7 +42,6 @@ layout_mode = 2 [node name="ItemTexture" type="TextureRect" parent="HBox"] unique_name_in_owner = true layout_mode = 2 -texture = ExtResource("2_7kdbd") expand_mode = 2 [node name="ReferenceRect2" type="ReferenceRect" parent="HBox"]