diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml index b8f9858..6ee3458 100644 --- a/eco-core/core-plugin/src/main/resources/config.yml +++ b/eco-core/core-plugin/src/main/resources/config.yml @@ -4,7 +4,7 @@ # gui: - rows: 5 + rows: 6 mask: # The way the mask works is by having a list of materials @@ -20,23 +20,24 @@ gui: materials: - black_stained_glass_pane pattern: - - "111101111" - "111111111" - - "100000001" - - "100000001" - - "101000111" + - "101000001" + - "111000001" + - "101000001" + - "111111111" + - "111100011" job-area: top-left: - row: 3 - column: 2 + row: 2 + column: 4 bottom-right: row: 4 column: 8 job-info: - row: 1 - column: 5 + row: 2 + column: 2 no-active: name: "&cNo Active Job" @@ -89,28 +90,28 @@ gui: item: arrow name: "&fPrevious Page" location: - row: 5 - column: 4 + row: 6 + column: 5 next-page: item: arrow name: "&fNext Page" location: - row: 5 - column: 6 + row: 6 + column: 7 close: item: barrier name: "&cClose" location: - row: 5 - column: 5 + row: 6 + column: 6 deactivate-job: item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTRiZDlhNDViOTY4MWNlYTViMjhjNzBmNzVhNjk1NmIxZjU5NGZlYzg0MGI5NjA3Nzk4ZmIxZTcwNzc2NDQzMCJ9fX0= name: "&cDeactivate Job" location: - row: 5 + row: 4 column: 2 level-gui: diff --git a/eco-core/core-plugin/src/main/resources/jobs/_example.yml b/eco-core/core-plugin/src/main/resources/jobs/_example.yml index 5db2dd6..4c0a502 100644 --- a/eco-core/core-plugin/src/main/resources/jobs/_example.yml +++ b/eco-core/core-plugin/src/main/resources/jobs/_example.yml @@ -15,55 +15,55 @@ unlocked-by-default: true # The xp requirements for each job level - add new levels by adding more to this list level-xp-requirements: - - 50 - - 125 - - 200 + - 100 + - 120 + - 150 + - 180 + - 210 + - 250 - 300 - - 500 - - 750 + - 360 + - 430 + - 520 + - 620 + - 740 + - 890 - 1000 + - 1300 - 1500 - - 2000 - - 3500 - - 5000 - - 7500 - - 10000 - - 15000 - - 20000 - - 30000 + - 1900 + - 2200 + - 2700 + - 3200 + - 3800 + - 4600 + - 5500 + - 6600 + - 7900 + - 9500 + - 11500 + - 14000 + - 17000 + - 19000 + - 24000 + - 29000 + - 34000 + - 41000 - 50000 - - 75000 + - 60000 + - 70000 + - 85000 - 100000 - - 200000 + - 120000 + - 150000 + - 180000 + - 210000 + - 250000 - 300000 - - 400000 - - 500000 - - 600000 - - 700000 - - 800000 - - 900000 - - 1000000 - - 1100000 - - 1200000 - - 1300000 - - 1400000 - - 1500000 - - 1600000 - - 1700000 - - 1800000 - - 1900000 - - 2000000 - - 2100000 - - 2200000 - - 2300000 - - 2400000 - - 2500000 - - 2600000 - - 2750000 - - 2900000 - - 3100000 - - 3400000 - - 3700000 + - 360000 + - 440000 + - 580000 + - 750000 # An XP Gain method takes a trigger, a multiplier, conditions, and filters. # The multiplier takes the value produced by the trigger and multiplies it @@ -71,32 +71,41 @@ level-xp-requirements: xp-gain-methods: - trigger: mine_block multiplier: 0.5 - conditions: [ ] # You can add a list of conditions that must be met on xp gain - # filters: You can add filters that must be met by the trigger + conditions: [ ] + filters: + items: + - "*wooden_pickaxe" + - "*stone_pickaxe" + - "*iron_pickaxe" + - "*golden_pickaxe" + - "*diamond_pickaxe" + - "*netherite_pickaxe" # Custom placeholders to be used in descriptions, # Don't add % to the IDs, this is done automatically # The value takes a %level% placeholder and is a mathematical expression level-placeholders: - id: "money" - value: "%level% * 0.01" + value: "%level% * 0.4" + - id: "blocks" + value: "ceil(10 - %level% / 10)" # The text shown with the %effects% placeholder # The number dictates the minimum level for this text to show for # Adding new levels will override this text on those levels or above effects-description: 1: - - "&8» &8Earn &a$%money%&8 for each block mined" + - "&8» &8Earn &a$%money%&8 for each &a%blocks%&8 blocks mined" # Same as above, but for %rewards% rewards-description: 1: - - "&8» &8Earn &a$%money%&8 for each block mined" + - "&8» &8Earn &a$%money%&8 for each &a%blocks%&8 blocks mined" # Same as above, but for %level_up_messages% level-up-messages: 1: - - "&8» &8Earn &a$%money%&8 for each block mined" + - "&8» &8Earn &a$%money%&8 for each &a%blocks%&8 blocks mined" # Commands to be sent on levelup, can be formatted two ways: # level:command (e.g. 10:eco give %player% 1000), which would execute that command for level 10 @@ -107,8 +116,16 @@ level-commands: [ ] effects: - id: give_money args: - amount: "0.01 * %level%" - multiplier: "%level% * 0.01 + 1" + every: "ceil(10 - %level% / 10)" + amount: "0.4 * %level%" + filters: + items: + - "*wooden_pickaxe" + - "*stone_pickaxe" + - "*iron_pickaxe" + - "*golden_pickaxe" + - "*diamond_pickaxe" + - "*netherite_pickaxe" triggers: - mine_block diff --git a/eco-core/core-plugin/src/main/resources/jobs/builder.yml b/eco-core/core-plugin/src/main/resources/jobs/builder.yml new file mode 100644 index 0000000..2e23a4e --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/jobs/builder.yml @@ -0,0 +1,100 @@ +name: "τB00Builder" +description: "&8&oLevel up by placing blocks" + +unlocked-by-default: true + +level-xp-requirements: + - 100 + - 120 + - 150 + - 180 + - 210 + - 250 + - 300 + - 360 + - 430 + - 520 + - 620 + - 740 + - 890 + - 1000 + - 1300 + - 1500 + - 1900 + - 2200 + - 2700 + - 3200 + - 3800 + - 4600 + - 5500 + - 6600 + - 7900 + - 9500 + - 11500 + - 14000 + - 17000 + - 19000 + - 24000 + - 29000 + - 34000 + - 41000 + - 50000 + - 60000 + - 70000 + - 85000 + - 100000 + - 120000 + - 150000 + - 180000 + - 210000 + - 250000 + - 300000 + - 360000 + - 440000 + - 580000 + - 750000 + +xp-gain-methods: + - trigger: place_block + multiplier: 1.2 + conditions: [ ] + +level-placeholders: + - id: "money" + value: "%level% * 1.2" + - id: "blocks" + value: "ceil(12 - %level% / 8)" + +effects-description: + 1: + - "&8» &8Earn &a$%money%&8 for each &a%blocks%&8 blocks placed" + +rewards-description: + 1: + - "&8» &8Earn &a$%money%&8 for each &a%blocks%&8 blocks placed" + +level-up-messages: + 1: + - "&8» &8Earn &a$%money%&8 for each &a%blocks%&8 blocks placed" + +level-commands: [ ] + +effects: + - id: give_money + args: + every: "ceil(12 - %level% / 8)" + amount: "1.2 * %level%" + filters: + items: + - "*wooden_pickaxe" + - "*stone_pickaxe" + - "*iron_pickaxe" + - "*golden_pickaxe" + - "*diamond_pickaxe" + - "*netherite_pickaxe" + triggers: + - place_block + +conditions: [ ] + +icon: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZmM4ZWJhZDcyYjc3ZGYzOTkwZTA3YmM4NjlhOTlhOGY4OTYyZDNjMTljNzZlMzlkOTk1NTNjYWU0MTMxY2M4In19fQ== diff --git a/eco-core/core-plugin/src/main/resources/jobs/miner.yml b/eco-core/core-plugin/src/main/resources/jobs/miner.yml index d957e74..3bbca28 100644 --- a/eco-core/core-plugin/src/main/resources/jobs/miner.yml +++ b/eco-core/core-plugin/src/main/resources/jobs/miner.yml @@ -4,84 +4,102 @@ description: "&8&oLevel up by mining blocks" unlocked-by-default: true level-xp-requirements: - - 50 - - 125 - - 200 + - 100 + - 120 + - 150 + - 180 + - 210 + - 250 - 300 - - 500 - - 750 + - 360 + - 430 + - 520 + - 620 + - 740 + - 890 - 1000 + - 1300 - 1500 - - 2000 - - 3500 - - 5000 - - 7500 - - 10000 - - 15000 - - 20000 - - 30000 + - 1900 + - 2200 + - 2700 + - 3200 + - 3800 + - 4600 + - 5500 + - 6600 + - 7900 + - 9500 + - 11500 + - 14000 + - 17000 + - 19000 + - 24000 + - 29000 + - 34000 + - 41000 - 50000 - - 75000 + - 60000 + - 70000 + - 85000 - 100000 - - 200000 + - 120000 + - 150000 + - 180000 + - 210000 + - 250000 - 300000 - - 400000 - - 500000 - - 600000 - - 700000 - - 800000 - - 900000 - - 1000000 - - 1100000 - - 1200000 - - 1300000 - - 1400000 - - 1500000 - - 1600000 - - 1700000 - - 1800000 - - 1900000 - - 2000000 - - 2100000 - - 2200000 - - 2300000 - - 2400000 - - 2500000 - - 2600000 - - 2750000 - - 2900000 - - 3100000 - - 3400000 - - 3700000 + - 360000 + - 440000 + - 580000 + - 750000 xp-gain-methods: - trigger: mine_block multiplier: 0.5 conditions: [ ] + filters: + items: + - "*wooden_pickaxe" + - "*stone_pickaxe" + - "*iron_pickaxe" + - "*golden_pickaxe" + - "*diamond_pickaxe" + - "*netherite_pickaxe" level-placeholders: - id: "money" - value: "%level% * 0.01" + value: "%level% * 0.4" + - id: "blocks" + value: "ceil(10 - %level% / 10)" effects-description: 1: - - "&8» &8Earn &a$%money%&8 for each block mined" + - "&8» &8Earn &a$%money%&8 for each &a%blocks%&8 blocks mined" rewards-description: 1: - - "&8» &8Earn &a$%money%&8 for each block mined" + - "&8» &8Earn &a$%money%&8 for each &a%blocks%&8 blocks mined" level-up-messages: 1: - - "&8» &8Earn &a$%money%&8 for each block mined" + - "&8» &8Earn &a$%money%&8 for each &a%blocks%&8 blocks mined" level-commands: [ ] effects: - id: give_money args: - amount: "0.01 * %level%" - multiplier: "%level% * 0.01 + 1" + every: "ceil(10 - %level% / 10)" + amount: "0.4 * %level%" + filters: + items: + - "*wooden_pickaxe" + - "*stone_pickaxe" + - "*iron_pickaxe" + - "*golden_pickaxe" + - "*diamond_pickaxe" + - "*netherite_pickaxe" triggers: - mine_block diff --git a/gradle.properties b/gradle.properties index 6160d51..1c6bbdf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ #libreforge-updater #Sat Sep 10 10:51:51 BST 2022 -version=1.0.0 +version=1.-1.0 plugin-name=EcoJobs