From 9837643157c3bf133a9f964539154960389e2beb Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Mon, 5 Sep 2022 17:16:27 +0100
Subject: [PATCH] Added slaughter, removed arachnid

---
 .../src/main/resources/enchants/arachnid.yml  | 33 -------------------
 .../enchants/{abattoir.yml => slaughter.yml}  | 21 +++++-------
 .../src/main/resources/enchants/wisdom.yml    |  4 +--
 3 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 eco-core/core-plugin/src/main/resources/enchants/arachnid.yml
 rename eco-core/core-plugin/src/main/resources/enchants/{abattoir.yml => slaughter.yml} (58%)

diff --git a/eco-core/core-plugin/src/main/resources/enchants/arachnid.yml b/eco-core/core-plugin/src/main/resources/enchants/arachnid.yml
deleted file mode 100644
index fb230c87..00000000
--- a/eco-core/core-plugin/src/main/resources/enchants/arachnid.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-display-name: "Arachnid"
-description: "Increases damage against spiders"
-placeholder: "30 * %level%"
-type: normal
-
-targets:
-  - trident
-conflicts:
-  - serrated
-  - bladed
-  - phantasm
-  - pacify
-  - abattoir
-  - impaling
-rarity: common
-max-level: 5
-
-tradeable: true
-discoverable: true
-enchantable: true
-
-effects:
-  - id: damage_multiplier
-    args:
-      multiplier: "1 + 0.3 * %level%"
-    triggers:
-      - trident_attack
-    filters:
-      entities:
-        - spider
-        - cave_spider
-
-conditions: [ ]
diff --git a/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml b/eco-core/core-plugin/src/main/resources/enchants/slaughter.yml
similarity index 58%
rename from eco-core/core-plugin/src/main/resources/enchants/abattoir.yml
rename to eco-core/core-plugin/src/main/resources/enchants/slaughter.yml
index 51cb42ea..30c56d6f 100644
--- a/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml
+++ b/eco-core/core-plugin/src/main/resources/enchants/slaughter.yml
@@ -1,17 +1,14 @@
-display-name: "Abattoir"
-description: "Tridents deal &a%placeholder%% &rmore damage against passive mobs"
-placeholder: "30 * %level%"
+display-name: "Slaughter"
+description: "Gives a &a%placeholder%&r bonus to melee damage against passive mobs"
+placeholder: "2.5 * %level%"
 type: normal
 
 targets:
-  - trident
+  - sword
 conflicts:
-  - serrated
-  - bladed
-  - phantasm
-  - pacify
-  - arachnid
-  - impaling
+  - sharpness
+  - smite
+  - bane_of_arthropods
 rarity: common
 max-level: 5
 
@@ -22,9 +19,9 @@ enchantable: true
 effects:
   - id: damage_multiplier
     args:
-      multiplier: "1 + 0.3 * %level%"
+      multiplier: "2.5 * %level%"
     triggers:
-      - trident_attack
+      - melee_attack
     filters:
       entities:
         - cow
diff --git a/eco-core/core-plugin/src/main/resources/enchants/wisdom.yml b/eco-core/core-plugin/src/main/resources/enchants/wisdom.yml
index 7a572829..23dc6755 100644
--- a/eco-core/core-plugin/src/main/resources/enchants/wisdom.yml
+++ b/eco-core/core-plugin/src/main/resources/enchants/wisdom.yml
@@ -12,9 +12,7 @@ targets:
   - bow
   - crossbow
   - trident
-conflicts:
-  - splash
-  - intellect
+conflicts: [ ]
 rarity: uncommon
 max-level: 3