From 90283664076f2f399d7351cc36838c1d9b788e12 Mon Sep 17 00:00:00 2001 From: Rogier Date: Fri, 1 Jul 2016 11:11:45 +0200 Subject: [PATCH] fixup! Add date palm Some textual improvements --- date_palm.lua | 4 ++-- default_settings.txt | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/date_palm.lua b/date_palm.lua index 6d00b3b..0c40b72 100644 --- a/date_palm.lua +++ b/date_palm.lua @@ -285,11 +285,11 @@ end local function dates_print_search_stats(log) local stats if sect_search_stats.count > 0 then - stats = string.format("Male date tree searching stats: count: %d/%d: average: %d µs (%d..%d)", + stats = string.format("Male date tree searching stats: searches: %d/%d: average: %d µs (%d..%d)", sect_search_stats.count, sect_search_stats.count + sect_search_stats.skip, sect_search_stats.sum/sect_search_stats.count, sect_search_stats.min, sect_search_stats.max) else - stats = string.format("Male date tree searching stats: (not yet available)") + stats = string.format("Male date tree searching stats: searches: 0/0: average: (no searches yet)") end if log then minetest.log("action", "[moretrees] " .. stats) diff --git a/default_settings.txt b/default_settings.txt index 862ab7f..0a5fc88 100644 --- a/default_settings.txt +++ b/default_settings.txt @@ -79,7 +79,7 @@ moretrees.coconut_item_drop_ichance = 10 -- inverse probability of ripe coconu -- - Dates grow only when pollinated: -- - Set dates_regrow_pollinated to true -- - Set dates_regrow_unpollinated_percent to 0 --- - Disable pollination: +-- - Dates grow without pollination. Pollination disabled: -- - Set dates_regrow_pollinated to false -- - Set dates_regrow_unpollinated_percent to some larger positive value, e.g. 95 -- - Dates grow, but more and faster if male flowers are nearby @@ -87,6 +87,13 @@ moretrees.coconut_item_drop_ichance = 10 -- inverse probability of ripe coconu -- - Set dates_regrow_unpollinated_percent to some small positive value, e.g. 33 -- - Optional but recommended: Reduce the pollination distance, e.g. to 30 +-- Note that it should not be necessary to disable pollination for performance +-- reasons. A lot of effort has gone into ensuring that date growing will not cause lag. +-- +-- If lag is suspected, use the chat command '/dates_stats' to obtain the male dates +-- search time, as well as the counts of total number of searches requested and the +-- number of searches actually performed. + moretrees.dates_regrow_pollinated = true -- Enable pollination. If enabled, male trees are required for dates to grow. -- If disabled, dates_regrow_unpollinated_percent must be non-zero for dates to regrow. moretrees.dates_regrow_unpollinated_percent = 0 -- Percentage of female dates becoming dates without being pollinated. @@ -98,7 +105,7 @@ moretrees.dates_female_percent = 57 -- Ratio of female to male trees - tune th -- So 57% is optimal for small groups of trees. As larger groups have more female palms anyway, a -- less than optimal proportion of female to male trees is not a problem. moretrees.dates_pollination_distance = 120 -moretrees.dates_blossom_search_time_treshold = 1000 -- If average male blossom search time exceeds this, start limiting the search load. +moretrees.dates_blossom_search_time_treshold = 1000 -- If average male blossom search time (in microseconds) exceeds this, start limiting the search load. moretrees.dates_blossom_search_iload = 10 -- Inverse fraction of CPU time that male blossom searching search may consume. -- As searching a large area (radius: dates_pollination_distance/3 per attempt) can cause lag, -- this limits the search frequency server-wide so that the impact on server lag is minimised