Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,25 @@
+display-name: "Water Affinity"
+description: "Increases damage dealt when in water by &a%placeholder%%&r."
+placeholder: "(1.0 + (%level% * 0.02)) * 100.0"  
+type: normal
+
+targets:
+    - sword
+conflicts:
+    - fire_aspect
+rarity: epic
+max-level: 7
+
+tradeable: true
+discoverable: true
+enchantable: true
+
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: "1.0 + (%level% * 0.02)"
+    triggers:
+      - melee_attack
+
+conditions: 
+  - id: "in_water"

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

@@ -0,0 +1,40 @@
+display-name: "Water Aspect"
+description: "Increases damage dealt against fiery mobs and endermen by &a%placeholder%%&r."
+placeholder: "(1.0 + (%level% * 0.2)) * 100.0"  
+type: normal
+
+targets:
+    - sword
+    - axe
+conflicts:
+    - fire_aspect
+rarity: rare
+max-level: 2
+
+tradeable: true
+discoverable: true
+enchantable: true
+
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: "1.0 + (%level% * 0.2)"
+    triggers:
+      - melee_attack
+    filters:
+      entities:
+        - drowned
+        - squid
+        - guardian
+        - enderman
+        - axolotl
+        - cod 
+        - dolphin 
+        - elder_guardian 
+        - glow_squid
+        - pufferfish
+        - salmon
+        - tropical_fish
+        - turtle
+
+conditions: [ ]

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

@@ -0,0 +1,32 @@
+display-name: "Wisdom"
+description: "&8Increases dropped experience by &a%placeholder%%&r."
+placeholder: "(1.0 + (%level% * 0.02)) * 100.0"  
+type: normal
+
+targets:
+  - sword
+  - axe
+  - pickaxe
+  - shovel
+  - hoe
+  - bow
+  - crossbow
+  - trident
+conflicts:
+  - splash
+  - intellect
+rarity: uncommon
+max-level: 3
+
+tradeable: true
+discoverable: true
+enchantable: true
+
+effects:
+  - id: xp_multiplier
+    args:
+      multiplier: "1.0 + (%level% * 0.02)"
+    triggers:
+      - gain_xp
+
+conditions: [ ]

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

@@ -0,0 +1,30 @@
+display-name: "Wound"
+description: "&a%chance%%&r chance to cause your opponent to bleed, getting &a%damage% &rrepetitive damage for &a%duration%s&r."
+placeholders:
+  chance: "%level% * 3"
+  duration: "(%level% * 5.0) / 20.0"
+  damage: "1"
+type: normal
+
+targets:
+  - bow 
+  - crossbow
+conflicts:
+  - sharpness
+rarity: legendary
+max-level: 7
+
+tradeable: true
+discoverable: true
+enchantable: true
+
+effects:
+  - id: bleed
+    args:
+      amount: "%level% * 5"
+      chance: "3 * %level%"
+      damage: 1
+    triggers:
+      - bow_attack
+
+conditions: [ ]

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

@@ -0,0 +1,25 @@
+display-name: "Zeus"
+description: "&a%placeholder%%&8 chance to strike lightning on your opponent"
+placeholder: "%level% * 1"
+type: normal
+
+targets:
+  - bow 
+  - crossbow
+conflicts: []
+rarity: epic
+max-level: 6
+
+tradeable: true
+discoverable: true
+enchantable: true
+
+effects:
+  - id: strike_lightning
+    args:
+      amount: 1
+      chance: "1 * %level%"
+    triggers:
+      - bow_attack
+
+conditions: [ ]