diff --git a/eco-core/core-plugin/src/main/resources/effects/dazzle.yml b/eco-core/core-plugin/src/main/resources/effects/dazzle.yml index 0fa8802..c9e1847 100644 --- a/eco-core/core-plugin/src/main/resources/effects/dazzle.yml +++ b/eco-core/core-plugin/src/main/resources/effects/dazzle.yml @@ -12,6 +12,6 @@ effects: level: 3 duration: "18 + %level% * 2" triggers: - - mine_block + - melee_attack conditions: [ ] diff --git a/eco-core/core-plugin/src/main/resources/effects/spelunking.yml b/eco-core/core-plugin/src/main/resources/effects/spelunking.yml index 495a5d9..b94db96 100644 --- a/eco-core/core-plugin/src/main/resources/effects/spelunking.yml +++ b/eco-core/core-plugin/src/main/resources/effects/spelunking.yml @@ -21,8 +21,8 @@ effects: - "gold_ore" - "deepslate_gold_ore" - "gilded_blackstone" - - "lapis_lazuli_ore" - - "deepslate_lapis_lazuli_ore" + - "lapis_ore" + - "deepslate_lapis_ore" - "redstone_ore" - "deepslate_redstone_ore" - "emerald_ore" @@ -48,8 +48,8 @@ effects: - "gold_ore" - "deepslate_gold_ore" - "gilded_blackstone" - - "lapis_lazuli_ore" - - "deepslate_lapis_lazuli_ore" + - "lapis_ore" + - "deepslate_lapis_ore" - "redstone_ore" - "deepslate_redstone_ore" - "emerald_ore" diff --git a/eco-core/core-plugin/src/main/resources/skills/_example.yml b/eco-core/core-plugin/src/main/resources/skills/_example.yml index 2cedbea..1639781 100644 --- a/eco-core/core-plugin/src/main/resources/skills/_example.yml +++ b/eco-core/core-plugin/src/main/resources/skills/_example.yml @@ -107,6 +107,7 @@ xp-requirements: # levels: 1 # start-level: 10 # end-level: 20 +# every: 2 rewards: - reward: defense @@ -130,11 +131,20 @@ rewards: # Effects to run when an item levels up # %level% is the level the item leveled up to. # If you want to restrict this to certain levels, you can use -# require: %level% == 20, or require: %level% < 50, etc. +# require: %level% = 20, or require: %level% < 50, etc. +# If you want this to run every x levels, you can use +# every: level-up-effects: - id: give_money args: amount: 1000 * %level% + require: "%level% > 50" + + - id: give_money + args: + amount: 3000 * %level% + every: 2 + require: "%level% >= 50" # Custom placeholders to be used in descriptions, diff --git a/eco-core/core-plugin/src/main/resources/skills/armory.yml b/eco-core/core-plugin/src/main/resources/skills/armory.yml index 384e9b0..c27052d 100644 --- a/eco-core/core-plugin/src/main/resources/skills/armory.yml +++ b/eco-core/core-plugin/src/main/resources/skills/armory.yml @@ -122,6 +122,7 @@ xp-gain-methods: not_damage_cause: - KILL - SUICIDE + - CONTACT # Conditions that must be met to gain XP. While you can add conditions to xp # gain methods, if you have many this can be annoying, so this is global. diff --git a/eco-core/core-plugin/src/main/resources/skills/farming.yml b/eco-core/core-plugin/src/main/resources/skills/farming.yml index 6a94376..bc812cf 100644 --- a/eco-core/core-plugin/src/main/resources/skills/farming.yml +++ b/eco-core/core-plugin/src/main/resources/skills/farming.yml @@ -163,7 +163,7 @@ xp-gain-methods: fully_grown: true blocks: - potatoes - - beetroot + - beetroots # Conditions that must be met to gain XP. While you can add conditions to xp # gain methods, if you have many this can be annoying, so this is global. diff --git a/eco-core/core-plugin/src/main/resources/skills/woodcutting.yml b/eco-core/core-plugin/src/main/resources/skills/woodcutting.yml index cf15fc9..d9661f2 100644 --- a/eco-core/core-plugin/src/main/resources/skills/woodcutting.yml +++ b/eco-core/core-plugin/src/main/resources/skills/woodcutting.yml @@ -112,12 +112,16 @@ xp-gain-methods: - jungle_log - acacia_log - dark_oak_log + - mangrove_log + - cherry_log - oak_wood - birch_wood - spruce_wood - jungle_wood - acacia_wood - dark_oak_wood + - mangrove_wood + - chery_wood - trigger: mine_block multiplier: 14