Fix spawn of trees from moretrees and nalc_moretrees

.dir-locals.el

@@ -3,8 +3,12 @@
 
 ((lua-mode
   (fill-column . 80)
-  (tab-width . 3)
+  (tab-width . 4)
+  (indent-tabs-mode . t)))
+
+((sh-mode
+	(fill-column . 80)
+	(tab-width . 4)
 	(indent-tabs-mode . t)))
 
 
-

install.sh

@@ -34,7 +34,10 @@ usage() {
 	echo -e "\t-w --world <name> Custom world name."
 	echo -e "\t-P --port <port> Custom server port number."
 	echo -e "\t--url <URL> Custom remote URL."
-    echo -e "\t--branch <stable|dev|exp> Choose the version to install (stable by default)"
+	echo -e "\t--branch <stable|dev> Choose the version to install (stable by default)"
+	echo
+	echo "Notes:"
+	echo -e "\tThis install script should be able to upgrade a current nalc-sever installation."
 	echo
 	echo "License: GPLv3. Please read the LICENSE file."
 	echo "Author: Sys4 - https://sys4.fr#contact"
@@ -114,9 +117,6 @@ install_game() {
 			"dev")
 				git_branch="-b dev"
 				;;
-	    "exp")
-		git_branch="-b experimental"
-		;;
 		esac
 		[ -z "$git_branch" ] && error "Invalid branch"
 
@@ -161,9 +161,6 @@ install_mods() {
 			"dev")
 				git_branch="-b dev"
 				;;
-	    "exp")
-		git_branch="-b experimental"
-		;;
 		esac
 		[ -z $git_branch ] && error "Invalid branch"
 
@@ -416,9 +413,9 @@ action() {
 	echo "Installation summary:"
 	echo -e "\t- Server files will be downloaded from $URL"
 	echo -e "\t- NALC server will be installed to $DESTINATION."
+	echo -e "\t- The $MINETEST_DIR directory will be used."
 	echo -e "\t- World of NALC will be installed to $MINETEST_DIR/worlds/$WORLD_NAME"
 	echo -e "\t- The minetestserver executable $MINETEST_BIN will be used."
-    echo -e "\t- The $MINETEST_DIR directory will be used."
 	echo -e "\t- $MAP_BACKEND will be used as map backend."
 	echo -e "\t- $PLAYER_BACKEND will be used as player backend."
 	echo -e "\t- $AUTH_BACKEND will be used as auth backend."

minetest-dev.conf

@@ -14,7 +14,7 @@ strict_protocol_version_checking = true
 enable_damage = true
 disallow_empty_password = true
 server_dedicated = true
-ipv6_server = true
+ipv6_server = false
 # 1 day-night cycle lasts 24 minutes instead of 20.
 time_speed = 30
 # Slightly higher player limit by default.
@@ -22,7 +22,7 @@ max_users = 12
 max_names_per_ip = 2
 # Give basics privileges to new players.
 default_privs = home, spawn
-basic_privs = areas, areas_high_limit, baker, ban, bring, diglocks, faction_admin, faction_user, fast, fly, fp_create, interact, inv, kick, megabuilder, nether, notice, openlocks, password, protection_bypass, rollback, shop, shout, sign_editor, teleport, warp_admin, warp_user, whois, worldedit
+basic_privs = areas, areas_high_limit, baker, ban, bring, diglocks, fast, fly, fp_create, interact, inv, kick, megabuilder, nether, notice, openlocks, password, protection_bypass, rollback, shop, shout, sign_editor, teleport, warp_admin, warp_user, whois, worldedit
 # If true, actions are recorded for rollback
 enable_rollback_recording = false
 # Activate fire
@@ -138,6 +138,10 @@ log_mods = true
 ##############
 craftguide_progressive_mode = true
 
+# playerfactions #
+##################
+player_factions.mode_unique_faction = false
+
 # moremesecons #
 ################
 moremesecons_jammer.enable_lbm = true
@@ -149,11 +153,14 @@ moremesecons_sayer.use_speech_dispatcher = false
 #initial_stuff = "default:axe_wood 1,default:torch 10,default:sapling 2,default:apple 5"
 # AREAS MOD
 areas.self_protection = true
+areas.use_smallest_area_precedence = true
 # MOBS
 remove_far_mobs = true
 mobs_spawn_protected = true
 mob_difficulty = 1.5
 mob_chance_multiplier = 1
+mobs_can_hear_node = true
+mobs_animal.eat_grass_block = true
 # MOBS custom spawn chance and number
 #mobs_animal:bee = 9000,2
 #mobs_animal:bunny = 15000,2
@@ -331,8 +338,12 @@ mines_deep_min = -64
 mines_deep_max = -13800 # default -380
 mines_spawnfactor = 1.5
 
-#h2omes
+# h2omes
 h2omes.time_home = 60
 h2omes.time_spawn = 150
 h2omes.time_from_player = 150
 h2omes.time_to_player = 150
+
+# spears
+spears_throw_speed = 13
+spears_drag_coeff = 0.1

start.sh.example

@@ -27,9 +27,9 @@ fi
 #        echo "Server restarted at "`date` >>$MOREDEBUG
 #        echo "----------------------" >>$MOREDEBUG
 
-        echo "0" >/tmp/players_c.txt
+echo "0" >/tmp/players_c.txt
 
-        "$MINETEST_BIN" \
+"$MINETEST_BIN" \
 	--world "$MINETEST_DIR/worlds/$WORLD_NAME/" \
 	--config "$MINETEST_DIR/minetest.conf" \
 	--gameid nalc_game \

upgrade.sh

@@ -84,7 +84,7 @@ regen_worldmt() {
 	# Recréation des liens symboliques des mods dans le dossier minetest
 	# et générer une ligne "load_mod_<mod> = true ou false" pour chaque mod
 	# et l'ajouter au fichier
-#    local mods_path=$serverpath/nalc-server-mods
+	#    local mods_path=$serverpath/nalc-server-mods
 	local mods="$MINETEST_DIR/mods"
 	local mods_custom="$serverpath/custom/mods"
 
@@ -209,7 +209,6 @@ update_world() {
 action() {
 	[ ! -d "$serverpath" ] && error "$serverpath not found"
 	. "$serverpath/nalc.conf"
-    [[ $BRANCH == "exp" ]] && BRANCH="experimental"
 
 	if [ $UP_MODS -eq 1 ]; then
 		echo "Updating $MINETEST_DIR/mods…"

world/moretrees_settings-dev.txt

@@ -2,27 +2,15 @@
 
 -- Enable the various kinds of trees.
 
-moretrees.enable_apple_tree		= false
-moretrees.enable_oak			= false
-moretrees.enable_sequoia		= false
-moretrees.enable_palm			= false
-moretrees.enable_date_palm		= false
-moretrees.enable_cedar			= false
-moretrees.enable_rubber_tree	= false
-moretrees.enable_willow			= false
-moretrees.enable_birch			= false
-moretrees.enable_spruce			= false
-moretrees.enable_jungle_tree	= false
-moretrees.enable_fir			= false
-moretrees.enable_poplar			= false
-moretrees.enable_beech			= false
+moretrees.spawn_enabled = false
+moretrees.grow_legacy_saplings = true
 
 -- set this to true to make moretrees spawn saplings at mapgen time instead
 -- of fully-grown trees, which will grow into full trees after a very short
 -- delay.  This reduces mapgen lag in some situations, and fixes situations
 -- where the mapgen conflicts with the tree generator.
 
-moretrees.spawn_saplings		= true
+moretrees.spawn_saplings		= false
 
 -- Set this to true to allow defining stairs/slabs/etc.  If Moreblocks is
 -- installed, this will use that mod's Stairs Plus component.  Otherwise, it

world/news-dev.txt

@@ -2,7 +2,34 @@
 
   Pour voir le détail d'une révision, se rendre sur https://sys4.fr/gitea puis aller dans le dépôt nalc-server-mods de l'organisation nalc. Dans la vue des révisions vous pouvez chercher la description d'une révision dont le numéro se trouve dans le tableaux des révisions ci-dessous :
 
-===] 1.6.1/1.6.0/master/dev [===
+===] dev [===
+
+* Revision| Date    | Description
+—————————————————————————————————————————
+* e9a6991 | 29/3/25 | [moretrees] Allows to disable saplings spawn
+* 51cef35 | 23/3/25 | Add craftguide again
+* 5335389 | 23/3/25 | Add nalc_dyes mod to fix dyes crafting #123
+* a343352 | 23/3/25 | Replace factions mod by playerfactions mod
+* 337430f | 21/3/25 | [mobs_monster] add sand variation in sand monster drops, same with dirt monster
+* 29a01ad | 21/3/25 | Rename lighting_monoids to lighting_monoid
+* 7d9d1d1 | 21/3/25 | Add lighting_monoids mod
+* 3288334 | 20/3/25 | Mods update
+* a888b81 | 19/9/24 | [areas] Fix startup crash
+* 211bb82 | 15/9/24 | Add fakelib module as submodule
+* 41af8b1 | 15/9/24 | Add xcompat mod as submodule
+* 51f6256 | 15/9/24 | Change URL of regional_weather submodule
+* 34ec80c | 15/9/24 | Mods update
+* 5b1807b | 13/12/23| [unifiedbricks] Fix missing textures
+* c92191e | 13/12/23| Mods update
+* 9b8eedd | 26/11/23| [moreplants] Fix blueflower biome spawn
+* ef549a8 | 26/11/23| [plantfife_modpack] Fix startup crash
+* dfcb790 | 26/11/23| [unifiedbricks] Fix missing dependency to moreblocks
+* e61ef53 | 25/11/23| Mods update
+* 8998ddf | 11/6/23 | Mods update
+* 912d2c6 | 10/6/23 | [snow] Fix skins mod support detection
+* 6a64c32 | 9/6/23  | Remove craftguide and mods update
+
+===] 1.6.1/1.6.0/master [===
 
 * Révision| Date    | Description
 —————————————————————————————————————————