diff --git a/Chroma-Chat/config.yml b/Chroma-Chat/config.yml index 26ee8a8..228d209 100644 --- a/Chroma-Chat/config.yml +++ b/Chroma-Chat/config.yml @@ -17,6 +17,8 @@ components: - DarkGray uh-oh: - Yellow + tmp: + - Gold the_shire: - DarkAqua liria: diff --git a/Chroma-Discord/config.yml b/Chroma-Discord/config.yml index dbc5a94..a1f4d6d 100644 --- a/Chroma-Discord/config.yml +++ b/Chroma-Discord/config.yml @@ -2,7 +2,7 @@ global: mainServer: 125813020357165056 commandChannel: 209720707188260864 prefix: '|' - inviteLink: '' + inviteLink: https://discord.gg/gxmTS8N modRole: Moderator serverup: true components: diff --git a/Jobs/actionBarBossbar.yml b/Jobs/actionBarBossbar.yml index 5fe4376..e2e0824 100644 --- a/Jobs/actionBarBossbar.yml +++ b/Jobs/actionBarBossbar.yml @@ -8,6 +8,7 @@ bossBar: xPoonSlayer_69x: true Deoplo: true VanillaVela: true + NorbiPeti: true Alisolarflare: true PrincessFox: true thewindmillman: true @@ -22,6 +23,7 @@ bossBar: Mr_Byzantine: true actionBar: TaffySwordsman: true + jedipadwan: true TheShyPig: true jarrxth: true AtlanticMercyyy: true diff --git a/Server/server.properties b/Server/server.properties index c2549d4..2edd670 100644 --- a/Server/server.properties +++ b/Server/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Sun Nov 10 18:34:01 UTC 2019 +#Thu Dec 05 12:01:13 UTC 2019 spawn-protection=16 max-tick-time=60000 query.port=25565 diff --git a/Towny/settings/TownyConfig.patch b/Towny/settings/TownyConfig.patch index 80e7600..63d462b 100644 --- a/Towny/settings/TownyConfig.patch +++ b/Towny/settings/TownyConfig.patch @@ -2,8 +2,9 @@ diff --git b/Towny/settings/config.yml a/Towny/settings/config.yml index c0302a9..4eb15c1 100644 --- b/Towny/settings/config.yml +++ a/Towny/settings/config.yml -@@ -32,72 +32,72 @@ levels: +@@ -32,81 +32,81 @@ levels: mayorPrefix: 'Spirit ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' - townBlockLimit: 1 @@ -14,6 +15,7 @@ index c0302a9..4eb15c1 100644 - numResidents: 1 namePostfix: ' (Settlement)' mayorPrefix: 'Hermit ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' - townBlockLimit: 16 @@ -24,6 +26,7 @@ index c0302a9..4eb15c1 100644 - numResidents: 2 namePostfix: ' (Hamlet)' mayorPrefix: 'Chief ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' - townBlockLimit: 32 @@ -34,6 +37,7 @@ index c0302a9..4eb15c1 100644 - numResidents: 6 namePostfix: ' (Village)' mayorPrefix: 'Baron Von ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' - townBlockLimit: 96 @@ -44,6 +48,7 @@ index c0302a9..4eb15c1 100644 - numResidents: 10 namePostfix: ' (Town)' mayorPrefix: 'Viscount ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' - townBlockLimit: 160 @@ -54,6 +59,7 @@ index c0302a9..4eb15c1 100644 - numResidents: 14 namePostfix: ' (Large Town)' mayorPrefix: 'Count Von ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' - townBlockLimit: 224 @@ -64,6 +70,7 @@ index c0302a9..4eb15c1 100644 - numResidents: 20 namePostfix: ' (City)' mayorPrefix: 'Earl ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' - townBlockLimit: 320 @@ -74,6 +81,7 @@ index c0302a9..4eb15c1 100644 - numResidents: 24 namePostfix: ' (Large City)' mayorPrefix: 'Duke ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' - townBlockLimit: 384 @@ -84,6 +92,7 @@ index c0302a9..4eb15c1 100644 - numResidents: 28 namePostfix: ' (Metropolis)' mayorPrefix: 'Lord ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' - townBlockLimit: 448 @@ -180,12 +189,14 @@ index c0302a9..4eb15c1 100644 ############################################################ # +------------------------------------------------------+ # -@@ -201,24 +201,24 @@ town: +@@ -201,26 +201,26 @@ town: # Do not forget to set the default_tax to more than 0 or new towns will still begin with a tax of zero. minimumtax: '0.0' # Limits the maximum amount of bonus blocks a town can buy. - max_purchased_blocks: '0' + max_purchased_blocks: '2147483647' + # When set to true, the town_level section of the config determines the maximum number of bonus blocks a town can purchase. + max_purchased_blocks_uses_town_levels: 'true' # maximum number of plots any single resident can own - max_plots_per_resident: '100' + max_plots_per_resident: '400' @@ -258,7 +269,7 @@ index c0302a9..4eb15c1 100644 # When set to true outposts can be limited by the townOutpostLimit value of the Town Levels and # the nationBonusOutpostLimit value in the Nation Levels. In this way nations can be made to be # the only way of receiving outposts, or as an incentive to receive more outposts. Towns which are -@@ -375,13 +375,13 @@ global_town_settings: +@@ -375,19 +375,19 @@ global_town_settings: # when there is a war or peace. allow_town_spawn_travel_ally: 'true' # When set to true both nation and ally spawn travel will also require the target town to have their status set to public. @@ -267,6 +278,12 @@ index c0302a9..4eb15c1 100644 # If non zero it delays any spawn request by x seconds. - teleport_warmup_time: '0' + teleport_warmup_time: '60' + # Number of seconds that must pass before a player can use /t spawn or /res spawn. + spawn_cooldown_time: '30' + # Number of seconds that must pass before pvp can be toggled by a town. + # Applies to residents of the town using /res toggle pvp, as well as + # plots having their PVP toggled using /plot toggle pvp. + pvp_cooldown_time: '30' # Respawn the player at his town spawn point when he/she dies town_respawn: 'false' # Town respawn only happens when the player dies in the same world as the town's spawn point. @@ -355,15 +372,6 @@ index c0302a9..4eb15c1 100644 #If true jailed players can use Ender Pearls but are still barred from using other methods of teleporting. jail_allows_ender_pearls: 'false' #If false jailed players can use /town leave, and escape a jail. -@@ -1027,7 +1027,7 @@ war: - #This setting allows you disable the ability for a nation to pay to remain neutral during a war. - nation_can_be_neutral: 'true' - #By setting this to true, nations will receive a prompt for alliances and alliances will show on both nations. -- disallow_one_way_alliance: 'false' -+ disallow_one_way_alliance: 'true' - - - ############################################################ @@ -1044,7 +1044,7 @@ war: defended_attack: '10' # Defending town pays attaking flagbearer. If a negative (attacker pays defending town), diff --git a/Towny/settings/applyPatch.sh b/Towny/settings/applyPatch.sh index d282721..32d8bb6 100644 --- a/Towny/settings/applyPatch.sh +++ b/Towny/settings/applyPatch.sh @@ -1,2 +1,2 @@ -git apply -v -C 0 --reject TownyConfig.patch +git apply -v -C 0 --reject TownyConfig2.patch diff --git a/Towny/settings/config.yml b/Towny/settings/config.yml old mode 100644 new mode 100755 index 67749ee..07dc3ab --- a/Towny/settings/config.yml +++ b/Towny/settings/config.yml @@ -1,8 +1,8 @@ version: # This is the current version of Towny. Please do not edit. - version: 0.95.0.0 + version: 0.95.2.0 # This is for showing the changelog on updates. Please do not edit. - last_run_version: 0.95.0.0 + last_run_version: 0.95.2.0 # The language file you wish to use language: english.yml @@ -15,7 +15,7 @@ language: english.yml # Possible permission nodes # # for a full list of permission nodes visit: -# http://palmergames.com/towny/towny-permission-nodes/ +# https://github.com/TownyAdvanced/Towny/wiki/Towny-Permission-Nodes permissions: '' ############################################################ @@ -30,6 +30,7 @@ levels: - numResidents: 0 namePostfix: ' Ruins' mayorPrefix: 'Spirit ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' townBlockLimit: 4 @@ -38,6 +39,7 @@ levels: - numResidents: 1 namePostfix: ' (Settlement)' mayorPrefix: 'Hermit ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' townBlockLimit: 64 @@ -46,6 +48,7 @@ levels: - numResidents: 2 namePostfix: ' (Hamlet)' mayorPrefix: 'Chief ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' townBlockLimit: 128 @@ -54,6 +57,7 @@ levels: - numResidents: 6 namePostfix: ' (Village)' mayorPrefix: 'Baron Von ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' townBlockLimit: 384 @@ -62,6 +66,7 @@ levels: - numResidents: 10 namePostfix: ' (Town)' mayorPrefix: 'Viscount ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' townBlockLimit: 640 @@ -70,6 +75,7 @@ levels: - numResidents: 14 namePostfix: ' (Large Town)' mayorPrefix: 'Count Von ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' townBlockLimit: 896 @@ -78,6 +84,7 @@ levels: - numResidents: 20 namePostfix: ' (City)' mayorPrefix: 'Earl ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' townBlockLimit: 4280 @@ -86,6 +93,7 @@ levels: - numResidents: 24 namePostfix: ' (Large City)' mayorPrefix: 'Duke ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' townBlockLimit: 4536 @@ -94,6 +102,7 @@ levels: - numResidents: 28 namePostfix: ' (Metropolis)' mayorPrefix: 'Lord ' + townBlockBuyBonusLimit: 0 namePrefix: '' mayorPostfix: '' townBlockLimit: 4792 @@ -201,7 +210,10 @@ town: # Do not forget to set the default_tax to more than 0 or new towns will still begin with a tax of zero. minimumtax: '0.0' # Limits the maximum amount of bonus blocks a town can buy. + # This setting does nothing when town.max_purchased_blocks_uses_town_levels is set to true. max_purchased_blocks: '2147483647' + # When set to true, the town_level section of the config determines the maximum number of bonus blocks a town can purchase. + max_purchased_blocks_uses_town_levels: 'true' # maximum number of plots any single resident can own max_plots_per_resident: '400' # maximum number used in /town claim/unclaim # commands. @@ -259,6 +271,8 @@ new_world_settings: world_pvp: 'true' # force_pvp_on is a global flag and overrides any towns flag setting force_pvp_on: 'false' + # If set to false the world will not be included in war events. + war_allowed: 'true' mobs: # world_monsters_on is a global flag setting per world. @@ -378,6 +392,12 @@ global_town_settings: is_nation_ally_spawning_requiring_public_status: 'true' # If non zero it delays any spawn request by x seconds. teleport_warmup_time: '60' + # Number of seconds that must pass before a player can use /t spawn or /res spawn. + spawn_cooldown_time: '30' + # Number of seconds that must pass before pvp can be toggled by a town. + # Applies to residents of the town using /res toggle pvp, as well as + # plots having their PVP toggled using /plot toggle pvp. + pvp_cooldown_time: '30' # Respawn the player at his town spawn point when he/she dies town_respawn: 'false' # Town respawn only happens when the player dies in the same world as the town's spawn point. @@ -403,7 +423,7 @@ global_town_settings: # List of blocks which can be modified on farm plots, as long as player is also allowed in the plot's '/plot perm' line. # Not included by default but some servers add GRASS_BLOCK,FARMLAND,DIRT to their list. farm_plot_allow_blocks: BAMBOO,BAMBOO_SAPLING,JUNGLE_LOG,JUNGLE_SAPLING,JUNGLE_LEAVES,OAK_LOG,OAK_SAPLING,OAK_LEAVES,BIRCH_LOG,BIRCH_SAPLING,BIRCH_LEAVES,ACACIA_LOG,ACACIA_SAPLING,ACACIA_LEAVES,DARK_OAK_LOG,DARK_OAK_SAPLING,DARK_OAK_LEAVES,SPRUCE_LOG,SPRUCE_SAPLING,SPRUCE_LEAVES,BEETROOTS,COCOA,CHORUS_PLANT,CHORUS_FLOWER,SWEET_BERRY_BUSH,KELP,SEAGRASS,TALL_SEAGRASS,GRASS,TALL_GRASS,FERN,LARGE_FERN,CARROTS,WHEAT,POTATOES,PUMPKIN,PUMPKIN_STEM,ATTACHED_PUMPKIN_STEM,NETHER_WART,COCOA,VINE,MELON,MELON_STEM,ATTACHED_MELON_STEM,SUGAR_CANE,CACTUS,ALLIUM,AZURE_BLUET,BLUE_ORCHID,CORNFLOWER,DANDELION,LILAC,LILY_OF_THE_VALLEY,ORANGE_TULIP,OXEYE_DAISY,PEONY,PINK_TULIP,POPPY,RED_TULIP,ROSE_BUSH,SUNFLOWER,WHITE_TULIP,WITHER_ROSE - # List of animals which can be kiled on farm plots by town residents. + # List of animals which can be killed on farm plots by town residents. farm_animals: PIG,COW,CHICKEN,SHEEP,MOOSHROOM # The maximum number of residents that can be joined to a town. Setting to 0 disables this feature. max_residents_per_town: '0' @@ -426,6 +446,10 @@ global_town_settings: # Maximum amount that a town can set their plot, embassy, shop, etc plots' prices to. # Setting this higher can be dangerous if you use Towny in a mysql database. Large numbers can become shortened to scientific notation. maximum_plot_price_cost: '1000000.0' + # If set to true, the /town screen will display the xyz coordinate for a town's spawn rather than the homeblock's Towny coords. + display_xyz_instead_of_towny_coords: 'false' + # If set to true the /town list command will list randomly, rather than by whichever comparator is used, hiding resident counts. + display_town_list_randomly: 'false' ############################################################ @@ -456,6 +480,10 @@ global_nation_settings: # When set to true, nation zones are disabled during the the Towny war types. war_disables: 'true' + + # When set to true, players will receive a notification when they enter into a nationzone. + # Set to false by default because, like the nationzone feature, it will generate more load on servers. + show_notifications: 'false' # If Towny should show players the nationboard when they login. display_board_onlogin: 'true' # If enabled, only allow the nation spawn to be set in the capital city. @@ -569,15 +597,16 @@ filters_colour_chat: name_filter_regex: '[ /]' name_check_regex: ^[a-zA-Z0-9._\[\]-]*$ string_check_regex: ^[a-zA-Z0-9 \s._\[\]\#\?\!\@\$\%\^\&\*\-\,\*\(\)\{\}]*$ - name_remove_regex: '[^a-zA-Z0-9._\[\]-]' + name_remove_regex: '[^a-zA-Z0-9\&._\[\]-]' modify_chat: # Maximum length of Town and Nation names. max_name_length: '20' # Maximum length of titles and surnames. max_title_length: '10' - # See How Towny Works wikipage for list of PAPI placeholders. - # https://github.com/TownyAdvanced/Towny/wiki/How-Towny-Works + + # See the Placeholders wiki page for list of PAPI placeholders. + # https://github.com/TownyAdvanced/Towny/wiki/Placeholders papi_chat_formatting: # When using PlaceholderAPI, and a tag would show both nation and town, this will determine how they are formatted. both: '&f[&6%n&f|&b%t&f] ' @@ -616,7 +645,7 @@ protection: # Items which can be blocked or enabled via town/plot flags # 25 - noteblock # 54 - chest ...etc - switch_ids: JUKEBOX,NOTE_BLOCK,BEACON,CHEST,TRAPPED_CHEST,FURNACE,DISPENSER,HOPPER,DROPPER,LEVER,COMPARATOR,REPEATER,STONE_PRESSURE_PLATE,ACACIA_PRESSURE_PLATE,BIRCH_PRESSURE_PLATE,DARK_OAK_PRESSURE_PLATE,JUNGLE_PRESSURE_PLATE,OAK_PRESSURE_PLATE,SPRUCE_PRESSURE_PLATE,HEAVY_WEIGHTED_PRESSURE_PLATE,LIGHT_WEIGHTED_PRESSURE_PLATE,STONE_BUTTON,ACACIA_BUTTON,BIRCH_BUTTON,DARK_OAK_BUTTON,JUNGLE_BUTTON,OAK_BUTTON,SPRUCE_BUTTON,ACACIA_DOOR,BIRCH_DOOR,DARK_OAK_DOOR,JUNGLE_DOOR,OAK_DOOR,SPRUCE_DOOR,ACACIA_FENCE_GATE,BIRCH_FENCE_GATE,DARK_OAK_FENCE_GATE,OAK_FENCE_GATE,JUNGLE_FENCE_GATE,SPRUCE_FENCE_GATE,ACACIA_TRAPDOOR,BIRCH_TRAPDOOR,DARK_OAK_TRAPDOOR,JUNGLE_TRAPDOOR,OAK_TRAPDOOR,SPRUCE_TRAPDOOR,MINECART,COMMAND_BLOCK_MINECART,CHEST_MINECART,FURNACE_MINECART,HOPPER_MINECART,TNT_MINECART,SHULKER_BOX,WHITE_SHULKER_BOX,ORANGE_SHULKER_BOX,MAGENTA_SHULKER_BOX,LIGHT_BLUE_SHULKER_BOX,LIGHT_GRAY_SHULKER_BOX,YELLOW_SHULKER_BOX,LIME_SHULKER_BOX,PINK_SHULKER_BOX,GRAY_SHULKER_BOX,CYAN_SHULKER_BOX,PURPLE_SHULKER_BOX,BLUE_SHULKER_BOX,BROWN_SHULKER_BOX,GREEN_SHULKER_BOX,RED_SHULKER_BOX,BLACK_SHULKER_BOX,CARROT_STICK,DAYLIGHT_DETECTOR,STONECUTTER,SMITHING_TABLE,FLETCHING_TABLE,SMOKER,LOOM,LECTERN,GRINDSTONE,COMPOSTER,CARTOGRAPHY_TABLE,BLAST_FURNACE,BELL,BARREL,DRAGON_EGG,ITEM_FRAME,POTTED_ACACIA_SAPLING,POTTED_ALLIUM,POTTED_AZURE_BLUET,POTTED_BAMBOO,POTTED_BIRCH_SAPLING,POTTED_BLUE_ORCHID,POTTED_BROWN_MUSHROOM,POTTED_CACTUS,POTTED_CORNFLOWER,POTTED_DANDELION,POTTED_DARK_OAK_SAPLING,POTTED_DEAD_BUSH,POTTED_FERN,POTTED_JUNGLE_SAPLING,POTTED_LILY_OF_THE_VALLEY,POTTED_OAK_SAPLING,POTTED_ORANGE_TULIP,POTTED_OXEYE_DAISY,POTTED_PINK_TULIP,POTTED_POPPY,POTTED_RED_MUSHROOM,POTTED_RED_TULIP,POTTED_SPRUCE_SAPLING,POTTED_WHITE_TULIP,POTTED_WITHER_ROSE,BARREL + switch_ids: JUKEBOX,NOTE_BLOCK,BEACON,CHEST,TRAPPED_CHEST,FURNACE,DISPENSER,HOPPER,DROPPER,LEVER,COMPARATOR,REPEATER,STONE_PRESSURE_PLATE,ACACIA_PRESSURE_PLATE,BIRCH_PRESSURE_PLATE,DARK_OAK_PRESSURE_PLATE,JUNGLE_PRESSURE_PLATE,OAK_PRESSURE_PLATE,SPRUCE_PRESSURE_PLATE,HEAVY_WEIGHTED_PRESSURE_PLATE,LIGHT_WEIGHTED_PRESSURE_PLATE,STONE_BUTTON,ACACIA_BUTTON,BIRCH_BUTTON,DARK_OAK_BUTTON,JUNGLE_BUTTON,OAK_BUTTON,SPRUCE_BUTTON,ACACIA_DOOR,BIRCH_DOOR,DARK_OAK_DOOR,JUNGLE_DOOR,OAK_DOOR,SPRUCE_DOOR,ACACIA_FENCE_GATE,BIRCH_FENCE_GATE,DARK_OAK_FENCE_GATE,OAK_FENCE_GATE,JUNGLE_FENCE_GATE,SPRUCE_FENCE_GATE,ACACIA_TRAPDOOR,BIRCH_TRAPDOOR,DARK_OAK_TRAPDOOR,JUNGLE_TRAPDOOR,OAK_TRAPDOOR,SPRUCE_TRAPDOOR,MINECART,COMMAND_BLOCK_MINECART,CHEST_MINECART,FURNACE_MINECART,HOPPER_MINECART,TNT_MINECART,SHULKER_BOX,WHITE_SHULKER_BOX,ORANGE_SHULKER_BOX,MAGENTA_SHULKER_BOX,LIGHT_BLUE_SHULKER_BOX,LIGHT_GRAY_SHULKER_BOX,YELLOW_SHULKER_BOX,LIME_SHULKER_BOX,PINK_SHULKER_BOX,GRAY_SHULKER_BOX,CYAN_SHULKER_BOX,PURPLE_SHULKER_BOX,BLUE_SHULKER_BOX,BROWN_SHULKER_BOX,GREEN_SHULKER_BOX,RED_SHULKER_BOX,BLACK_SHULKER_BOX,CARROT_STICK,DAYLIGHT_DETECTOR,STONECUTTER,SMITHING_TABLE,FLETCHING_TABLE,SMOKER,LOOM,LECTERN,GRINDSTONE,COMPOSTER,CARTOGRAPHY_TABLE,BLAST_FURNACE,BELL,BARREL,DRAGON_EGG,ITEM_FRAME,POTTED_ACACIA_SAPLING,POTTED_ALLIUM,POTTED_AZURE_BLUET,POTTED_BAMBOO,POTTED_BIRCH_SAPLING,POTTED_BLUE_ORCHID,POTTED_BROWN_MUSHROOM,POTTED_CACTUS,POTTED_CORNFLOWER,POTTED_DANDELION,POTTED_DARK_OAK_SAPLING,POTTED_DEAD_BUSH,POTTED_FERN,POTTED_JUNGLE_SAPLING,POTTED_LILY_OF_THE_VALLEY,POTTED_OAK_SAPLING,POTTED_ORANGE_TULIP,POTTED_OXEYE_DAISY,POTTED_PINK_TULIP,POTTED_POPPY,POTTED_RED_MUSHROOM,POTTED_RED_TULIP,POTTED_SPRUCE_SAPLING,POTTED_WHITE_TULIP,POTTED_WITHER_ROSE,BARREL,BREWING_STAND # permitted entities https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/entity/LivingEntity.html # Animals, Chicken, Cow, Creature, Creeper, Flying, Ghast, Giant, Monster, Pig, @@ -758,6 +787,11 @@ default_perm_flags: destroy: 'true' item_use: 'true' switch: 'true' + town: + build: 'false' + destroy: 'false' + item_use: 'false' + switch: 'false' ally: build: 'false' destroy: 'false' @@ -789,6 +823,11 @@ default_perm_flags: destroy: 'true' item_use: 'true' switch: 'true' + nation: + build: 'false' + destroy: 'false' + item_use: 'false' + switch: 'false' ally: build: 'false' destroy: 'false' @@ -840,6 +879,9 @@ invite_system: town: '10' # How many requests can one nation have from other nations for an alliance. nation: '10' + # When set above 0, the maximum distance a player can be from a town's spawn in order to receive an invite. + # Use this setting to require players to be near or inside a town before they can be invited. + maximum_distance_from_town_spawn: '0' ############################################################ @@ -915,7 +957,7 @@ economy: # How much every additionally claimed townblock increases in cost. Set to 1 to deactivate this. 1.3 means +30% to every bonus claim block cost. price_claim_townblock_increase: '1.0' # The amount refunded to a town when they unclaim a townblock. - # Warning: do not set this higher than the cose to claim a townblock. + # Warning: do not set this higher than the cost to claim a townblock. # It is advised that you do not set this to the same price as claiming either, otherwise towns will get around using outposts to claim far away. price_claim_townblock_refund: '0.0' # How much it costs a player to buy extra blocks. @@ -943,13 +985,13 @@ economy: # Maximum amount of money allowed in town bank # Use 0 for no limit town_bank_cap: '0.0' - # Set to true to allow withdrawls from town banks - town_allow_withdrawls: 'true' + # Set to true to allow withdrawals from town banks + town_allow_withdrawals: 'true' # Maximum amount of money allowed in nation bank # Use 0 for no limit nation_bank_cap: '0.0' - # Set to true to allow withdrawls from nation banks - nation_allow_withdrawls: 'true' + # Set to true to allow withdrawals from nation banks + nation_allow_withdrawals: 'true' # When set to true, players can only use their town withdraw/deposit commands while inside of their own town. # Likewise, nation banks can only be withdrawn/deposited to while in the capital city. disallow_bank_actions_outside_town: 'false' @@ -988,6 +1030,8 @@ economy: town_plotbased_upkeep: 'true' # If set to true, the plot-based-upkeep system will be modified by the Town Levels' upkeep modifiers. town_plotbased_upkeep_affected_by_town_level_modifier: 'true' + # If set to any amount over zero, if a town's plot-based upkeep totals less than this value, the town will pay the minimum instead. + town_plotbased_upkeep_minimum_amount: '0.0' # The server's daily charge on a town which has claimed more townblocks than it is allowed. price_town_overclaimed_upkeep_penalty: '0.0' # Uses total number of plots that the town is overclaimed by, to determine the price_town_overclaimed_upkeep_penalty cost. @@ -998,6 +1042,24 @@ economy: # will be shared out between the plot owners. use_plot_payments: 'false' + plot_type_costs: + # Cost to use /plot set shop to change a normal plot to a shop plot. + set_commercial: '0.0' + # Cost to use /plot set arena to change a normal plot to a arena plot. + set_arena: '0.0' + # Cost to use /plot set embassy to change a normal plot to a embassy plot. + set_embassy: '0.0' + # Cost to use /plot set wilds to change a normal plot to a wilds plot. + set_wilds: '0.0' + # Cost to use /plot set inn to change a normal plot to a inn plot. + set_inn: '0.0' + # Cost to use /plot set jail to change a normal plot to a jail plot. + set_jail: '0.0' + # Cost to use /plot set farm to change a normal plot to a farm plot. + set_farm: '0.0' + # Cost to use /plot set bank to change a normal plot to a bank plot. + set_bank: '0.0' + ############################################################ # +------------------------------------------------------+ # @@ -1020,8 +1082,12 @@ jail: bail: #If true players can pay a bail amount to be unjailed. is_allowing_bail: 'false' - #Amount that bail costs. + #Amount that bail costs for normal residents/nomads. bail_amount: '10' + #Amount that bail costs for Town mayors. + bail_amount_mayor: '10' + #Amount that bail costs for Nation kings. + bail_amount_king: '10' # Commands which a jailed player cannot use. blacklisted_commands: home,spawn,teleport,tp,tpa,tphere,tpahere,back,dback,ptp,jump,kill,warp,suicide @@ -1126,6 +1192,9 @@ war: # If set to true when a town drops an enemy townblock's HP to 0, the attacking town gains a bonus townblock, # and the losing town gains a negative (-1) bonus townblock. costs_townblocks: 'false' + # If set to true when a town drops an enemy townblock's HP to 0, the attacking town takes full control of the townblock. + # One available (bonus) claim is given to the victorious town, one available (bonus) claim is removed from the losing town. + winner_takes_ownership_of_townblocks: 'false' points: points_townblock: '1' @@ -1138,10 +1207,12 @@ war: ############################################################ # +------------------------------------------------------+ # - # | Flag war settings | # + # | Flag War Settings | # # | | # - # | Separate from Event War | # - # | Unsupported / Buggy | # + # | [Separate from Event War] | # + # | -------------------------------- | # + # | DEPRECATED: Minimally Supported Through | # + # | 3rd Party Contributions Only | # # +------------------------------------------------------+ # ############################################################ @@ -1156,9 +1227,12 @@ war: min_players_online_in_nation: '3' max_active_flags_per_player: '1' flag: + # This setting modifies the time between a war flag's Material shift. Accepts `s`(seconds) and `m`(minutes). + # Currently, you would multiply this times 10 to get the total time a flag should be in play. + # (It can also be set to `h` and `d` - but ain't nobody got time fo' that.) waiting_time: 1m # This is the block a player must place to trigger the attack event. - base_block: fence + base_block: oak_fence # This is the block a player must place to trigger the attack event. light_block: torch beacon: @@ -1171,6 +1245,18 @@ war: max: '64' draw: 'true' wireframe_block: glowstone + # While true, prevent players from performing certain actions while their town + # has an active enemy war flag placed. + prevent_interaction_while_flagged: 'true' + # While true, prevent players from performing certain actions while a town in their nation + # has an active enemy war flag placed. + prevent_nation_interaction_while_flagged: 'true' + # This is how much time that must pass after a town in a nation has been flagged + # before certain actions can be performed, measured in milliseconds. + time_to_wait_after_flagged: '600000' + # If set to true, when a war flag finishes it's countdown successfully, the attacking town takes full control of the townblock. + # Setting this to 'False' will result only in monetary exchanges. + flag_takes_ownership_of_townblocks: 'true' ############################################################ # +------------------------------------------------------+ # # | Warzone Block Permissions | # @@ -1180,11 +1266,11 @@ war: ############################################################ warzone: - # List of materaials that can be modified in a warzone. + # List of materials that can be modified in a warzone. # '*' = Allow all materials. # Prepend a '-' in front of a material to remove it. Used in conjunction with when you use '*'. # Eg: '*,-chest,-furnace' - editable_materials: tnt,fence,ladder,wood_door,iron_door,fire + editable_materials: tnt,oak_fence,birch_fence,spruce_fence,jungle_fence,dark_oak_fence,acacia_fence,ladder,oak_door,birch_door,spruce_door,jungle_door,dark_oak_door,acacia_fence,iron_door,fire item_use: 'true' switch: 'true' # Add '-fire' to editable materials for complete protection when setting is false. This prevents fire to be created and spread.