diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModPerks.java b/src/main/java/com/atsuishio/superbwarfare/init/ModPerks.java index 70391353d..f2332bd5a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModPerks.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModPerks.java @@ -44,6 +44,7 @@ public class ModPerks { public static final DeferredHolder LONGER_WIRE = AMMO_PERKS.register("longer_wire", LongerWire::new); public static final DeferredHolder INCENDIARY_BULLET = AMMO_PERKS.register("incendiary_bullet", IncendiaryBullet::new); public static final DeferredHolder MICRO_MISSILE = AMMO_PERKS.register("micro_missile", MicroMissile::new); + public static final DeferredHolder CUPID_ARROW = AMMO_PERKS.register("cupid_arrow", CupidArrow::new); /** * Functional Perks @@ -58,7 +59,6 @@ public class ModPerks { public static final DeferredHolder TURBO_CHARGER = FUNC_PERKS.register("turbo_charger", TurboCharger::new); public static final DeferredHolder POWERFUL_ATTRACTION = FUNC_PERKS.register("powerful_attraction", PowerfulAttraction::new); public static final DeferredHolder INTELLIGENT_CHIP = FUNC_PERKS.register("intelligent_chip", () -> new Perk("intelligent_chip", Perk.Type.FUNCTIONAL)); - public static final DeferredHolder CUPID_ARROW = FUNC_PERKS.register("cupid_arrow", CupidArrow::new); /** * Damage Perks diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/DefaultGunData.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/data/DefaultGunData.java index 3a391e362..ba7390849 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/DefaultGunData.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/data/DefaultGunData.java @@ -84,6 +84,7 @@ public class DefaultGunData { "superbwarfare:monster_hunter", "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ); } diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/functional/CupidArrow.java b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/CupidArrow.java similarity index 87% rename from src/main/java/com/atsuishio/superbwarfare/perk/functional/CupidArrow.java rename to src/main/java/com/atsuishio/superbwarfare/perk/ammo/CupidArrow.java index 572c398ba..c9e60cf36 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/functional/CupidArrow.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/ammo/CupidArrow.java @@ -1,7 +1,8 @@ -package com.atsuishio.superbwarfare.perk.functional; +package com.atsuishio.superbwarfare.perk.ammo; import com.atsuishio.superbwarfare.entity.CupidLove; import com.atsuishio.superbwarfare.item.gun.data.GunData; +import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.perk.PerkInstance; import com.atsuishio.superbwarfare.tools.ParticleTool; @@ -17,12 +18,11 @@ import net.minecraft.world.entity.npc.Villager; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.entity.schedule.Activity; -import org.jetbrains.annotations.Nullable; -public class CupidArrow extends Perk { +public class CupidArrow extends AmmoPerk { public CupidArrow() { - super("cupid_arrow", Perk.Type.FUNCTIONAL); + super(new AmmoPerk.Builder("cupid_arrow", Perk.Type.AMMO).bypassArmorRate(0.0f).damageRate(0.0f).speedRate(1.0f).slug(true).rgb(255, 185, 215)); } @Override @@ -57,11 +57,6 @@ public class CupidArrow extends Perk { } } - @Override - public float getModifiedDamage(float damage, GunData data, PerkInstance instance, @Nullable LivingEntity target, DamageSource source) { - return 0; - } - @Override public boolean shouldCancelHurtEvent(float damage, GunData data, PerkInstance instance, LivingEntity target, DamageSource source) { return true; diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index df0a2fd9b..7af2cc390 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -329,6 +329,8 @@ "des.superbwarfare.bread_bullet": "Deals extreme knockback and slowness to stuck mobs.", "item.superbwarfare.micro_missile": "Micro Missile", "des.superbwarfare.micro_missile": "Fires a high-speed projectile without gravity.", + "item.superbwarfare.cupid_arrow": "Cupid's Arrow", + "des.superbwarfare.cupid_arrow": "Make the target fall in love after being hit. Deals no damage to living entities.", "item.superbwarfare.heal_clip": "Heal Clip", "des.superbwarfare.heal_clip": "Reloading after defeating a mob will heal you and your nearby allies.", @@ -346,8 +348,6 @@ "des.superbwarfare.powerful_attraction": "Experience and items dropped by slain mods will instantly be transferred to your inventory.", "item.superbwarfare.intelligent_chip": "Intelligent Chip", "des.superbwarfare.intelligent_chip": "Aims at enemies automatically (Do not use this in PVP mode)", - "item.superbwarfare.cupid_arrow": "Cupid's Arrow", - "des.superbwarfare.cupid_arrow": "Make the target fall in love after being hit. Deals no damage to living entities.", "item.superbwarfare.kill_clip": "Kill Clip", "des.superbwarfare.kill_clip": "Increases the damage of weapon after dealing a final blow.", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 1e0fd4038..e74a28bfb 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -329,6 +329,8 @@ "des.superbwarfare.bread_bullet": "命中后会使目标移速下降,并造成强大的击退", "item.superbwarfare.micro_missile": "微型导弹", "des.superbwarfare.micro_missile": "使武器发射无视重力前进的高速弹药", + "item.superbwarfare.cupid_arrow": "丘比特之箭", + "des.superbwarfare.cupid_arrow": "命中后会使目标坠入爱河,不会对生物造成伤害", "item.superbwarfare.heal_clip": "治疗弹匣", "des.superbwarfare.heal_clip": "最后一击后短时间内填装,可治疗自身和附近队友", @@ -346,8 +348,6 @@ "des.superbwarfare.powerful_attraction": "击杀目标后掉落的物品和经验会直接转移到自身", "item.superbwarfare.intelligent_chip": "智慧芯片", "des.superbwarfare.intelligent_chip": "自动瞄准敌人(请勿在PVP使用此模组)", - "item.superbwarfare.cupid_arrow": "丘比特之箭", - "des.superbwarfare.cupid_arrow": "命中后会使目标坠入爱河,不会对生物造成伤害", "item.superbwarfare.kill_clip": "杀戮弹匣", "des.superbwarfare.kill_clip": "完成击杀后填装可提升武器伤害", diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json index 77e8613e3..1ecdeca1e 100644 --- a/src/main/resources/data/superbwarfare/guns/aa_12.json +++ b/src/main/resources/data/superbwarfare/guns/aa_12.json @@ -29,6 +29,7 @@ "superbwarfare:desperado", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } diff --git a/src/main/resources/data/superbwarfare/guns/ak_12.json b/src/main/resources/data/superbwarfare/guns/ak_12.json index a3164cc99..f6abf9e87 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_12.json +++ b/src/main/resources/data/superbwarfare/guns/ak_12.json @@ -32,6 +32,7 @@ "superbwarfare:vorpal_weapon", "superbwarfare:firefly", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json index c26d0a3f6..7a2ebaadf 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_47.json +++ b/src/main/resources/data/superbwarfare/guns/ak_47.json @@ -32,6 +32,7 @@ "superbwarfare:vorpal_weapon", "superbwarfare:firefly", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json index 8ab4f4ddc..4af8a46a4 100644 --- a/src/main/resources/data/superbwarfare/guns/devotion.json +++ b/src/main/resources/data/superbwarfare/guns/devotion.json @@ -27,6 +27,7 @@ "superbwarfare:vorpal_weapon", "superbwarfare:turbo_charger", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json index c7fadc81e..82125567b 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_17.json +++ b/src/main/resources/data/superbwarfare/guns/glock_17.json @@ -28,6 +28,7 @@ "superbwarfare:firefly", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json index 190ee9c93..a9ed84040 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_18.json +++ b/src/main/resources/data/superbwarfare/guns/glock_18.json @@ -30,6 +30,7 @@ "superbwarfare:firefly", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json index d1866afc1..abd54818b 100644 --- a/src/main/resources/data/superbwarfare/guns/hk_416.json +++ b/src/main/resources/data/superbwarfare/guns/hk_416.json @@ -32,6 +32,7 @@ "superbwarfare:vorpal_weapon", "superbwarfare:firefly", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/homemade_shotgun.json b/src/main/resources/data/superbwarfare/guns/homemade_shotgun.json index e1e5495d5..34147e254 100644 --- a/src/main/resources/data/superbwarfare/guns/homemade_shotgun.json +++ b/src/main/resources/data/superbwarfare/guns/homemade_shotgun.json @@ -27,6 +27,7 @@ "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json index c59eb7831..c98f67141 100644 --- a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json +++ b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json @@ -23,6 +23,7 @@ "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/insidious.json b/src/main/resources/data/superbwarfare/guns/insidious.json index e6b65388b..f04c20aff 100644 --- a/src/main/resources/data/superbwarfare/guns/insidious.json +++ b/src/main/resources/data/superbwarfare/guns/insidious.json @@ -30,6 +30,7 @@ "superbwarfare:vorpal_weapon", "superbwarfare:firefly", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json index 7e603fa54..5ded91d39 100644 --- a/src/main/resources/data/superbwarfare/guns/k_98.json +++ b/src/main/resources/data/superbwarfare/guns/k_98.json @@ -29,6 +29,7 @@ "superbwarfare:magnificent_howl", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json index e6c85364d..72656aa0a 100644 --- a/src/main/resources/data/superbwarfare/guns/m_1911.json +++ b/src/main/resources/data/superbwarfare/guns/m_1911.json @@ -28,6 +28,7 @@ "superbwarfare:firefly", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json index e889a8044..aa0a2079d 100644 --- a/src/main/resources/data/superbwarfare/guns/m_4.json +++ b/src/main/resources/data/superbwarfare/guns/m_4.json @@ -32,6 +32,7 @@ "superbwarfare:vorpal_weapon", "superbwarfare:firefly", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json index 7c6fbf68e..9c4ced001 100644 --- a/src/main/resources/data/superbwarfare/guns/m_60.json +++ b/src/main/resources/data/superbwarfare/guns/m_60.json @@ -25,6 +25,7 @@ "superbwarfare:monster_hunter", "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index 3ff32915a..bb12a3b4b 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -29,6 +29,7 @@ "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json index fb5f17a62..e2e8d7f34 100644 --- a/src/main/resources/data/superbwarfare/guns/m_98b.json +++ b/src/main/resources/data/superbwarfare/guns/m_98b.json @@ -28,6 +28,7 @@ "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index 06bdd601b..b4ea212df 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -31,6 +31,7 @@ "superbwarfare:magnificent_howl", "superbwarfare:firefly", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json index ded0535ab..1afabc444 100644 --- a/src/main/resources/data/superbwarfare/guns/minigun.json +++ b/src/main/resources/data/superbwarfare/guns/minigun.json @@ -21,6 +21,7 @@ "superbwarfare:monster_hunter", "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json index 8049e7247..a50b8ed00 100644 --- a/src/main/resources/data/superbwarfare/guns/mk_14.json +++ b/src/main/resources/data/superbwarfare/guns/mk_14.json @@ -32,6 +32,7 @@ "superbwarfare:vorpal_weapon", "superbwarfare:firefly", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json index e1d7d80cd..528333a38 100644 --- a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json +++ b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json @@ -28,6 +28,7 @@ "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/mp_443.json b/src/main/resources/data/superbwarfare/guns/mp_443.json index c7fadc81e..82125567b 100644 --- a/src/main/resources/data/superbwarfare/guns/mp_443.json +++ b/src/main/resources/data/superbwarfare/guns/mp_443.json @@ -28,6 +28,7 @@ "superbwarfare:firefly", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json index a3c57c577..80fb01371 100644 --- a/src/main/resources/data/superbwarfare/guns/ntw_20.json +++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json @@ -27,6 +27,7 @@ "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json index 908b82210..bdca8a0ce 100644 --- a/src/main/resources/data/superbwarfare/guns/qbz_95.json +++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json @@ -32,6 +32,7 @@ "superbwarfare:vorpal_weapon", "superbwarfare:firefly", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json index d3c1793b3..39e5bc02a 100644 --- a/src/main/resources/data/superbwarfare/guns/rpk.json +++ b/src/main/resources/data/superbwarfare/guns/rpk.json @@ -27,6 +27,7 @@ "superbwarfare:monster_hunter", "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json index 5048d2fcc..d28bc6e93 100644 --- a/src/main/resources/data/superbwarfare/guns/sentinel.json +++ b/src/main/resources/data/superbwarfare/guns/sentinel.json @@ -27,6 +27,7 @@ "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json index 56bba346b..764e8a06b 100644 --- a/src/main/resources/data/superbwarfare/guns/sks.json +++ b/src/main/resources/data/superbwarfare/guns/sks.json @@ -29,6 +29,7 @@ "superbwarfare:magnificent_howl", "superbwarfare:firefly", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json index b1ea16e6e..6f7f0bacf 100644 --- a/src/main/resources/data/superbwarfare/guns/svd.json +++ b/src/main/resources/data/superbwarfare/guns/svd.json @@ -27,6 +27,7 @@ "superbwarfare:vorpal_weapon", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/trachelium.json b/src/main/resources/data/superbwarfare/guns/trachelium.json index f7cc3991a..47d1e24d9 100644 --- a/src/main/resources/data/superbwarfare/guns/trachelium.json +++ b/src/main/resources/data/superbwarfare/guns/trachelium.json @@ -29,6 +29,7 @@ "superbwarfare:firefly", "!superbwarfare:micro_missile", "!superbwarfare:longer_wire", - "!superbwarfare:butterfly_bullet" + "!superbwarfare:butterfly_bullet", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/vector.json b/src/main/resources/data/superbwarfare/guns/vector.json index 235baaf9d..0e31be308 100644 --- a/src/main/resources/data/superbwarfare/guns/vector.json +++ b/src/main/resources/data/superbwarfare/guns/vector.json @@ -31,6 +31,7 @@ "superbwarfare:vorpal_weapon", "superbwarfare:firefly", "!superbwarfare:micro_missile", - "!superbwarfare:longer_wire" + "!superbwarfare:longer_wire", + "!superbwarfare:cupid_arrow" ] } \ No newline at end of file