Various enchantment changes

eco-core/core-plugin/src/main/resources/enchants/aquatic.yml

@@ -1,24 +0,0 @@
-display-name: "Aquatic"
-description: "Trident deals &a%placeholder%% &radditional damage when shot from water"
-placeholder: "5 * %level%"
-type: normal
-
-targets:
-  - trident
-conflicts: [ ]
-rarity: rare
-max-level: 8
-
-tradeable: true
-discoverable: true
-enchantable: true
-
-effects:
-  - id: damage_multiplier
-    args:
-      multiplier: "1 + 0.05 * %level%"
-    triggers:
-      - trident_attack
-
-conditions:
-  - id: in_water

eco-core/core-plugin/src/main/resources/enchants/atmospheric.yml

@@ -1,24 +0,0 @@
-display-name: "Atmospheric"
-description: "Deal &a%placeholder%% &rmore trident damage when you are in air"
-placeholder: "10 * %level%"
-type: normal
-
-targets:
-  - trident
-conflicts: [ ]
-rarity: epic
-max-level: 3
-
-tradeable: true
-discoverable: true
-enchantable: true
-
-effects:
-  - id: damage_multiplier
-    args:
-      multiplier: "1 + 0.1 * %level%"
-    triggers:
-      - bow_attack
-
-conditions:
-  - id: in_air

eco-core/core-plugin/src/main/resources/enchants/blind.yml

@@ -1,28 +0,0 @@
-display-name: "Blind"
-description: "Gives a &a%placeholder%%&r chance of blinding your opponent"
-placeholder: "%level%"
-type: normal
-
-targets:
-  - bow
-  - crossbow
-conflicts: [ ]
-rarity: legendary
-max-level: 6
-
-tradeable: true
-discoverable: true
-enchantable: true
-
-effects:
-  - id: potion_effect
-    args:
-      chance: "%level%"
-      effect: blindness
-      level: 1
-      duration: "20 * %level%"
-      apply_to_player: false
-    triggers:
-      - melee_attack
-
-conditions: [ ]

eco-core/core-plugin/src/main/resources/enchants/butchering.yml

@@ -1,43 +0,0 @@
-display-name: "Butchering"
-description: "Deal &a%placeholder%% &rmore damage against passive mobs"
-placeholder: "25 * %level%"
-type: normal
-
-targets:
-  - sword
-  - axe
-conflicts:
-  - sharpness
-  - bane_of_arthropods
-  - smite
-  - defusion
-  - razor
-  - ender_slayer
-rarity: common
-max-level: 5
-
-tradeable: true
-discoverable: true
-enchantable: true
-
-effects:
-  - id: damage_multiplier
-    args:
-      multiplier: "1 + 0.25 * %level%"
-    triggers:
-      - melee_attack
-    filters:
-      entities:
-        - cow
-        - sheep
-        - pig
-        - horse
-        - parrot
-        - cat
-        - ocelots
-        - fox
-        - villager
-        - axolotl
-        - chicken
-
-conditions: [ ]

eco-core/core-plugin/src/main/resources/enchants/confusion.yml

@@ -1,5 +1,5 @@
 display-name: "Confusion"
-description: "&a%placeholder%% &rchance to shuffle your opponents hotbar"
+description: "Gives a &a%placeholder%% &rchance to shuffle your opponents hotbar"
 placeholder: "2 * %level%"
 type: special
 

eco-core/core-plugin/src/main/resources/enchants/corrosive.yml

@@ -1,24 +0,0 @@
-display-name: "Corrosive"
-description: "Deals &a%placeholder% &rdamage to your opponents armor"
-placeholder: "%level%"
-type: normal
-
-targets:
-  - bow
-  - crossbow
-conflicts: [ ]
-rarity: legendary
-max-level: 2
-
-tradeable: true
-discoverable: true
-enchantable: true
-
-effects:
-  - id: damage_armor
-    args:
-      damage: "%level%"
-    triggers:
-      - melee_attack
-
-conditions: [ ]

eco-core/core-plugin/src/main/resources/enchants/cubism.yml

@@ -6,6 +6,8 @@ type: normal
 targets:
   - sword
   - axe
+  - bow
+  - crossbow
 conflicts: [ ]
 rarity: rare
 max-level: 7
@@ -20,6 +22,7 @@ effects:
       multiplier: "1 + 0.05 * %level%"
     triggers:
       - melee_attack
+      - bow_attack
     filters:
       entities:
         - slime

eco-core/core-plugin/src/main/resources/enchants/defusion.yml

@@ -1,34 +0,0 @@
-display-name: "Defusion"
-description: "&rDeal &a%placeholder%% &rmore damage against creepers"
-placeholder: "%level% * 10"
-type: Normal
-
-targets:
-  - sword
-  - axe
-conflicts:
-  - sharpness
-  - bane_of_arthropods
-  - smite
-  - butchering
-  - razor
-  - ender_slayer
-  - introversion
-rarity: common
-max-level: 5
-
-tradeable: true
-discoverable: true
-enchantable: true
-
-effects:
-  - id: damage_multiplier
-    args:
-      multiplier: "1 + 0.1 * %level%"
-    triggers:
-      - melee_attack
-    filters:
-      entities:
-        - creeper
-
-conditions: []

eco-core/core-plugin/src/main/resources/enchants/flashbang.yml

@@ -0,0 +1,37 @@
+display-name: "Flashbang"
+description: "Gives a &a%placeholder%%&r chance of blinding your opponent"
+placeholder: "%level%"
+type: normal
+
+targets:
+  - bow
+  - crossbow
+conflicts: [ ]
+rarity: rare
+max-level: 6
+
+tradeable: true
+discoverable: true
+enchantable: true
+
+effects:
+  - effects:
+      - id: potion_effect
+        args:
+          effect: blindness
+          level: 3
+          duration: 30
+          apply_to_player: false
+      - id: play_sound
+        args:
+          sound: entity_dragon_fireball_explode
+          pitch: 1.5
+          volume: 4
+        mutators:
+          - id: victim_as_player
+    args:
+      chance: "%level%"
+    triggers:
+      - bow_attack
+
+conditions: [ ]

eco-core/core-plugin/src/main/resources/enchants/introversion.yml

@@ -0,0 +1,30 @@
+display-name: "Introversion"
+description: "Gives a &a%placeholder%&r bonus to melee damage against players"
+placeholder: "2.5 * %level%"
+type: normal
+
+targets:
+  - sword
+conflicts:
+  - sharpness
+  - smite
+  - bane_of_arthropods
+  - slaughter
+rarity: common
+max-level: 5
+
+tradeable: true
+discoverable: true
+enchantable: true
+
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: "2.5 * %level%"
+    triggers:
+      - melee_attack
+    filters:
+      entities:
+        - player
+
+conditions: [ ]

eco-core/core-plugin/src/main/resources/enchants/jumpshot.yml

@@ -1,5 +1,5 @@
-display-name: "Aerial"
+display-name: "Jumpshot"
-description: "Deal &a%placeholder%% &rmore arrow damage when you are in air"
+description: "Deal &a%placeholder%%&r more damage in the air"
 placeholder: "10 * %level%"
 type: normal
 
@@ -7,7 +7,7 @@ targets:
   - bow
   - crossbow
 conflicts: [ ]
-rarity: epic
+rarity: uncommon
 max-level: 3
 
 tradeable: true

eco-core/core-plugin/src/main/resources/enchants/slaughter.yml

@@ -9,6 +9,7 @@ conflicts:
   - sharpness
   - smite
   - bane_of_arthropods
+  - introversion
 rarity: common
 max-level: 5
 

eco-core/core-plugin/src/main/resources/enchants/vitality.yml

@@ -1,4 +1,4 @@
-display-name: "Vitalize"
+display-name: "Vitality"
 description: "Puts you back on max health"
 type: spell