From 6db576b78784ff403c423cf520339a1247e35b9c Mon Sep 17 00:00:00 2001
From: KaadmY <kaadmy@gmail.com>
Date: Mon, 15 May 2017 15:45:40 -0700
Subject: [PATCH] Make give_initial mod a bit cleaner and simpler

---
 minetest.conf                                 |  5 +++--
 .../README.txt                                |  2 +-
 .../depends.txt                               |  1 +
 mods/give_initial/init.lua                    | 21 +++++++++++++++++++
 mods/give_initial_stuff/init.lua              | 19 -----------------
 settingtypes.txt                              |  7 +++++--
 6 files changed, 31 insertions(+), 24 deletions(-)
 rename mods/{give_initial_stuff => give_initial}/README.txt (75%)
 rename mods/{give_initial_stuff => give_initial}/depends.txt (61%)
 create mode 100644 mods/give_initial/init.lua
 delete mode 100644 mods/give_initial_stuff/init.lua

diff --git a/minetest.conf b/minetest.conf
index 2568948..8f54202 100644
--- a/minetest.conf
+++ b/minetest.conf
@@ -29,9 +29,10 @@ default_privs = fast, interact, player_skin, shout, spawn, zoom
 
 welcome_enable = true
 
-# If you're given the inital stuff; a stone pick and 10 torches
+# If you're given the inital stuff
 
-give_initial_stuff = false
+give_initial_enable = false
+give_initial_items = default:pick_stone,default:torch_weak 10
 
 # If players with interact can use the /fixlight chat command
 
diff --git a/mods/give_initial_stuff/README.txt b/mods/give_initial/README.txt
similarity index 75%
rename from mods/give_initial_stuff/README.txt
rename to mods/give_initial/README.txt
index 2542874..2dd9922 100644
--- a/mods/give_initial_stuff/README.txt
+++ b/mods/give_initial/README.txt
@@ -1,5 +1,5 @@
 Give initial stuff mod
 ======================
-By Kaadmy
+By Kaadmy, for Pixture
 
 Source license: LGPLv2.1
diff --git a/mods/give_initial_stuff/depends.txt b/mods/give_initial/depends.txt
similarity index 61%
rename from mods/give_initial_stuff/depends.txt
rename to mods/give_initial/depends.txt
index 4ad96d5..b7cc57f 100644
--- a/mods/give_initial_stuff/depends.txt
+++ b/mods/give_initial/depends.txt
@@ -1 +1,2 @@
 default
+util
diff --git a/mods/give_initial/init.lua b/mods/give_initial/init.lua
new file mode 100644
index 0000000..058020b
--- /dev/null
+++ b/mods/give_initial/init.lua
@@ -0,0 +1,21 @@
+--
+-- Gives initial stuff
+-- By Kaadmy, for Pixture
+--
+
+local give_initial_enable = minetest.setting_getbool("give_initial_enable")
+local give_initial_items = util.split(minetest.setting_get("give_initial_items"), ",")
+
+local function on_newplayer(player)
+   if give_initial_stuff_enable then
+      local inv = player:get_inventory()
+
+      for _, itemstring in ipairs(give_initial_items) do
+         inv:add_item("main", itemstring)
+      end
+   end
+end
+
+minetest.register_on_newplayer(on_newplayer)
+
+default.log("mod:give_initial", "loaded")
diff --git a/mods/give_initial_stuff/init.lua b/mods/give_initial_stuff/init.lua
deleted file mode 100644
index 34d31e1..0000000
--- a/mods/give_initial_stuff/init.lua
+++ /dev/null
@@ -1,19 +0,0 @@
---
--- Gives initial stuff
--- By Kaadmy, for Pixture
---
-
-local giveme = minetest.setting_getbool("give_initial_stuff")
-
-local function give_initial_stuff(player)
-   if giveme then
-      local inv=player:get_inventory()
-
-      inv:add_item("main", "default:pick_stone")
-      inv:add_item("main", "default:torch_weak 10")
-   end
-end
-
-minetest.register_on_newplayer(give_initial_stuff)
-
-default.log("mod:give_initial_stuff", "loaded")
\ No newline at end of file
diff --git a/settingtypes.txt b/settingtypes.txt
index c0a991e..5a6f032 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -9,12 +9,15 @@ welcome_enable (Welcome) bool true
 
 ## Player stuff
 
-give_initial_stuff (Give initial items) bool false
-
 drop_items_on_die (Drop items on death) bool true
 
 enable_pvp (PvP) bool true
 
+## Initial items
+
+give_initial_enable (Enable initial items) bool false
+give_initial_items (Initial items) string default:pick_stone,default:torch_weak 10
+
 ## TNT
 
 tnt_enable (Enable TNT) bool true