From 102711404b8a3ebcfdcbbb792d683f51c682d2a0 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 5 Sep 2022 14:51:06 +0100 Subject: [PATCH] Improved OfTeNs enchants --- .../{wateraffinity.yml => water_affinity.yml} | 50 ++++++------ .../{wateraspect.yml => water_aspect.yml} | 80 +++++++++---------- .../src/main/resources/enchants/wisdom.yml | 8 +- .../src/main/resources/enchants/wound.yml | 11 +-- .../src/main/resources/enchants/zeus.yml | 2 +- 5 files changed, 76 insertions(+), 75 deletions(-) rename eco-core/core-plugin/src/main/resources/enchants/{wateraffinity.yml => water_affinity.yml} (88%) rename eco-core/core-plugin/src/main/resources/enchants/{wateraspect.yml => water_aspect.yml} (83%) diff --git a/eco-core/core-plugin/src/main/resources/enchants/wateraffinity.yml b/eco-core/core-plugin/src/main/resources/enchants/water_affinity.yml similarity index 88% rename from eco-core/core-plugin/src/main/resources/enchants/wateraffinity.yml rename to eco-core/core-plugin/src/main/resources/enchants/water_affinity.yml index c08550c6..49bdcd71 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/wateraffinity.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/water_affinity.yml @@ -1,25 +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" \ No newline at end of file +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 diff --git a/eco-core/core-plugin/src/main/resources/enchants/wateraspect.yml b/eco-core/core-plugin/src/main/resources/enchants/water_aspect.yml similarity index 83% rename from eco-core/core-plugin/src/main/resources/enchants/wateraspect.yml rename to eco-core/core-plugin/src/main/resources/enchants/water_aspect.yml index ac9e7bdf..56762db9 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/wateraspect.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/water_aspect.yml @@ -1,40 +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: [ ] \ No newline at end of file +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: [ ] 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 8f6da80b..4c2ba3a0 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/wisdom.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/wisdom.yml @@ -1,6 +1,6 @@ display-name: "Wisdom" -description: "&8Increases dropped experience by &a%placeholder%%&r." -placeholder: "(1.0 + (%level% * 0.02)) * 100.0" +description: "&8Increases dropped experience by &a%placeholder%%" +placeholder: "100 + %level% * 20" type: normal targets: @@ -25,8 +25,8 @@ enchantable: true effects: - id: xp_multiplier args: - multiplier: "1.0 + (%level% * 0.02)" + multiplier: "1.0 + (%level% * 0.2)" triggers: - gain_xp -conditions: [ ] \ No newline at end of file +conditions: [ ] diff --git a/eco-core/core-plugin/src/main/resources/enchants/wound.yml b/eco-core/core-plugin/src/main/resources/enchants/wound.yml index f51fc3e1..9650b562 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/wound.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/wound.yml @@ -1,13 +1,13 @@ display-name: "Wound" -description: "&a%chance%%&r chance to cause your opponent to bleed, getting &a%damage% &rrepetitive damage for &a%duration%s&r." +description: "Gives a &a%chance%%&8 chance to give your opponent &a%damage% &8damage for &a%duration%&8 seconds" placeholders: chance: "%level% * 3" - duration: "(%level% * 5.0) / 20.0" + duration: "0.75 * (%level% + 2)" damage: "1" type: normal targets: - - bow + - bow - crossbow conflicts: - sharpness @@ -21,10 +21,11 @@ enchantable: true effects: - id: bleed args: - amount: "%level% * 5" chance: "3 * %level%" + amount: "%level% + 2" damage: 1 + interval: 15 triggers: - bow_attack -conditions: [ ] \ No newline at end of file +conditions: [ ] diff --git a/eco-core/core-plugin/src/main/resources/enchants/zeus.yml b/eco-core/core-plugin/src/main/resources/enchants/zeus.yml index c2a57f03..822701e7 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/zeus.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/zeus.yml @@ -22,4 +22,4 @@ effects: triggers: - bow_attack -conditions: [ ] \ No newline at end of file +conditions: [ ]