From d8dd3ebb433bf061c81b449f24e8d787570d7956 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:04:36 +0200 Subject: [PATCH 01/23] added abattoir added aerial --- .../src/main/resources/enchants/abattoir.yml | 35 +++++++++++++++++++ .../src/main/resources/enchants/aerial.yml | 24 +++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/abattoir.yml create mode 100644 eco-core/core-plugin/src/main/resources/enchants/aerial.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml b/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml new file mode 100644 index 00000000..b04a9059 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml @@ -0,0 +1,35 @@ +display-name: Abattoir +description: Deal %placeholder%% more damage against passive mobs +placeholder: '30 * %level%)' +type: normal + +targets: +- trident +conflicts: [] +rarity: common +max-level: 5 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_multiplier + args: + multiplier: 1 + 0.3 * %level% + triggers: + - trident_attack + filters: + entities: + - cow + - sheep + - pig + - horse + - parrot + - cat + - ocelots + - fox + - villager + - axolotl + - chicken +conditions: [] diff --git a/eco-core/core-plugin/src/main/resources/enchants/aerial.yml b/eco-core/core-plugin/src/main/resources/enchants/aerial.yml new file mode 100644 index 00000000..a5a5a436 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/aerial.yml @@ -0,0 +1,24 @@ +display-name: Aerial +description: Deal %placeholder%% more arrow damage when you are in air +placeholder: '10*%level%' +type: normal + +targets: +- bow +- crossbow +conflicts: [] +rarity: epic +max-level: 3 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_multiplier + args: + multiplier: 1 + 0.1 * %level% + triggers: + - trident_attack +conditions: + - id: in_air From 8aa0d1f9fa9fda9fc5992dcdcdc883b51893a5a8 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:21:00 +0200 Subject: [PATCH 02/23] added abattoir added aerial --- eco-core/core-plugin/src/main/resources/enchants/abattoir.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml b/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml index b04a9059..55d8961f 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml @@ -1,5 +1,5 @@ display-name: Abattoir -description: Deal %placeholder%% more damage against passive mobs +description: Tridents deal %placeholder%% more damage against passive mobs placeholder: '30 * %level%)' type: normal From 494b53eebd1529e1259d2bb0afeee3eb3aeeeb24 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:21:24 +0200 Subject: [PATCH 03/23] added abrasion --- .../src/main/resources/enchants/abrasion.yml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/abrasion.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/abrasion.yml b/eco-core/core-plugin/src/main/resources/enchants/abrasion.yml new file mode 100644 index 00000000..0a0ea91e --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/abrasion.yml @@ -0,0 +1,24 @@ +display-name: Abrasion +description: Damages your opponents armor by %placeholder%. +placeholder: '%level%' +type: Normal + +targets: +- sword +- axe + +conflicts: [] +rarity: legendary +max-level: 2 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_armor + args: + damage: "%level%" + triggers: + - melee_attack +conditions: [] From 6c73ceed2e181324bd80dd51e7885589c9e9ce41 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:21:55 +0200 Subject: [PATCH 04/23] added abrasion --- .../src/main/resources/enchants/aquatic.yml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/aquatic.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/aquatic.yml b/eco-core/core-plugin/src/main/resources/enchants/aquatic.yml new file mode 100644 index 00000000..521a069c --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/aquatic.yml @@ -0,0 +1,23 @@ +display-name: Aquatic +description: Trident deals %placeholder%% additional damage when shot from water +placeholder: '5*%level%' +type: Normal + +targets: +- trident +conflicts: [] +rarity: rare +max-level: 8 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_multiplier + args: + multiplier: 1 + 0.05 * %level% + triggers: + - trident_attack +conditions: + - id: in_water From 0c488c7af9a6f988ba32571bbd675a7b6f6510f3 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:23:14 +0200 Subject: [PATCH 05/23] added arachnid.yml --- .../src/main/resources/enchants/arachnid.yml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/arachnid.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/arachnid.yml b/eco-core/core-plugin/src/main/resources/enchants/arachnid.yml new file mode 100644 index 00000000..73c2487c --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/arachnid.yml @@ -0,0 +1,26 @@ +display-name: Arachnid +description: Increases damage against spiders +placeholder: '30*%level%' +type: Normal + +targets: +- trident +conflicts: [] +rarity: common +max-level: 5 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_multiplier + args: + multiplier: 1 + 0.3 * %level% + triggers: + - trident_attack + filters: + entities: + - spider + - cave_spider +conditions: [] From d9468a42b56c5e95b9e242857b471c58565e0700 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:31:46 +0200 Subject: [PATCH 06/23] added arcanic.yml added armor to targets --- .../src/main/resources/enchants/arcanic.yml | 26 ++++++++++++++++ .../src/main/resources/targets.yml | 30 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/arcanic.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/arcanic.yml b/eco-core/core-plugin/src/main/resources/enchants/arcanic.yml new file mode 100644 index 00000000..99ba2b5d --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/arcanic.yml @@ -0,0 +1,26 @@ +display-name: Arcanic +description: "%placeholder%% chance to ignore potion damage" +placeholder: '%level% * 8' +type: Normal + +targets: +- armor +conflicts: [] +rarity: epic +max-level: 6 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: cancel_event + args: + chance: "%level% * 8" + triggers: + - take_damage + filters: + damageCause: + - poison + - magic +conditions: [] diff --git a/eco-core/core-plugin/src/main/resources/targets.yml b/eco-core/core-plugin/src/main/resources/targets.yml index 3e5bf4bf..04455044 100644 --- a/eco-core/core-plugin/src/main/resources/targets.yml +++ b/eco-core/core-plugin/src/main/resources/targets.yml @@ -116,6 +116,36 @@ targets: - "*diamond_boots" - "*netherite_boots" + - id: armor + display-name: "Armor" + slot: armor + items: + - "*leather_boots" + - "*chainmail_boots" + - "*iron_boots" + - "*golden_boots" + - "*diamond_boots" + - "*netherite_boots" + - "*leather_leggings" + - "*chainmail_leggings" + - "*iron_leggings" + - "*golden_leggings" + - "*diamond_leggings" + - "*netherite_leggings" + - "*turtle_helmet" + - "*leather_helmet" + - "*chainmail_helmet" + - "*iron_helmet" + - "*golden_helmet" + - "*diamond_helmet" + - "*netherite_helmet" + - "*leather_chestplate" + - "*chainmail_chestplate" + - "*iron_chestplate" + - "*golden_chestplate" + - "*diamond_chestplate" + - "*netherite_chestplate" + - id: trident display-name: "Tridents" slot: hands From 1843f5ba3ec39623f02b2b53628c0d8b55c7e986 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:34:26 +0200 Subject: [PATCH 07/23] added atmospheric.yml fixed aerial.yml --- .../src/main/resources/enchants/aerial.yml | 2 +- .../main/resources/enchants/atmospheric.yml | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/atmospheric.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/aerial.yml b/eco-core/core-plugin/src/main/resources/enchants/aerial.yml index a5a5a436..93d7f9db 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/aerial.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/aerial.yml @@ -19,6 +19,6 @@ effects: args: multiplier: 1 + 0.1 * %level% triggers: - - trident_attack + - bow_attack conditions: - id: in_air diff --git a/eco-core/core-plugin/src/main/resources/enchants/atmospheric.yml b/eco-core/core-plugin/src/main/resources/enchants/atmospheric.yml new file mode 100644 index 00000000..57a1af07 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/atmospheric.yml @@ -0,0 +1,23 @@ +display-name: Atmospheric +description: Deal %placeholder%% more trident damage when you are in air +placeholder: '10*%level%' +type: normal + +targets: +- tridents +conflicts: [] +rarity: epic +max-level: 3 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_multiplier + args: + multiplier: 1 + 0.1 * %level% + triggers: + - bow_attack +conditions: + - id: in_air From b63d33a7564795507e09dd92d288f9830250161f Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:41:15 +0200 Subject: [PATCH 08/23] added bladed.yml --- .../src/main/resources/enchants/bladed.yml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/bladed.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/bladed.yml b/eco-core/core-plugin/src/main/resources/enchants/bladed.yml new file mode 100644 index 00000000..7528e860 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/bladed.yml @@ -0,0 +1,22 @@ +display-name: Bladed +description: Trident deals %placeholder%% additional damage +placeholder: '0.5*%level%' +type: Special + +targets: +- trident +conflicts: [] +rarity: veryspecial +max-level: 5 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_multiplier + args: + multiplier: 1 + 0.5 * %level% + triggers: + - trident_attack +conditions: [] From 52374416d11458188c137c4e4817fd0b504f0a34 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:41:43 +0200 Subject: [PATCH 09/23] fixed atmospheric.yml --- .../core-plugin/src/main/resources/enchants/atmospheric.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/resources/enchants/atmospheric.yml b/eco-core/core-plugin/src/main/resources/enchants/atmospheric.yml index 57a1af07..4f4e6f48 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/atmospheric.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/atmospheric.yml @@ -4,7 +4,7 @@ placeholder: '10*%level%' type: normal targets: -- tridents +- trident conflicts: [] rarity: epic max-level: 3 From bc46d06325b93f533d76871096431305aa9b2ff2 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:46:10 +0200 Subject: [PATCH 10/23] added blast_mining.yml --- .../main/resources/enchants/blast_mining.yml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml b/eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml new file mode 100644 index 00000000..6a546145 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml @@ -0,0 +1,27 @@ +display-name: Blast Mining +description: "%placeholder%% chance to mine blocks in a 3x3 area" +placeholder: '20 * %level%' +type: Normal + +targets: +- pickaxe +conflicts: [] +rarity: common +max-level: 1 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: mine_radius + args: + chance: 20 * %level% + radius: 1 + blacklisted_blocks: [] + check_hardness: true + disable_on_sneak: true + whitelist: [ ] + triggers: + - mine_block +conditions: [] From c918f216bf2cbdcfd1af4fc0684c79da5b051c46 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:51:09 +0200 Subject: [PATCH 11/23] fixed blast_mining.yml added blind.yml --- .../main/resources/enchants/blast_mining.yml | 4 +-- .../src/main/resources/enchants/blind.yml | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/blind.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml b/eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml index 6a546145..0a19a2dd 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml @@ -6,8 +6,8 @@ type: Normal targets: - pickaxe conflicts: [] -rarity: common -max-level: 1 +rarity: legendary +max-level: 3 tradeable: true discoverable: true diff --git a/eco-core/core-plugin/src/main/resources/enchants/blind.yml b/eco-core/core-plugin/src/main/resources/enchants/blind.yml new file mode 100644 index 00000000..be7b93ea --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/blind.yml @@ -0,0 +1,25 @@ +display-name: Blind +description: "%placeholder%% chance of blinding your opponent" +placeholder: '%level%' +type: Normal + +targets: +- bow +- crossbow +conflicts: [] +rarity: legendary +max-level: 6 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: potion_effect + args: + chance: %level% + effect: blindness + level: 1 + duration: 20 * %level% + apply_to_player: false +conditions: [] From e84d9fa270ce98973f58e35da6cd3b237b5f7b57 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:53:52 +0200 Subject: [PATCH 12/23] added bleed.yml --- .../src/main/resources/enchants/bleed.yml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/bleed.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/bleed.yml b/eco-core/core-plugin/src/main/resources/enchants/bleed.yml new file mode 100644 index 00000000..0fe638f5 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/bleed.yml @@ -0,0 +1,23 @@ +display-name: Bleed +description: Causes your opponent to bleed, damaging them repeatedly +placeholder: '1.5 * %level%' +type: normal + +targets: +- sword +conflicts: [] +rarity: legendary +max-level: 7 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: bleed + args: + chance: 1.5 * %level% + damage: 1 + interval: 15 + amount: 2 * %level% +conditions: [] From 984ab284eb521cb290f60cfa1e62bb6ef0326cd3 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 14:56:05 +0200 Subject: [PATCH 13/23] added block_breather.yml --- .../resources/enchants/block_breather.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/block_breather.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/block_breather.yml b/eco-core/core-plugin/src/main/resources/enchants/block_breather.yml new file mode 100644 index 00000000..80ab74d6 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/block_breather.yml @@ -0,0 +1,25 @@ +display-name: Block Breather +description: "%placeholder%% chance to ignore suffocation damage" +placeholder: '%level%*15' +type: Normal + +targets: +- helmet +conflicts: [] +rarity: common +max-level: 3 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: cancel_event + args: + chance: "%level% * 15" + triggers: + - take_damage + filters: + damageCause: + - SUFFOCATION +conditions: [] From fea87854c49d3526a95158da58e8f3131b0e15e0 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 20:13:00 +0200 Subject: [PATCH 14/23] added old conflicts --- .../core-plugin/src/main/resources/enchants/abattoir.yml | 8 +++++++- .../core-plugin/src/main/resources/enchants/arachnid.yml | 8 +++++++- .../src/main/resources/enchants/blast_mining.yml | 4 +++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml b/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml index 55d8961f..45358fdb 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/abattoir.yml @@ -5,7 +5,13 @@ type: normal targets: - trident -conflicts: [] +conflicts: + - serrated + - bladed + - phantasm + - pacify + - arachnid + - impaling rarity: common max-level: 5 diff --git a/eco-core/core-plugin/src/main/resources/enchants/arachnid.yml b/eco-core/core-plugin/src/main/resources/enchants/arachnid.yml index 73c2487c..b5701de1 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/arachnid.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/arachnid.yml @@ -5,7 +5,13 @@ type: Normal targets: - trident -conflicts: [] +conflicts: + - serrated + - bladed + - phantasm + - pacify + - abattoir + - impaling rarity: common max-level: 5 diff --git a/eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml b/eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml index 0a19a2dd..b263006f 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/blast_mining.yml @@ -5,7 +5,9 @@ type: Normal targets: - pickaxe -conflicts: [] +conflicts: + - drill + - vein rarity: legendary max-level: 3 From 907f7668f624200ce6886c1b7d823aa24d74d617 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 20:17:04 +0200 Subject: [PATCH 15/23] added boss_hunter.yml --- .../main/resources/enchants/boss_hunter.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/boss_hunter.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/boss_hunter.yml b/eco-core/core-plugin/src/main/resources/enchants/boss_hunter.yml new file mode 100644 index 00000000..8f9aefec --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/boss_hunter.yml @@ -0,0 +1,25 @@ +display-name: Boss Hunter +description: Increases damage against bosses +placeholder: '%level%' +type: Normal + +targets: +- bow +- crossbow +conflicts: [] +rarity: common +max-level: 8 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_multiplier + args: + multiplier: 1 + 0.1 * %level% + triggers: + - bow_attack + filters: + onlyBosses: true +conditions: [] From d377c39a635856ab00007b866b7e4fb39bad28e1 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 20:24:12 +0200 Subject: [PATCH 16/23] fixed boss_hunter.yml fixed butchering.yml --- .../main/resources/enchants/boss_hunter.yml | 6 +-- .../main/resources/enchants/butchering.yml | 42 +++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/butchering.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/boss_hunter.yml b/eco-core/core-plugin/src/main/resources/enchants/boss_hunter.yml index 8f9aefec..6bea7e32 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/boss_hunter.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/boss_hunter.yml @@ -1,13 +1,13 @@ display-name: Boss Hunter -description: Increases damage against bosses -placeholder: '%level%' +description: Deal %placeholder%% more damage against bosses +placeholder: '10 * %level%' type: Normal targets: - bow - crossbow conflicts: [] -rarity: common +rarity: rare max-level: 8 tradeable: true diff --git a/eco-core/core-plugin/src/main/resources/enchants/butchering.yml b/eco-core/core-plugin/src/main/resources/enchants/butchering.yml new file mode 100644 index 00000000..52e0127a --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/butchering.yml @@ -0,0 +1,42 @@ +display-name: Butchering +description: Deal %placeholder%% more damage against passive mobs +placeholder: '25*%level%' +type: Normal + +targets: +- sword +- axe +conflicts: + - sharpness + - bane_of_arthropods + - smite + - defusion + - razor + - ender_slayer +rarity: common +max-level: 5 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_multiplier + args: + multiplier: 1 + 0.25 * %level% + triggers: + - melee_attack + filters: + entities: + - cow + - sheep + - pig + - horse + - parrot + - cat + - ocelots + - fox + - villager + - axolotl + - chicken +conditions: [] From 2bba005b462da7b08349e7ec007bc1d622318ad1 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 20:29:55 +0200 Subject: [PATCH 17/23] added carve.yml I wanted to pass the damage to damage_nearby_entities to apply a multiplier but i dont think thats possible --- .../src/main/resources/enchants/carve.yml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/carve.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/carve.yml b/eco-core/core-plugin/src/main/resources/enchants/carve.yml new file mode 100644 index 00000000..3bbc093f --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/carve.yml @@ -0,0 +1,28 @@ +display-name: Carve +description: "%placeholder%% chance to heavily damage all entities around attacked entity" +placeholder: '10*%level%' +type: special + +targets: +- axes +conflicts: + - cleave +rarity: special +max-level: 8 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_nearby_entities + args: + chance: "10*%level%" + damage: 2 + radius: "0.5*%level%" + entities: [] + damage_as_player: true + damage_self: false + triggers: + - melee_attack +conditions: [] From 8696cddbd3019a921fd670caaba45800a9b3c025 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 20:32:43 +0200 Subject: [PATCH 18/23] added cleave.yml same story as carve --- .../src/main/resources/enchants/cleave.yml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/cleave.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/cleave.yml b/eco-core/core-plugin/src/main/resources/enchants/cleave.yml new file mode 100644 index 00000000..45b40e3c --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/cleave.yml @@ -0,0 +1,28 @@ +display-name: Cleave +description: "%placeholder%% chance to damage all entities around attacked entity" +placeholder: '5*%level%' +type: Normal + +targets: +- axes +conflicts: + - carve +rarity: common +max-level: 8 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_nearby_entities + args: + chance: "5*%level%" + damage: 2 + radius: "0.25*%level%" + entities: [ ] + damage_as_player: true + damage_self: false + triggers: + - melee_attack +conditions: [] From 60e219a35ded748fb5aa6a52fa6ce369e88ed9f8 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 20:42:18 +0200 Subject: [PATCH 19/23] fixed cleave and carve --- eco-core/core-plugin/src/main/resources/enchants/carve.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/cleave.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eco-core/core-plugin/src/main/resources/enchants/carve.yml b/eco-core/core-plugin/src/main/resources/enchants/carve.yml index 3bbc093f..963b1f4f 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/carve.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/carve.yml @@ -4,7 +4,7 @@ placeholder: '10*%level%' type: special targets: -- axes +- axe conflicts: - cleave rarity: special diff --git a/eco-core/core-plugin/src/main/resources/enchants/cleave.yml b/eco-core/core-plugin/src/main/resources/enchants/cleave.yml index 45b40e3c..dbc4c3cd 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/cleave.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/cleave.yml @@ -4,7 +4,7 @@ placeholder: '5*%level%' type: Normal targets: -- axes +- axe conflicts: - carve rarity: common From af551760211c24282bbcce8b5b0e67525d3e73a9 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 20:46:20 +0200 Subject: [PATCH 20/23] fixed cleave added confusion.yml --- .../src/main/resources/enchants/cleave.yml | 2 +- .../src/main/resources/enchants/confusion.yml | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/confusion.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/cleave.yml b/eco-core/core-plugin/src/main/resources/enchants/cleave.yml index dbc4c3cd..df94ead6 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/cleave.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/cleave.yml @@ -7,7 +7,7 @@ targets: - axe conflicts: - carve -rarity: common +rarity: rare max-level: 8 tradeable: true diff --git a/eco-core/core-plugin/src/main/resources/enchants/confusion.yml b/eco-core/core-plugin/src/main/resources/enchants/confusion.yml new file mode 100644 index 00000000..48cfad4b --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/confusion.yml @@ -0,0 +1,22 @@ +display-name: Confusion +description: "%placeholder%% chance to shuffle your opponents hotbar" +placeholder: '2*%level%' +type: Special + +targets: +- sword +conflicts: [] +rarity: special +max-level: 4 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: shuffle_hotbar + args: + chance: 2 * %level% + triggers: + - melee_attack +conditions: [] From ec2ace29d9daa75ed8bf7afb16ef6adbee5d6012 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 20:48:57 +0200 Subject: [PATCH 21/23] added corrosive.yml --- .../src/main/resources/enchants/corrosive.yml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/corrosive.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/corrosive.yml b/eco-core/core-plugin/src/main/resources/enchants/corrosive.yml new file mode 100644 index 00000000..2e115c59 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/corrosive.yml @@ -0,0 +1,23 @@ +display-name: Corrosive +description: Damages your opponents armor +placeholder: '%level%' +type: Normal + +targets: +- bow +- crossbow +conflicts: [] +rarity: legendary +max-level: 2 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_armor + args: + damage: "%level%" + triggers: + - melee_attack +conditions: [] From 7e6288c29038b84e0f5f67ab906ac6d6466b0376 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 20:51:18 +0200 Subject: [PATCH 22/23] added criticals.yml --- .../src/main/resources/enchants/criticals.yml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/criticals.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/criticals.yml b/eco-core/core-plugin/src/main/resources/enchants/criticals.yml new file mode 100644 index 00000000..1b22ef57 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/criticals.yml @@ -0,0 +1,23 @@ +display-name: Criticals +description: Increases critical damage by %placeholder% +placeholder: '10*%level%' +type: Normal + +targets: +- sword +- axe +conflicts: [] +rarity: epic +max-level: 3 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: crit_multiplier + args: + multiplier: 1 + 0.1*%level% + triggers: + - melee_attack +conditions: [] From ef4592dd6ee5c45cf0b82825c236399ea9915b46 Mon Sep 17 00:00:00 2001 From: Sedri05 Date: Tue, 30 Aug 2022 20:53:55 +0200 Subject: [PATCH 23/23] added cubism.yml --- .../src/main/resources/enchants/cubism.yml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 eco-core/core-plugin/src/main/resources/enchants/cubism.yml diff --git a/eco-core/core-plugin/src/main/resources/enchants/cubism.yml b/eco-core/core-plugin/src/main/resources/enchants/cubism.yml new file mode 100644 index 00000000..0795658d --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/cubism.yml @@ -0,0 +1,27 @@ +display-name: Cubism +description: Deal %placeholder%% more against slimes and magma cubes +placeholder: '5*%level%' +type: Normal + +targets: +- sword +- axe +conflicts: [] +rarity: rare +max-level: 7 + +tradeable: true +discoverable: true +enchantable: true + +effects: + - id: damage_multiplier + args: + multiplier: 1 + 0.05 * %level% + triggers: + - melee_attack + filters: + entities: + - slime + - magma_cube +conditions: []