From 85974f5d2ff7b0660dc30d7287e9eb256c875861 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Mon, 25 Mar 2019 14:27:13 -0400
Subject: [PATCH] added Settings in Getting Started, enable 3d torches

---
 patches/subgame/minetest.conf                |  6 ++++--
 patches/subgame/minetest.server-example.conf |  5 ++---
 webapp/install-mts.sh                        |  5 +++--
 webapp/views/pages/getting-started.ejs       | 12 ++++++++++++
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/patches/subgame/minetest.conf b/patches/subgame/minetest.conf
index fc98308..e1899d2 100644
--- a/patches/subgame/minetest.conf
+++ b/patches/subgame/minetest.conf
@@ -1,5 +1,7 @@
 
 # DON'T USE THIS -- instead, see:
-# * minetest.client-example.conf
+# * minetest.client-example.conf (the install script copies this to
+#   $HOME/minetest/minetest.conf)
+# * minetest.server-example.conf (the install script copies this to
+#   $HOME/minetest/games/ENLIVEN/minetest.conf)
 # * minetest.LAN-client-example.conf
-# * minetest.server-example.conf (should be installed by install scripts)
diff --git a/patches/subgame/minetest.server-example.conf b/patches/subgame/minetest.server-example.conf
index 1bc41e7..63b628c 100644
--- a/patches/subgame/minetest.server-example.conf
+++ b/patches/subgame/minetest.server-example.conf
@@ -44,7 +44,6 @@ enable_bones_chat_msg = true
 # DEPRECATED? see Bucket_Game/mods/codercore/fallback_spawn
 static_spawnpoint = 0, 11, 0
 
-# only in minetest.org releases:
+# only for minetest.org releases:
 disable_classic_sneak = true
-
-
+enable_3d_torches = true
diff --git a/webapp/install-mts.sh b/webapp/install-mts.sh
index 7c0838d..3c4a692 100755
--- a/webapp/install-mts.sh
+++ b/webapp/install-mts.sh
@@ -30,9 +30,10 @@ if [ -f "$flag_icon" ]; then
     extra_options="--client"
     enable_client=true
     echo "automatically adding --client to compile since detected"
-    echo "'$flag_icon'--press Ctrl C to cancel..."
+    echo "'$flag_icon'"
+    #echo "--press Ctrl C to cancel..."
+    #sleep 2
     flag_file="minetest/bin/minetest"
-    sleep 2
 fi
 #if [ -f "$flag_file" ]; then
     #rm -f "$flag_file"
diff --git a/webapp/views/pages/getting-started.ejs b/webapp/views/pages/getting-started.ejs
index 2866660..783418e 100644
--- a/webapp/views/pages/getting-started.ejs
+++ b/webapp/views/pages/getting-started.ejs
@@ -59,7 +59,19 @@ You must go below the maximum to get the material. Many materials also have a de
 </ul>
 <h2>Issues</h2>
 <b>Only if your server uses ENLIVEN</b>, report issues at <a href="https://github.com/poikilos/EnlivenMinetest/issues">github.com/poikilos/EnlivenMinetest/issues</a> and include a screenshot (F12 saves screenshot to the minetest/bin folder). You can often show what node the item is by pointing at it and turning on the debug screen with F5. Otherwise, report them to a moderator of your server (if you report it to a moderator first, the issue is likely to be resolved faster).
+<h2>Minetest Settings</h2>
+All of the settings below can be followed from the Minetest Settings tab (exit to menu if you are in-game, then click Settings).
+<h3>Brightness</h3>
+All Settings, Graphics, In-Game, Advanced, "Light Curve Mid Boost = 0.5" (default 0.2).
+(recommended when using Filmic Tone Mapping (In-game, Shaders, Tone
+Mapping, Filmic tone mapping), which makes dark areas almost black in
+caves where there is no moonlight. Caves are dark. Make torches.
+Changing your settings so you can mine in the dark is "cheaty." Doing
+things that are "cheaty" lead to an immature pointless game of getting
+more blocks than anyone else. Make a cool mine with cool torches.
 
+<h3>Screenshot Location &amp; Format</h3>
+All Settings, Graphics, Menus, then change "Screenshot folder" and "Screenshot format" if desired (recommended: make a Screenshots directory in your computer's Pictures folder and use that, and use jpg format to save space).
         </div>
     </div>
 </div>