From b9e4eddd9003e84305f2e4541c2204a5c3ef12a4 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 4 Oct 2022 13:04:15 +0100 Subject: [PATCH] Added blackout, brightness, shulker harvest, and sparks --- .../src/main/resources/enchants/blackout.yml | 28 +++++++++++ .../main/resources/enchants/brightness.yml | 35 ++++++++++++++ .../main/resources/enchants/introversion.yml | 1 + .../resources/enchants/shulker_harvest.yml | 26 +++++++++++ .../src/main/resources/enchants/slaughter.yml | 1 + .../src/main/resources/enchants/sparks.yml | 46 +++++++++++++++++++ 6 files changed, 137 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/blackout.yml create mode 100644 eco-core/core-plugin/src/main/resources/enchants/brightness.yml create mode 100644 eco-core/core-plugin/src/main/resources/enchants/shulker_harvest.yml create mode 100644 eco-core/core-plugin/src/main/resources/enchants/sparks.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/blackout.yml b/eco-core/core-plugin/src/main/resources/enchants/blackout.yml new file mode 100644 index 00000000..5ae9985e --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/blackout.yml @@ -0,0 +1,28 @@ +display-name: "Blackout" +description: "Gives a &a%chance%%&r chance to give your opponent darkness for &a%seconds%&r seconds" +placeholders: + chance: "6 + %level%" + seconds: "4 + ceil(%level% / 2)" +type: normal + +targets: + - sword +conflicts: [ ] +rarity: legendary +max-level: 4 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: potion_effect + args: + effect: darkness + level: 1 + duration: "80 + ceil(%level% / 2) * 20" + apply-to-player: false + triggers: + - melee_attack + +conditions: [ ] diff --git a/eco-core/core-plugin/src/main/resources/enchants/brightness.yml b/eco-core/core-plugin/src/main/resources/enchants/brightness.yml new file mode 100644 index 00000000..c9327c63 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/brightness.yml @@ -0,0 +1,35 @@ +display-name: "Brightness" +description: "Deal &a%placeholder%%&r more damage to the warden while in the deep dark" +placeholder: "4 * %level%" +type: common + +targets: + - sword +conflicts: + - sharpness + - smite + - bane_of_arthropods + - introversion + - slaughter +rarity: legendary +max-level: 5 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: add_damage + args: + damage: "4 * %level%" + triggers: + - melee_attack + filters: + entities: + - warden + +conditions: + - id: in_biome + args: + biomes: + - deep_dark diff --git a/eco-core/core-plugin/src/main/resources/enchants/introversion.yml b/eco-core/core-plugin/src/main/resources/enchants/introversion.yml index c73b6d81..0499bd55 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/introversion.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/introversion.yml @@ -10,6 +10,7 @@ conflicts: - smite - bane_of_arthropods - slaughter + - brightness rarity: common max-level: 5 diff --git a/eco-core/core-plugin/src/main/resources/enchants/shulker_harvest.yml b/eco-core/core-plugin/src/main/resources/enchants/shulker_harvest.yml new file mode 100644 index 00000000..4ec5a463 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/shulker_harvest.yml @@ -0,0 +1,26 @@ +display-name: "Shulker Harvest" +description: "Gives a &a%placeholder%%&r boost to shulker drops" +placeholder: "((1 / (%level% + 4)) + ((%level% + 3) / 2)) * 100 - 100" +type: normal + +targets: + - sword +conflicts: + - looting +rarity: epic +max-level: 3 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: multiply_drops + args: + on_items: + - shulker_shell + fortune: "2 + %level%" + triggers: + - entity_item_drop + +conditions: [ ] diff --git a/eco-core/core-plugin/src/main/resources/enchants/slaughter.yml b/eco-core/core-plugin/src/main/resources/enchants/slaughter.yml index 810b6df2..6cfff37e 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/slaughter.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/slaughter.yml @@ -10,6 +10,7 @@ conflicts: - smite - bane_of_arthropods - introversion + - brightness rarity: common max-level: 5 diff --git a/eco-core/core-plugin/src/main/resources/enchants/sparks.yml b/eco-core/core-plugin/src/main/resources/enchants/sparks.yml new file mode 100644 index 00000000..ab09e3f1 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/sparks.yml @@ -0,0 +1,46 @@ +display-name: "Sparks" +description: "Hooking onto enemies during storms gives a &a%chance%%&r chance to strike lightning dealing &a%damage%&r damage" +placeholders: + damage: "1 + %level%" + chance: "25 + 5 * %level%" +type: normal + +targets: + - fishing_rod +conflicts: [ ] +rarity: rare +max-level: 5 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: smite + args: + chance: "25 + 5 * %level%" + damage: "1 + 1 * %level%" + silent: true + triggers: + - catch_entity + + - id: particle_animation + args: + particle: electric_spark + particle-amount: 10 + animation: ground_spiral + tick-multiplier: 1 + entity: victim + use-eye-location: false + particle_args: + scalar: 5.5 + distance-scalar: 0.3 + duration: 25 + triggers: + - catch_entity + mutators: + - id: location_to_victim + +conditions: + - id: is_storm +