Improved water affinity and carve and removed water aspecrt

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

@@ -1,14 +1,16 @@
 display-name: "Carve"
-description: "&a%placeholder%% &8chance to heavily damage nearby entities when you swing"
-placeholder: "10 * %level%"
-type: special
+description: "Give &a%damage%&8 damage to entities within &a%radius%&8 blocks when you swing"
+placeholders:
+  radius: "1 + %level%"
+  damage: "%level% * 2"
+type: normal
 
 targets:
   - axe
 conflicts:
   - cleave
-rarity: special
-max-level: 8
+rarity: legendary
+max-level: 4
 
 tradeable: true
 discoverable: true
@@ -17,10 +19,8 @@ enchantable: true
 effects:
   - id: damage_nearby_entities
     args:
-      chance: "10 * %level%"
-      damage: 2
+      damage: "%level% * 2"
       radius: "0.5 * %level%"
-      entities: [ ]
       damage_as_player: true
       damage_self: false
     triggers:

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

@@ -1,12 +1,12 @@
 display-name: "Water Affinity"
 description: "Increases damage dealt when in water by &a%placeholder%%"
-placeholder: "(1.0 + (%level% * 0.02)) * 100.0"  
+placeholder: "(1.0 + (%level% * 0.02)) * 100.0"
 type: normal
 
 targets:
-    - sword
+  - sword
 conflicts:
-    - fire_aspect
+  - fire_aspect
 rarity: epic
 max-level: 7
 
@@ -21,5 +21,5 @@ effects:
     triggers:
       - melee_attack
 
-conditions: 
+conditions:
   - id: in_water

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

@@ -1,40 +0,0 @@
-display-name: "Water Aspect"
-description: "Increases damage dealt against fiery mobs and endermen by &a%placeholder%%"
-placeholder: "100 + %level% * 20"
-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: [ ]