diff --git a/eco-core/core-plugin/src/main/resources/enchants/end_affinity.yml b/eco-core/core-plugin/src/main/resources/enchants/end_affinity.yml
new file mode 100644
index 00000000..4eca19a7
--- /dev/null
+++ b/eco-core/core-plugin/src/main/resources/enchants/end_affinity.yml
@@ -0,0 +1,31 @@
+display-name: "End Affinity"
+description: "Increases damage dealt in the end by &a%placeholder%%"
+placeholder: "20 + %level% * 10"
+type: normal
+
+targets:
+  - sword
+  - bow
+  - trident
+conflicts:
+  - nether_affinity
+rarity: epic
+max-level: 4
+
+tradeable: true
+discoverable: true
+enchantable: true
+
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: "1.2 + %level% * 0.1"
+    triggers:
+      - melee_attack
+      - bow_attack
+      - trident_attack
+
+conditions:
+  - id: in_world
+    args:
+      world: world_the_end
diff --git a/eco-core/core-plugin/src/main/resources/enchants/nether_affinity.yml b/eco-core/core-plugin/src/main/resources/enchants/nether_affinity.yml
new file mode 100644
index 00000000..043f4fe5
--- /dev/null
+++ b/eco-core/core-plugin/src/main/resources/enchants/nether_affinity.yml
@@ -0,0 +1,31 @@
+display-name: "Nether Affinity"
+description: "Increases damage dealt in the nether by &a%placeholder%%"
+placeholder: "20 + %level% * 10"
+type: normal
+
+targets:
+  - sword
+  - bow
+  - trident
+conflicts:
+  - end_affinity
+rarity: epic
+max-level: 4
+
+tradeable: true
+discoverable: true
+enchantable: true
+
+effects:
+  - id: damage_multiplier
+    args:
+      multiplier: "1.2 + %level% * 0.1"
+    triggers:
+      - melee_attack
+      - bow_attack
+      - trident_attack
+
+conditions:
+  - id: in_world
+    args:
+      world: world_nether
diff --git a/eco-core/core-plugin/src/main/resources/enchants/water_affinity.yml b/eco-core/core-plugin/src/main/resources/enchants/water_affinity.yml
deleted file mode 100644
index f74cfd68..00000000
--- a/eco-core/core-plugin/src/main/resources/enchants/water_affinity.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-display-name: "Water Affinity"
-description: "Increases damage dealt when in water by &a%placeholder%%"
-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