From 54b5f9b6afd1a6d8f425273c236135ba6c3ed29f Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 5 Sep 2022 16:00:43 +0100 Subject: [PATCH] Improved enchantment description formatting --- eco-core/core-plugin/src/main/resources/enchants/_example.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/abattoir.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/abrasion.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/aerial.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/aquatic.yml | 2 +- .../core-plugin/src/main/resources/enchants/arcane_defence.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/ascend.yml | 2 +- .../core-plugin/src/main/resources/enchants/atmospheric.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/bladed.yml | 2 +- .../core-plugin/src/main/resources/enchants/blast_mining.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/bleed.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/blind.yml | 2 +- .../core-plugin/src/main/resources/enchants/block_breather.yml | 2 +- .../core-plugin/src/main/resources/enchants/boss_hunter.yml | 2 +- .../src/main/resources/enchants/breaklessness_curse.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/butchering.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/carve.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/charge.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/confusion.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/corrosive.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/cubism.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/defusion.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/dynamite.yml | 2 +- .../core-plugin/src/main/resources/enchants/first_strike.yml | 2 +- .../src/main/resources/enchants/harmlessness_curse.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/lifesteal.yml | 2 +- .../src/main/resources/enchants/misfortune_curse.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/quake.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/rapid.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/repairing.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/thor.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/thrive.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/wisdom.yml | 2 +- eco-core/core-plugin/src/main/resources/enchants/wound.yml | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eco-core/core-plugin/src/main/resources/enchants/_example.yml b/eco-core/core-plugin/src/main/resources/enchants/_example.yml index eb5bfbbd..8145efcb 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/_example.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/_example.yml @@ -5,7 +5,7 @@ # _example.yml is not loaded. display-name: "Example" # The name of the enchantment in-game -description: "Gives a &a%placeholder%%&8 and a &a+%damage%&8 bonus to damage" # The description of the enchantment +description: "Gives a &a%placeholder%%&r and a &a+%damage%&r bonus to damage" # The description of the enchantment placeholder: "%level% * 20" # The placeholder to show in the enchantment description (optional, can only use custom placeholders) placeholders: # Extra placeholders to show in the enchantment description (optional) damage: "%level% * 2" # Here, %damage% would be the extra placeholder to use 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 94214f5a..51cb42ea 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: "Tridents deal &a%placeholder%% &8more damage against passive mobs" +description: "Tridents deal &a%placeholder%% &rmore damage against passive mobs" placeholder: "30 * %level%" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/abrasion.yml b/eco-core/core-plugin/src/main/resources/enchants/abrasion.yml index 294cab9a..7b93c511 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/abrasion.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/abrasion.yml @@ -1,5 +1,5 @@ display-name: "Abrasion" -description: "Deals &a%placeholder% &8damage to your opponents armor" +description: "Deals &a%placeholder% &rdamage to your opponents armor" placeholder: "%level%" type: normal 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 859fe01c..cbd339c3 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/aerial.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/aerial.yml @@ -1,5 +1,5 @@ display-name: "Aerial" -description: "Deal &a%placeholder%% &8more arrow damage when you are in air" +description: "Deal &a%placeholder%% &rmore arrow damage when you are in air" placeholder: "10 * %level%" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/aquatic.yml b/eco-core/core-plugin/src/main/resources/enchants/aquatic.yml index 39a265a4..6fa2b0df 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/aquatic.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/aquatic.yml @@ -1,5 +1,5 @@ display-name: "Aquatic" -description: "Trident deals &a%placeholder%% &8additional damage when shot from water" +description: "Trident deals &a%placeholder%% &radditional damage when shot from water" placeholder: "5 * %level%" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/arcane_defence.yml b/eco-core/core-plugin/src/main/resources/enchants/arcane_defence.yml index cb7829f9..dc4fc312 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/arcane_defence.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/arcane_defence.yml @@ -1,5 +1,5 @@ display-name: "Arcane Defence" -description: "&a%placeholder%% &8chance to ignore potion damage" +description: "&a%placeholder%% &rchance to ignore potion damage" placeholder: "%level% * 4" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/ascend.yml b/eco-core/core-plugin/src/main/resources/enchants/ascend.yml index a5582176..2d69d37e 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/ascend.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/ascend.yml @@ -1,5 +1,5 @@ display-name: "Ascend" -description: "Levitates you in the air for &a%placeholder%&8 seconds" +description: "Levitates you in the air for &a%placeholder%&r seconds" placeholder: "%level% / 4" type: spell 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 ad62d1a0..73767725 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/atmospheric.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/atmospheric.yml @@ -1,5 +1,5 @@ display-name: "Atmospheric" -description: "Deal &a%placeholder%% &8more trident damage when you are in air" +description: "Deal &a%placeholder%% &rmore trident damage when you are in air" placeholder: "10 * %level%" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/bladed.yml b/eco-core/core-plugin/src/main/resources/enchants/bladed.yml index 2abbcaee..a32d8854 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/bladed.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/bladed.yml @@ -1,5 +1,5 @@ display-name: "Bladed" -description: "Trident deals &a%placeholder%% &8more damage" +description: "Trident deals &a%placeholder%% &rmore damage" placeholder: "0.5 * %level%" type: special 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 4210a68c..acf529bb 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 @@ -1,5 +1,5 @@ display-name: "Blast Mining" -description: "&a%placeholder%% &8chance to mine blocks in a 3x3 area" +description: "&a%placeholder%% &rchance to mine blocks in a 3x3 area" placeholder: "5 * %level%" type: special diff --git a/eco-core/core-plugin/src/main/resources/enchants/bleed.yml b/eco-core/core-plugin/src/main/resources/enchants/bleed.yml index 767eabe1..3a2f0421 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/bleed.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/bleed.yml @@ -1,5 +1,5 @@ display-name: "Bleed" -description: "&a%placeholder%% &8chance to cause your opponent to bleed, damaging them repeatedly" +description: "&a%placeholder%% &rchance to cause your opponent to bleed, damaging them repeatedly" placeholder: "1.5 * %level%" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/blind.yml b/eco-core/core-plugin/src/main/resources/enchants/blind.yml index 017dbb94..4c7a6c71 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/blind.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/blind.yml @@ -1,5 +1,5 @@ display-name: "Blind" -description: "&a%placeholder%% &8chance of blinding your opponent" +description: "&a%placeholder%% &rchance of blinding your opponent" placeholder: "%level%" type: normal 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 index 559d2a7c..4f6b8a72 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/block_breather.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/block_breather.yml @@ -1,5 +1,5 @@ display-name: "Block Breather" -description: "&a%placeholder%% &8chance to ignore suffocation damage" +description: "&a%placeholder%% &rchance to ignore suffocation damage" placeholder: "%level% * 15" type: normal 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 c778fcba..0d14c907 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,5 +1,5 @@ display-name: "Boss Hunter" -description: "Deal &a%placeholder%% &8more damage against bosses" +description: "Deal &a%placeholder%% &rmore damage against bosses" placeholder: "10 * %level%" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/breaklessness_curse.yml b/eco-core/core-plugin/src/main/resources/enchants/breaklessness_curse.yml index 8c5da2e4..70251185 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/breaklessness_curse.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/breaklessness_curse.yml @@ -1,5 +1,5 @@ display-name: "Curse of Breaklessness" -description: "Gives a &a%placeholder%%&8 chance to fail to break blocks" +description: "Gives a &a%placeholder%%&r chance to fail to break blocks" placeholder: "15 * %level%" type: curse diff --git a/eco-core/core-plugin/src/main/resources/enchants/butchering.yml b/eco-core/core-plugin/src/main/resources/enchants/butchering.yml index 4c34c499..e3324427 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/butchering.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/butchering.yml @@ -1,5 +1,5 @@ display-name: "Butchering" -description: "Deal &a%placeholder%% &8more damage against passive mobs" +description: "Deal &a%placeholder%% &rmore damage against passive mobs" placeholder: "25 * %level%" type: normal 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 8a2830c7..55b71904 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/carve.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/carve.yml @@ -1,5 +1,5 @@ display-name: "Carve" -description: "Give &a%damage%&8 damage to entities within &a%radius%&8 blocks when you swing" +description: "Give &a%damage%&r damage to entities within &a%radius%&r blocks when you swing" placeholders: radius: "1 + %level%" damage: "%level% * 2" diff --git a/eco-core/core-plugin/src/main/resources/enchants/charge.yml b/eco-core/core-plugin/src/main/resources/enchants/charge.yml index 8a913c31..ce9c0b5b 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/charge.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/charge.yml @@ -1,5 +1,5 @@ display-name: "Charge" -description: "Launches you forwards at &a%placeholder%x&8 speed" +description: "Launches you forwards at &a%placeholder%x&r speed" placeholder: "5 * %level%" type: spell diff --git a/eco-core/core-plugin/src/main/resources/enchants/confusion.yml b/eco-core/core-plugin/src/main/resources/enchants/confusion.yml index 07c6604c..d5b19f02 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/confusion.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/confusion.yml @@ -1,5 +1,5 @@ display-name: "Confusion" -description: "&a%placeholder%% &8chance to shuffle your opponents hotbar" +description: "&a%placeholder%% &rchance to shuffle your opponents hotbar" placeholder: "2 * %level%" type: Special diff --git a/eco-core/core-plugin/src/main/resources/enchants/corrosive.yml b/eco-core/core-plugin/src/main/resources/enchants/corrosive.yml index 6e2b64ce..4940dd6b 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/corrosive.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/corrosive.yml @@ -1,5 +1,5 @@ display-name: "Corrosive" -description: "Deals &a%placeholder% &8damage to your opponents armor" +description: "Deals &a%placeholder% &rdamage to your opponents armor" placeholder: "%level%" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/cubism.yml b/eco-core/core-plugin/src/main/resources/enchants/cubism.yml index 6e796b33..7ebcb3ef 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/cubism.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/cubism.yml @@ -1,5 +1,5 @@ display-name: "Cubism" -description: "Deal &a%placeholder%% &8more against slimes and magma cubes" +description: "Deal &a%placeholder%% &rmore against slimes and magma cubes" placeholder: "5 * %level%" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/defusion.yml b/eco-core/core-plugin/src/main/resources/enchants/defusion.yml index c20fffb5..2c8551af 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/defusion.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/defusion.yml @@ -1,5 +1,5 @@ display-name: "Defusion" -description: "&8Deal &a%placeholder%% &8more damage against creepers" +description: "&rDeal &a%placeholder%% &rmore damage against creepers" placeholder: "%level% * 10" type: Normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/dynamite.yml b/eco-core/core-plugin/src/main/resources/enchants/dynamite.yml index 5f57a310..31fa16bb 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/dynamite.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/dynamite.yml @@ -1,5 +1,5 @@ display-name: "Dynamite" -description: "Mines blocks in a &a%placeholder%x%placeholder%&8 area" +description: "Mines blocks in a &a%placeholder%x%placeholder%&r area" placeholder: "1 + %level% * 4" type: spell diff --git a/eco-core/core-plugin/src/main/resources/enchants/first_strike.yml b/eco-core/core-plugin/src/main/resources/enchants/first_strike.yml index cf82246a..e782c543 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/first_strike.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/first_strike.yml @@ -1,5 +1,5 @@ display-name: "First Strike" -description: "Deal &a%placeholder%% &8more damage against victims on max health" +description: "Deal &a%placeholder%% &rmore damage against victims on max health" placeholder: "30 + 20 * %level%" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/harmlessness_curse.yml b/eco-core/core-plugin/src/main/resources/enchants/harmlessness_curse.yml index 4efd4d4a..0030e115 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/harmlessness_curse.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/harmlessness_curse.yml @@ -1,5 +1,5 @@ display-name: "Curse of Harmlessness" -description: "Gives a &a%placeholder%% &8chance for attacks to do nothing" +description: "Gives a &a%placeholder%% &rchance for attacks to do nothing" placeholder: "15 * %level%" type: curse diff --git a/eco-core/core-plugin/src/main/resources/enchants/lifesteal.yml b/eco-core/core-plugin/src/main/resources/enchants/lifesteal.yml index 8fc0600b..8da4e192 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/lifesteal.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/lifesteal.yml @@ -1,5 +1,5 @@ display-name: "Lifesteal" -description: "Heals &a%placeholder%%&8 of damage dealt" +description: "Heals &a%placeholder%%&r of damage dealt" placeholder: "%placeholder% * 10" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/misfortune_curse.yml b/eco-core/core-plugin/src/main/resources/enchants/misfortune_curse.yml index 64b7f1df..6270ae76 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/misfortune_curse.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/misfortune_curse.yml @@ -1,5 +1,5 @@ display-name: "Curse of Misfortune" -description: "Gives a &a%placeholder%% &8chance for blocks to not drop items" +description: "Gives a &a%placeholder%% &rchance for blocks to not drop items" placeholder: "15 * %level%" type: curse diff --git a/eco-core/core-plugin/src/main/resources/enchants/quake.yml b/eco-core/core-plugin/src/main/resources/enchants/quake.yml index 3f90cc4c..a622312d 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/quake.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/quake.yml @@ -1,5 +1,5 @@ display-name: "Quake" -description: "Gives &a%damage%&8 damage to all entities in a radius of &a%radius%&8 blocks" +description: "Gives &a%damage%&r damage to all entities in a radius of &a%radius%&r blocks" placeholders: radius: "2 + %level%" damage: "3 * %level%" diff --git a/eco-core/core-plugin/src/main/resources/enchants/rapid.yml b/eco-core/core-plugin/src/main/resources/enchants/rapid.yml index 0b6e7a83..5b023b03 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/rapid.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/rapid.yml @@ -1,5 +1,5 @@ display-name: "Rapid" -description: "Lets you shoot full speed arrows with the bow at &a%placeholder%%&8 tension" +description: "Lets you shoot full speed arrows with the bow at &a%placeholder%%&r tension" placeholder: "1 - (15 * %level%)" type: normal diff --git a/eco-core/core-plugin/src/main/resources/enchants/repairing.yml b/eco-core/core-plugin/src/main/resources/enchants/repairing.yml index ec61a822..ef59cd98 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/repairing.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/repairing.yml @@ -1,5 +1,5 @@ display-name: "Repairing" -description: "Automatically gain &a%amount%&8 durability every &a%frequency% &8seconds" +description: "Automatically gain &a%amount%&r durability every &a%frequency% &rseconds" type: special placeholders: frequency: "1.5" diff --git a/eco-core/core-plugin/src/main/resources/enchants/thor.yml b/eco-core/core-plugin/src/main/resources/enchants/thor.yml index 64223fc2..5f78679b 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/thor.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/thor.yml @@ -1,5 +1,5 @@ display-name: "Thor" -description: "Gives a &a%chance%%&8 chance to strike &a%bolts%&8 lightning bolts on your opponent" +description: "Gives a &a%chance%%&r chance to strike &a%bolts%&r lightning bolts on your opponent" placeholders: chance: "%level% * 1" bolts: "ceil(%level% / 2)" diff --git a/eco-core/core-plugin/src/main/resources/enchants/thrive.yml b/eco-core/core-plugin/src/main/resources/enchants/thrive.yml index ba979df8..f201d723 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/thrive.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/thrive.yml @@ -1,5 +1,5 @@ display-name: "Thrive" -description: "Gives &a%placeholder%&8 bonus health" +description: "Gives &a%placeholder%&r bonus health" placeholder: "%level% * 2" type: normal 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 7840958d..7a572829 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/wisdom.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/wisdom.yml @@ -1,5 +1,5 @@ display-name: "Wisdom" -description: "&8Increases dropped experience by &a%placeholder%%" +description: "&rIncreases dropped experience by &a%placeholder%%" placeholder: "100 + %level% * 20" type: normal 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 9650b562..ed19aa90 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/wound.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/wound.yml @@ -1,5 +1,5 @@ display-name: "Wound" -description: "Gives a &a%chance%%&8 chance to give your opponent &a%damage% &8damage for &a%duration%&8 seconds" +description: "Gives a &a%chance%%&r chance to give your opponent &a%damage% &rdamage for &a%duration%&r seconds" placeholders: chance: "%level% * 3" duration: "0.75 * (%level% + 2)"