From 414abdd8718ac7336282e8f29e41410f6cdcf9ad Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Fri, 23 May 2025 17:09:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=8B=E4=B8=8D=E8=BF=87?=
 =?UTF-8?q?=E5=9B=9B=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=B5=B7=E6=9C=88?=
 =?UTF-8?q?=E6=9D=83=E6=9D=96=E7=9A=84=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/atsuishio/superbwarfare/item/gun/GunItem.java  |  3 +--
 .../perk/functional/FourthTimesCharm.java              |  9 ++++++++-
 .../data/superbwarfare/guns/aurelia_sceptre.json       | 10 +++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java
index cdadf655f..a7571efbd 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java
@@ -156,7 +156,6 @@ public abstract class GunItem extends Item implements CustomRendererItem {
     }
 
     private static final ResourceLocation SPEED_ID = Mod.loc("gun_movement_speed");
-    private static final ResourceLocation DAMAGE_ID = Mod.loc("gun_melee_damage");
 
     @Override
     public @NotNull ItemAttributeModifiers getDefaultAttributeModifiers(@NotNull ItemStack stack) {
@@ -177,7 +176,7 @@ public abstract class GunItem extends Item implements CustomRendererItem {
         if (data.meleeDamage() > 0) {
             list.add(new ItemAttributeModifiers.Entry(
                     Attributes.ATTACK_DAMAGE,
-                    new AttributeModifier(DAMAGE_ID, data.meleeDamage(), AttributeModifier.Operation.ADD_VALUE),
+                    new AttributeModifier(BASE_ATTACK_DAMAGE_ID, data.meleeDamage(), AttributeModifier.Operation.ADD_VALUE),
                     EquipmentSlotGroup.MAINHAND
             ));
         }
diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java b/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java
index 8267b6748..86668f981 100644
--- a/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java
+++ b/src/main/java/com/atsuishio/superbwarfare/perk/functional/FourthTimesCharm.java
@@ -27,7 +27,14 @@ public class FourthTimesCharm extends Perk {
             tag.remove("FourthTimesCharmCount");
 
             int mag = data.magazine();
-            data.ammo.set(Math.min(mag, data.ammo.get() + 2));
+            if (mag > 0) {
+                data.ammo.set(Math.min(mag, data.ammo.get() + 2));
+            } else if (living != null) {
+                var ammoType = data.ammoTypeInfo().playerAmmoType();
+                if (ammoType != null) {
+                    ammoType.add(living, 2);
+                }
+            }
         }
     }
 
diff --git a/src/main/resources/data/superbwarfare/guns/aurelia_sceptre.json b/src/main/resources/data/superbwarfare/guns/aurelia_sceptre.json
index 099277c0a..9f2bc082d 100644
--- a/src/main/resources/data/superbwarfare/guns/aurelia_sceptre.json
+++ b/src/main/resources/data/superbwarfare/guns/aurelia_sceptre.json
@@ -3,13 +3,15 @@
   "Spread": 1.5,
   "RecoilX": 0.0005,
   "RecoilY": 0.0001,
-  "Damage": 11,
+  "Damage": 5.5,
+  "ProjectileAmount": 2,
   "Headshot": 1.5,
   "Velocity": 8,
   "Weight": 1,
+  "MeleeDamage": 10,
   "NormalReloadTime": 20,
   "EmptyReloadTime": 20,
-  "BypassesArmor": 0.44,
+  "BypassesArmor": 0.26,
   "SoundRadius": 2,
   "RPM": 1100,
   "ShootDelay": 10,
@@ -21,13 +23,11 @@
   "AmmoType": "@HandgunAmmo",
   "AvailablePerks": [
     "@Ammo",
-    "superbwarfare:heal_clip",
     "superbwarfare:field_doctor",
     "superbwarfare:fourth_times_charm",
-    "superbwarfare:subsistence",
     "superbwarfare:powerful_attraction",
     "superbwarfare:intelligent_chip",
-    "superbwarfare:kill_clip",
+    "superbwarfare:killing_tally",
     "superbwarfare:gutshot_straight",
     "superbwarfare:monster_hunter",
     "superbwarfare:vorpal_weapon",