diff --git a/install-ENLIVEN.sh b/install-ENLIVEN.sh index 9e72927..d06ff48 100755 --- a/install-ENLIVEN.sh +++ b/install-ENLIVEN.sh @@ -216,12 +216,16 @@ sudo cp -Rf $MT_MINETEST_GAME_PATH/* "$MT_MYGAME_DIR/" #sudo su - #WRITEABLE_MINETEST_CONF=$USR_SHARE_MINETEST/games/$MT_MYGAME_NAME/minetest.conf WRITEABLE_MINETEST_CONF=$HOME/minetest.conf +#rm -f "$HOME/minetest.conf" rm -f "$HOME/minetest.conf" if [ ! -f "$USR_SHARE_MINETEST/games/$MT_MYGAME_NAME/minetest.conf" ]; then sudo cp "$USR_SHARE_MINETEST/games/$mtgame_name/minetest.conf" "$USR_SHARE_MINETEST/games/$MT_MYGAME_NAME/minetest.conf.1st" fi -cp "$USR_SHARE_MINETEST/games/$mtgame_name/minetest.conf" "$WRITEABLE_MINETEST_CONF" -touch "$WRITEABLE_MINETEST_CONF" +if [ -f "$USR_SHARE_MINETEST/games/$mtgame_name/minetest.conf" ]; then + cp -f "$USR_SHARE_MINETEST/games/$mtgame_name/minetest.conf" "$WRITEABLE_MINETEST_CONF" +else + touch "$WRITEABLE_MINETEST_CONF" +fi #4080 since boundaries in chunkymap/singleimage.py (to be compatible with approximate browser max image size) are -4096 to 4096 echo "map_generation_limit = 4096" >> "$WRITEABLE_MINETEST_CONF" #NOTE: map_generation_limit (aka world boundary, world border, or world limit) must be divisible by 64, so for example, 5000 results in invisible wall at 4928 @@ -257,6 +261,7 @@ echo "sprint_stamina_drain = .5" >> "$WRITEABLE_MINETEST_CONF" # default is 2 echo "bones_position_message = true" >> "$WRITEABLE_MINETEST_CONF" # default is false--this is for client-side chat message (server-side logging always on though) #no longer needed since these mods check for player_api to determine whether v3 model is used: +#TODO: below must go in the one in the subgame folder! if [ "$version_0_5_enable" = "true" ]; then # echo "player_model_version = default_character_v3" >> "$WRITEABLE_MINETEST_CONF" # formerly used by playeranim echo "playeranim.model_version = MTG_4_Nov_2017" >> "$WRITEABLE_MINETEST_CONF" # used by playeranim @@ -272,7 +277,7 @@ else echo "1..." sleep 1 fi -sudo mv -f $HOME/minetest.conf "$USR_SHARE_MINETEST/games/$MT_MYGAME_NAME/minetest.conf" +sudo mv -f $WRITEABLE_MINETEST_CONF "$USR_SHARE_MINETEST/games/$MT_MYGAME_NAME/minetest.conf" if [ -f "$MT_MYGAME_DIR/game.conf.1st" ]; then echo "Already backed up $MT_MYGAME_DIR/game.conf to $MT_MYGAME_DIR/game.conf.1st" diff --git a/minetest.conf.server b/minetest.conf.server index e73c2c0..742bc0d 100644 --- a/minetest.conf.server +++ b/minetest.conf.server @@ -23,10 +23,12 @@ hudbars_bar_type = statbar_modern sprint_speed = 2.25 sprint_jump = 1.25 sprint_stamina_drain = .5 -player_model_version = default_character_v3 +#player_model_version = default_character_v3 +#playeranim.model_version = MTG_4_Jun_2017 +playeranim.model_version = MTG_4_Nov_2017 -#not all settings can be changed in this minetest.conf (see -#minetest.conf.example in THIS folder) some settings can only be changed +#not all settings can be changed in this minetest.conf (see +#minetest.conf.example in THIS folder) some settings can only be changed #in client's local copy of minetest.conf (see login scripts on network) enable_bones_logging = true enable_bones_chat_msg = true