From ec2aa1a209b7fbcba1fe0b27a477c62e94f431e4 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Thu, 22 May 2025 17:40:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0otto=E6=94=BB=E5=87=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=BD=9C=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=95=B0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/item/ElectricBaton.java     |  6 +--
 .../weapon_attributes/electric_baton.json     | 37 +++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/data/superbwarfare/weapon_attributes/electric_baton.json

diff --git a/src/main/java/com/atsuishio/superbwarfare/item/ElectricBaton.java b/src/main/java/com/atsuishio/superbwarfare/item/ElectricBaton.java
index 7ebbe7984..bb0a07681 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/ElectricBaton.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/ElectricBaton.java
@@ -26,8 +26,8 @@ import java.util.Optional;
 
 public class ElectricBaton extends SwordItem implements EnergyStorageItem {
 
-    public static final int MAX_ENERGY = 6000;
-    public static final int ENERGY_COST = 1000;
+    public static final int MAX_ENERGY = 30000;
+    public static final int ENERGY_COST = 1500;
     public static final String TAG_OPEN = "Open";
 
     public ElectricBaton() {
@@ -57,7 +57,7 @@ public class ElectricBaton extends SwordItem implements EnergyStorageItem {
     public @NotNull InteractionResultHolder<ItemStack> use(Level level, Player player, InteractionHand usedHand) {
         ItemStack stack = player.getItemInHand(usedHand);
 
-        if (player.isCrouching()) {
+        if (player.isShiftKeyDown()) {
             var tag = NBTTool.getTag(stack);
             tag.putBoolean(TAG_OPEN, !tag.getBoolean(TAG_OPEN));
             NBTTool.saveTag(stack, tag);
diff --git a/src/main/resources/data/superbwarfare/weapon_attributes/electric_baton.json b/src/main/resources/data/superbwarfare/weapon_attributes/electric_baton.json
new file mode 100644
index 000000000..241e42c35
--- /dev/null
+++ b/src/main/resources/data/superbwarfare/weapon_attributes/electric_baton.json
@@ -0,0 +1,37 @@
+{
+  "attributes": {
+    "attack_range": 3.0,
+    "attacks": [
+      {
+        "hitbox": "VERTICAL_PLANE",
+        "damage_multiplier": 1.0,
+        "angle": 110,
+        "upswing": 0.5,
+        "animation": "bettercombat:one_handed_slam",
+        "swing_sound": {
+          "id": "bettercombat:hammer_slam"
+        }
+      },
+      {
+        "hitbox": "VERTICAL_PLANE",
+        "damage_multiplier": 1.0,
+        "angle": 110,
+        "upswing": 0.5,
+        "animation": "bettercombat:one_handed_slam",
+        "swing_sound": {
+          "id": "bettercombat:hammer_slam"
+        }
+      },
+      {
+        "hitbox": "FORWARD_BOX",
+        "damage_multiplier": 1.5,
+        "angle": 30,
+        "upswing": 0.5,
+        "animation": "bettercombat:one_handed_stab",
+        "swing_sound": {
+          "id": "bettercombat:rapier_stab"
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file