From 1c7dd5e097de985400368154dad8874672bed160 Mon Sep 17 00:00:00 2001
From: cale <cdqwertz@gmail.com>
Date: Tue, 20 Dec 2016 10:30:22 +0100
Subject: [PATCH] updated skills + villages

---
 mods/skills/init.lua                          |  38 ++++++++++++------
 mods/village/init.lua                         |   6 +--
 mods/village/schematics/house1.mts            | Bin 0 -> 506 bytes
 mods/village/schematics/{ => old}/village.mts | Bin
 4 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 mods/village/schematics/house1.mts
 rename mods/village/schematics/{ => old}/village.mts (100%)

diff --git a/mods/skills/init.lua b/mods/skills/init.lua
index 92bf11b..d7d25ed 100644
--- a/mods/skills/init.lua
+++ b/mods/skills/init.lua
@@ -171,19 +171,19 @@ default.player_inventory.register_tab({
 	name = "Skills",
 	type = "function",
 	get_formspec = function(name) 
-		local text = minetest.formspec_escape("If you level up your skills, you will be able\nto use better tools or weapons.")
-		text = text .. "\n"
-
 		local formspec = "size[8,7.5;]" ..
 			default.gui_colors .. 
 			default.gui_bg ..
-			"label[0,0;Skills:]"..
-			"label[2.5,0;"..text.."]"
+			"label[0,0;Skills:]"
 
 
 		local i = 0
 		for skill_name, skill_level in pairs(skills.lvls[name]) do
 			formspec = formspec .. "button[0,"..tostring(i+0.5)..";2,1;" .. skill_name .. ";" .. skill_name .. " : " .. tostring(skill_level) .. "]"
+			
+			if skills.all_skills[skill_name] then
+				formspec = formspec .. "label[2.5,"..tostring(i+0.75)..";" .. skills.all_skills[skill_name].description .. "]"
+			end
 			i = i +1
 		end
 	
@@ -251,16 +251,30 @@ minetest.register_chatcommand("reset_skills", {
 	end,
 })
 
-skills.register_skill = function(name)
-	skills.all_skills[name] = true
+skills.register_skill = function(name, def)
+	skills.all_skills[name] = def or {description = ""}
 end
 
 
-skills.register_skill("farmer")
-skills.register_skill("warrior")
-skills.register_skill("cook")
-skills.register_skill("miner")
-skills.register_skill("hunter")
+skills.register_skill("farmer", {
+	description = "You will get more xp for farming."
+})
+
+skills.register_skill("warrior", {
+	description = "You will be able to use better weapons."
+})
+
+skills.register_skill("miner", {
+	description = "You will get more xp for mining."
+})
+
+skills.register_skill("hunter", {
+	description = "You will be able to use better weapons."
+})
+
+skills.register_skill("builder", {
+	description = "-"
+})
 
 skills.load_skills()
 
diff --git a/mods/village/init.lua b/mods/village/init.lua
index 05302cd..cc6956b 100644
--- a/mods/village/init.lua
+++ b/mods/village/init.lua
@@ -4,11 +4,11 @@ minetest.register_decoration({
 	sidelen = 16,
 	noise_params = {offset=0, scale=0.0001, spread={x=100, y=100, z=100}, seed=354, octaves=3, persist=0.7},
 	biomes = {
-		"grassland"
+		"grassland", "forest"
 	},
 	y_min = 6,
 	y_max = 20,
-	schematic = minetest.get_modpath("village").."/schematics/village.mts",
-	flags = "place_center_x, place_center_z, force_placement",
+	schematic = minetest.get_modpath("village").."/schematics/house1.mts",
+	flags = "place_center_x, place_center_z",
 	rotation = "random",
 })
diff --git a/mods/village/schematics/house1.mts b/mods/village/schematics/house1.mts
new file mode 100644
index 0000000000000000000000000000000000000000..9ec00348e21261cbb1a336019723c6a10456d15f
GIT binary patch
literal 506
zcmeYb3HD`RVc=vCVBo4p0}Sj8%!!#r3<4>sX^EvdC0049iDjw9@rDe-Fp;d%y!4#Z
z_>!X3R0c_yU|MQka%wzOsyshGg@GF;m6M;&AXHoeG_}|&IX@{0sJA#LF^Pc>t{^cb
zCAFwx&fD<B{$>T9+=IoDMf0aU{<HJ<YxXr<Qx*x|%spMf8(GOTEq$f%1I+_#`kB7Z
zbXdj~X86;}_<Ns6`K)K$O;I`qw`NB@)0nlmYjeucsKgE1j$Tm;ZGPT#`{i`=slC@E
zg~J|p+4{{-G(7io@ij>SlTx2q_Rd@Q*IZ&ZsufUq8vVjl<=D;|ne<OvuSx9V`W3h8
z{Dc?5tBj+6d6=%|+i0hp+#n$^qk!$YWQRo07s-|KpVIfN=6f9bYl}^OW!{!G_J&K$
zgQGGhUVT1Esxox?l$>_=6^aX|$h+VFq5ABv;`Ql!dt#3AKe}}h2tH1-h`MjR?Zev#
zGOoHc25~xH{)rY^37x;WE%@i9%5oD1;asNY_dl@zz5m!Txo&y1gIDG+yIvWoW3tvq
zCpdqMxpjp3*o^rn@5|4%Gk4EiAkb(zYgYeptI6F@Rnk2}ZN6zvl=`=9_r@omWikt%
RX;%jpve~iLFZ8<@0sv(N<f;Gw

literal 0
HcmV?d00001

diff --git a/mods/village/schematics/village.mts b/mods/village/schematics/old/village.mts
similarity index 100%
rename from mods/village/schematics/village.mts
rename to mods/village/schematics/old/village.mts