Update 3d_armor modpack

mods/3d_armor/README.txt

@@ -1,15 +1,19 @@
 [mod] Visible Player Armor [3d_armor]
 =====================================
 
-depends: default, inventory_plus, unified_skins
+Depends: default
 
-Adds craftable armor that is visible to other players. Each armor item worn contibutes to
+Recommends: inventory_plus or unified_inventory (use only one)
+
+Adds craftable armor that is visible to other players. Each armor item worn contributes to
 a player's armor group level making them less vulnerable to weapons.
 
 Armor takes damage when a player is hurt but also offers a percentage chance of healing.
+Overall level is boosted by 10% when wearing a full matching set.
 
-default settings: [minetest.conf]
+Configuration
+-------------
 
-# Set number of seconds between armor updates.
-3d_armor_update_time = 1
+Armor can be configured by adding a file called armor.conf in 3d_armor mod directory.
+see armor.conf.example for all available options.
 

mods/3d_armor/armor.conf.example

@@ -0,0 +1,37 @@
+-- Armor Configuration (defaults)
+
+-- Increase this if you get initialization glitches when a player first joins.
+ARMOR_INIT_DELAY = 1
+
+-- Number of initialization attempts.
+-- Use in conjunction with ARMOR_INIT_DELAY if initialization problems persist.
+ARMOR_INIT_TIMES = 1
+
+-- Increase this if armor is not getting into bones due to server lag.
+ARMOR_BONES_DELAY = 1
+
+-- How often player armor/wield items are updated.
+ARMOR_UPDATE_TIME = 1
+
+-- Drop armor when a player dies.
+-- Uses bones mod if present, otherwise items are dropped around the player.
+ARMOR_DROP = true
+
+-- Pulverise armor when a player dies, overrides ARMOR_DROP.
+ARMOR_DESTROY = false
+
+-- You can use this to increase or decrease overall armor effectiveness,
+-- eg: ARMOR_LEVEL_MULTIPLIER = 0.5 will reduce armor level by half.
+ARMOR_LEVEL_MULTIPLIER = 1
+
+-- You can use this to increase or decrease overall armor healing,
+-- eg: ARMOR_HEAL_MULTIPLIER = 0 will disable healing altogether.
+ARMOR_HEAL_MULTIPLIER = 1
+
+-- You can also use this file to execute arbitary lua code
+-- eg: Dumb the armor down if using Simple Mobs
+if minetest.get_modpath("mobs") then
+	ARMOR_LEVEL_MULTIPLIER = 0.5
+	ARMOR_HEAL_MULTIPLIER = 0
+end
+

mods/3d_armor/armor.lua

@@ -1,49 +1,147 @@
-local time = 0
-local update_time = tonumber(minetest.setting_get("3d_armor_update_time"))
-if not update_time then
-	update_time = 1
-	minetest.setting_set("3d_armor_update_time", tostring(update_time))
+ARMOR_INIT_DELAY = 1
+ARMOR_INIT_TIMES = 1
+ARMOR_BONES_DELAY = 1
+ARMOR_UPDATE_TIME = 1
+ARMOR_DROP = true
+ARMOR_DESTROY = false
+ARMOR_LEVEL_MULTIPLIER = 1
+ARMOR_HEAL_MULTIPLIER = 1
+
+local modpath = minetest.get_modpath(ARMOR_MOD_NAME)
+local input = io.open(modpath.."/armor.conf", "r")
+if input then
+	dofile(modpath.."/armor.conf")
+	input:close()
+	input = nil
 end
+local time = 0
 
 armor = {
 	player_hp = {},
 	elements = {"head", "torso", "legs", "feet"},
-	formspec = "size[8,8.5]button[0,0;2,0.5;main;Back]"
-		.."list[current_player;main;0,4.5;8,4;]"
-		.."list[detached:player_name_armor;armor_head;3,0;1,1;]"
-		.."list[detached:player_name_armor;armor_torso;3,1;1,1;]"
-		.."list[detached:player_name_armor;armor_legs;3,2;1,1;]"
-		.."list[detached:player_name_armor;armor_feet;3,3;1,1;]",
+	physics = {"jump","speed","gravity"},
+	formspec = "size[8,8.5]list[detached:player_name_armor;armor;0,1;2,3;]"
+		.."image[2,0.75;2,4;armor_preview]"
+    	.."list[current_player;main;0,4.5;8,4;]"
+    	.."list[current_player;craft;4,1;3,3;]"
+    	.."list[current_player;craftpreview;7,2;1,1;]",
+	textures = {},
+	default_skin = "character",
 }
 
+if inventory_plus then
+	armor.formspec = "size[8,8.5]button[0,0;2,0.5;main;Back]"
+		.."list[detached:player_name_armor;armor;0,1;2,3;]"
+		.."image[2.5,0.75;2,4;armor_preview]"
+		.."label[5,1;Level: armor_level]"
+		.."label[5,1.5;Heal:  armor_heal]"
+		.."list[current_player;main;0,4.5;8,4;]"
+elseif unified_inventory then
+	unified_inventory.register_button("armor", {
+		type = "image",
+		image = "inventory_plus_armor.png",
+	})
+	unified_inventory.register_page("armor", {
+		get_formspec = function(player)
+			local name = player:get_player_name()
+			local formspec = "background[0.06,0.99;7.92,7.52;3d_armor_ui_form.png]"
+				.."label[0,0;Armor]"
+				.."list[detached:"..name.."_armor;armor;0,1;2,3;]"
+				.."image[2.5,0.75;2,4;"..armor.textures[name].preview.."]"
+				.."label[5,1;Level: "..armor.def[name].level.."]"
+				.."label[5,1.5;Heal:  "..armor.def[name].heal.."]"
+			return {formspec=formspec}
+		end,
+	})
+end
+
 armor.def = {
 	state = 0,
-	count = 0
+	count = 0,
 }
 
+armor.update_player_visuals = function(self, player)
+	if not player then
+		return
+	end
+	local name = player:get_player_name()
+	if self.textures[name] then
+		default.player_set_textures(player, {
+			self.textures[name].skin,
+			self.textures[name].armor,
+			self.textures[name].wielditem,
+		})
+	end
+end
+
 armor.set_player_armor = function(self, player)
 	if not player then
 		return
 	end
 	local name = player:get_player_name()
 	local player_inv = player:get_inventory()
-	local armor_texture = uniskins.default_texture
+	if not name or not player_inv then
+		return
+	end
+	local armor_texture = "3d_armor_trans.png"
 	local armor_level = 0
+	local armor_heal = 0
 	local state = 0
 	local items = 0
+	local elements = {}
 	local textures = {}
+	local physics_o = {speed=1,gravity=1,jump=1}
+	local material = {type=nil, count=1}
+	local preview = armor:get_player_skin(name).."_preview.png"
 	for _,v in ipairs(self.elements) do
-		local stack = player_inv:get_stack("armor_"..v, 1)
-		local level = stack:get_definition().groups["armor_"..v]
-		if level then
-			local item = stack:get_name()
-			table.insert(textures, item:gsub("%:", "_")..".png")
-			armor_level = armor_level + level
-			state = state + stack:get_wear()
-			items = items+1
-		end			
+		elements[v] = false
 	end
-	if table.getn(textures) > 0 then
+	for i=1, 6 do
+		local stack = player_inv:get_stack("armor", i)
+		local item = stack:get_name()
+		if stack:get_count() == 1 then
+			local def = stack:get_definition()
+			for k, v in pairs(elements) do
+				if v == false then
+					local level = def.groups["armor_"..k]
+					if level then
+						local texture = item:gsub("%:", "_")
+						table.insert(textures, texture..".png")
+						preview = preview.."^"..texture.."_preview.png"
+						armor_level = armor_level + level
+						state = state + stack:get_wear()
+						items = items + 1
+						local heal = def.groups["armor_heal"] or 0
+						armor_heal = armor_heal + heal
+						for kk,vv in ipairs(self.physics) do							
+							local o_value = def.groups["physics_"..vv]
+							if o_value then
+								physics_o[vv] = physics_o[vv] + o_value
+							end
+						end
+						local mat = string.match(item, "%:.+_(.+)$")
+						if material.type then
+							if material.type == mat then
+								material.count = material.count + 1
+							end
+						else
+							material.type = mat
+						end
+						elements[k] = true
+					end
+				end
+			end
+		end
+	end
+	if minetest.get_modpath("shields") then
+		armor_level = armor_level * 0.9
+	end
+	if material.type and material.count == #self.elements then
+		armor_level = armor_level * 1.1
+	end
+	armor_level = armor_level * ARMOR_LEVEL_MULTIPLIER
+	armor_heal = armor_heal * ARMOR_HEAL_MULTIPLIER
+	if #textures > 0 then
 		armor_texture = table.concat(textures, "^")
 	end
 	local armor_groups = {fleshy=100}
@@ -52,10 +150,14 @@ armor.set_player_armor = function(self, player)
 		armor_groups.fleshy = 100 - armor_level
 	end
 	player:set_armor_groups(armor_groups)
-	uniskins.armor[name] = armor_texture
-	uniskins:update_player_visuals(player)
-	armor.def[name].state = state
-	armor.def[name].count = items
+	player:set_physics_override(physics_o)
+	self.textures[name].armor = armor_texture
+	self.textures[name].preview = preview
+	self.def[name].state = state
+	self.def[name].count = items
+	self.def[name].level = armor_level
+	self.def[name].heal = armor_heal
+	self:update_player_visuals(player)
 end
 
 armor.update_armor = function(self, player)
@@ -76,101 +178,273 @@ armor.update_armor = function(self, player)
 		local heal_max = 0
 		local state = 0
 		local items = 0
-		for _,v in ipairs(self.elements) do
-			local stack = armor_inv:get_stack("armor_"..v, 1)
+		for i=1, 6 do
+			local stack = player_inv:get_stack("armor", i)
 			if stack:get_count() > 0 then
 				local use = stack:get_definition().groups["armor_use"] or 0
 				local heal = stack:get_definition().groups["armor_heal"] or 0
 				local item = stack:get_name()
 				stack:add_wear(use)
-				armor_inv:set_stack("armor_"..v, 1, stack)
-				player_inv:set_stack("armor_"..v, 1, stack)
+				armor_inv:set_stack("armor", i, stack)
+				player_inv:set_stack("armor", i, stack)
 				state = state + stack:get_wear()
-				items = items+1
+				items = items + 1
 				if stack:get_count() == 0 then
 					local desc = minetest.registered_items[item].description
 					if desc then
 						minetest.chat_send_player(name, "Your "..desc.." got destroyed!")
-					end				
+					end
 					self:set_player_armor(player)
+					armor:update_inventory(player)
 				end
 				heal_max = heal_max + heal
 			end
 		end
-		armor.def[name].state = state
-		armor.def[name].count = items
+		self.def[name].state = state
+		self.def[name].count = items
+		heal_max = heal_max * ARMOR_HEAL_MULTIPLIER
 		if heal_max > math.random(100) then
 			player:set_hp(self.player_hp[name])
 			return
-		end		
+		end
 	end
 	self.player_hp[name] = hp
 end
 
+armor.get_player_skin = function(self, name)
+	local skin = nil
+	if skins then
+		skin = skins.skins[name]
+	elseif u_skins then
+		skin = u_skins.u_skins[name]
+	end
+	return skin or armor.default_skin
+end
+
+armor.get_armor_formspec = function(self, name)
+	local formspec = armor.formspec:gsub("player_name", name)
+	formspec = formspec:gsub("armor_preview", armor.textures[name].preview)
+	formspec = formspec:gsub("armor_level", armor.def[name].level)
+	return formspec:gsub("armor_heal", armor.def[name].heal)
+end
+
+armor.update_inventory = function(self, player)
+	local name = player:get_player_name()
+	if unified_inventory then
+		if unified_inventory.current_page[name] == "armor" then
+			unified_inventory.set_inventory_formspec(player, "armor")
+		end
+	else
+		local formspec = armor:get_armor_formspec(name)
+		if inventory_plus then
+			local page = player:get_inventory_formspec()
+			if page:find("detached:"..name.."_armor") then
+				inventory_plus.set_inventory_formspec(player, formspec)
+			end
+		else
+			player:set_inventory_formspec(formspec)
+		end
+	end
+end
+
+-- Register Player Model
+
+default.player_register_model("3d_armor_character.x", {
+	animation_speed = 30,
+	textures = {
+		armor.default_skin..".png",
+		"3d_armor_trans.png",
+		"3d_armor_trans.png",
+	},
+	animations = {
+		stand = {x=0, y=79},
+		lay = {x=162, y=166},
+		walk = {x=168, y=187},
+		mine = {x=189, y=198},
+		walk_mine = {x=200, y=219},
+		sit = {x=81, y=160},
+	},
+})
+
 -- Register Callbacks
 
 minetest.register_on_player_receive_fields(function(player, formname, fields)
 	local name = player:get_player_name()
-	if fields.armor then
-		local formspec = armor.formspec:gsub("player_name", name)
+	if inventory_plus and fields.armor then
+		local formspec = armor:get_armor_formspec(name)
 		inventory_plus.set_inventory_formspec(player, formspec)
 		return
 	end
 	for field, _ in pairs(fields) do
-		if string.sub(field,0,string.len("skins_set_")) == "skins_set_" then
+		if string.find(field, "skins_set_") then
 			minetest.after(0, function(player)
-				uniskins.skin[name] = skins.skins[name]..".png"
-				uniskins:update_player_visuals(player)
+				local skin = armor:get_player_skin(name)
+				armor.textures[name].skin = skin..".png"
+				armor:set_player_armor(player)
 			end, player)
 		end
 	end
 end)
 
 minetest.register_on_joinplayer(function(player)
-	inventory_plus.register_button(player,"armor", "Armor")
-	local player_inv = player:get_inventory()
+	default.player_set_model(player, "3d_armor_character.x")
 	local name = player:get_player_name()
+	local player_inv = player:get_inventory()
 	local armor_inv = minetest.create_detached_inventory(name.."_armor",{
 		on_put = function(inv, listname, index, stack, player)
 			player:get_inventory():set_stack(listname, index, stack)
 			armor:set_player_armor(player)
+			armor:update_inventory(player)
 		end,
 		on_take = function(inv, listname, index, stack, player)
 			player:get_inventory():set_stack(listname, index, nil)
 			armor:set_player_armor(player)
+			armor:update_inventory(player)
+		end,
+		on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
+			local plaver_inv = player:get_inventory()
+			local stack = inv:get_stack(to_list, to_index)
+			player_inv:set_stack(to_list, to_index, stack)
+			player_inv:set_stack(from_list, from_index, nil)
+			armor:set_player_armor(player)
+			armor:update_inventory(player)
 		end,
 		allow_put = function(inv, listname, index, stack, player)
-			if inv:is_empty(listname) then
-				return 1
-			end
-			return 0
+			return 1
 		end,
 		allow_take = function(inv, listname, index, stack, player)
 			return stack:get_count()
 		end,
 		allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
-			return 0
+			return count
 		end,
 	})
-	for _,v in ipairs(armor.elements) do
-		local list = "armor_"..v
-		player_inv:set_size(list, 1)
-		armor_inv:set_size(list, 1)
-		armor_inv:set_stack(list, 1, player_inv:get_stack(list, 1))
+	if inventory_plus then
+		inventory_plus.register_button(player,"armor", "Armor")
 	end
-	armor.player_hp[name] = 0	
+	armor_inv:set_size("armor", 6)
+	player_inv:set_size("armor", 6)
+	for i=1, 6 do
+		local stack = player_inv:get_stack("armor", i)
+		armor_inv:set_stack("armor", i, stack)
+	end	
+
+	-- Legacy support, import player's armor from old inventory format
+	for _,v in pairs(armor.elements) do
+		local list = "armor_"..v
+		armor_inv:add_item("armor", player_inv:get_stack(list, 1))
+		player_inv:set_stack(list, 1, nil)
+	end
+
+	armor.player_hp[name] = 0
 	armor.def[name] = {
-	state = 0,
-	count = 0
+		state = 0,
+		count = 0,
+		level = 0,
+		heal = 0,
 	}
-	minetest.after(0, function(player)
-		armor:set_player_armor(player)
-	end, player)	
+	armor.textures[name] = {
+		skin = armor.default_skin..".png",
+		armor = "3d_armor_trans.png",
+		wielditem = "3d_armor_trans.png",
+		preview = armor.default_skin.."_preview.png",
+	}
+	if minetest.get_modpath("skins") then
+		local skin = skins.skins[name]
+		if skin and skins.get_type(skin) == skins.type.MODEL then
+			armor.textures[name].skin = skin..".png"
+		end
+	elseif minetest.get_modpath("u_skins") then
+		local skin = u_skins.u_skins[name]
+		if skin and u_skins.get_type(skin) == u_skins.type.MODEL then
+			armor.textures[name].skin = skin..".png"
+		end
+	end
+	if minetest.get_modpath("player_textures") then
+		local filename = minetest.get_modpath("player_textures").."/textures/player_"..name
+		local f = io.open(filename..".png")
+		if f then
+			f:close()
+			armor.textures[name].skin = "player_"..name..".png"
+		end
+	end
+	for i=1, ARMOR_INIT_TIMES do
+		minetest.after(ARMOR_INIT_DELAY * i, function(player)
+			armor:set_player_armor(player)
+			if inventory_plus == nil and unified_inventory == nil then
+				armor:update_inventory(player)
+			end
+		end, player)
+	end
 end)
 
+if ARMOR_DROP == true or ARMOR_DESTROY == true then
+	minetest.register_on_dieplayer(function(player)
+		local name = player:get_player_name()
+		local pos = player:getpos()
+		if name and pos then
+			local drop = {}
+			local player_inv = player:get_inventory()
+			local armor_inv = minetest.get_inventory({type="detached", name=name.."_armor"})
+			for i=1, player_inv:get_size("armor") do
+				local stack = armor_inv:get_stack("armor", i)
+				if stack:get_count() > 0 then
+					table.insert(drop, stack)
+					armor_inv:set_stack("armor", i, nil)
+					player_inv:set_stack("armor", i, nil)
+				end
+			end
+			armor:set_player_armor(player)
+			if unified_inventory then
+				unified_inventory.set_inventory_formspec(player, "craft")
+			elseif inventory_plus then
+				local formspec = inventory_plus.get_formspec(player,"main")
+				inventory_plus.set_inventory_formspec(player, formspec)
+			else
+				armor:update_inventory(player)
+			end
+			if ARMOR_DESTROY == false then
+				if minetest.get_modpath("bones") then
+					minetest.after(ARMOR_BONES_DELAY, function()
+						pos = vector.round(pos)
+						local node = minetest.get_node(pos)
+						if node.name == "bones:bones" then
+							local meta = minetest.get_meta(pos)
+							local owner = meta:get_string("owner")
+							local inv = meta:get_inventory()
+							if name == owner then
+								for _,stack in ipairs(drop) do
+									if inv:room_for_item("main", stack) then
+										inv:add_item("main", stack)
+									end
+								end
+							end
+						end
+					end)
+				else
+					for _,stack in ipairs(drop) do
+						local obj = minetest.add_item(pos, stack)
+						if obj then
+							local x = math.random(1, 5)
+							if math.random(1,2) == 1 then
+								x = -x
+							end
+							local z = math.random(1, 5)
+							if math.random(1,2) == 1 then
+								z = -z
+							end
+							obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z})
+						end
+					end
+				end
+			end
+		end
+	end)
+end
+
 minetest.register_globalstep(function(dtime)
 	time = time + dtime
-	if time > update_time then
+	if time > ARMOR_UPDATE_TIME then
 		for _,player in ipairs(minetest.get_connected_players()) do
 			armor:update_armor(player)
 		end

mods/3d_armor/crafting_guide.txt

@@ -15,6 +15,8 @@ Helmets:
 [3d_armor:helmet_steel] X = [default:steel_ingot]
 [3d_armor:helmet_bronze] X = [default:bronze_ingot]
 [3d_armor:helmet_diamond] X = [default:diamond]
+[3d_armor:helmet_diamond] X = [default:gold_ingot]
+[3d_armor:helmet_mithril] X = [moreores:mithril_ingot] *
 
 Chestplates:
 
@@ -30,6 +32,8 @@ Chestplates:
 [3d_armor:chestplate_steel] X = [default:steel_ingot]
 [3d_armor:chestplate_bronze] X = [default:bronze_ingot]
 [3d_armor:chestplate_diamond] X = [default:diamond]
+[3d_armor:chestplate_diamond] X = [default:gold_ingot]
+[3d_armor:chestplate_mithril] X = [moreores:mithril_ingot] *
 
 Leggings:
 
@@ -45,6 +49,8 @@ Leggings:
 [3d_armor:leggings_steel] X = [default:steel_ingot]
 [3d_armor:leggings_bronze] X = [default:bronze_ingot]
 [3d_armor:leggings_diamond] X = [default:diamond]
+[3d_armor:leggings_diamond] X = [default:gold_ingot]
+[3d_armor:leggings_mithril] X = [moreores:mithril_ingot] *
 
 Boots:
 
@@ -58,4 +64,8 @@ Boots:
 [3d_armor:boots_steel] X = [default:steel_ingot]
 [3d_armor:boots_bronze] X = [default:bronze_ingot
 [3d_armor:boots_diamond] X = [default:diamond]
+[3d_armor:boots_diamond] X = [default:gold_ingot]
+[3d_armor:boots_mithril] X = [moreores:mithril_ingot] *
+
+* Requires moreores mod by Calinou - https://forum.minetest.net/viewtopic.php?id=549
 

mods/3d_armor/depends.txt

@@ -1,3 +1,4 @@
 default
-inventory_plus
-unified_skins
+inventory_plus?
+unified_inventory?
+

mods/3d_armor/init.lua

@@ -1,4 +1,6 @@
-dofile(minetest.get_modpath(minetest.get_current_modname()).."/armor.lua")
+ARMOR_MOD_NAME = minetest.get_current_modname()
+dofile(minetest.get_modpath(ARMOR_MOD_NAME).."/armor.lua")
+local use_moreores = minetest.get_modpath("moreores")
 
 -- Regisiter Head Armor
 
@@ -30,6 +32,21 @@ minetest.register_tool("3d_armor:helmet_diamond", {
 	wear = 0,
 })
 
+minetest.register_tool("3d_armor:helmet_gold", {
+	description = "Gold Helmet",
+	inventory_image = "3d_armor_inv_helmet_gold.png",
+	groups = {armor_head=10, armor_heal=6, armor_use=250},
+	wear = 0,
+})
+
+if use_moreores then
+	minetest.register_tool("3d_armor:helmet_mithril", {
+		description = "Mithril Helmet",
+		inventory_image = "3d_armor_inv_helmet_mithril.png",
+		groups = {armor_head=15, armor_heal=12, armor_use=50},
+		wear = 0,
+	})
+end
 
 -- Regisiter Torso Armor
 
@@ -61,6 +78,21 @@ minetest.register_tool("3d_armor:chestplate_diamond", {
 	wear = 0,
 })
 
+minetest.register_tool("3d_armor:chestplate_gold", {
+	description = "Gold Chestplate",
+	inventory_image = "3d_armor_inv_chestplate_gold.png",
+	groups = {armor_torso=15, armor_heal=6, armor_use=250},
+	wear = 0,
+})
+
+if use_moreores then
+	minetest.register_tool("3d_armor:chestplate_mithril", {
+		description = "Mithril Chestplate",
+		inventory_image = "3d_armor_inv_chestplate_mithril.png",
+		groups = {armor_torso=20, armor_heal=12, armor_use=50},
+		wear = 0,
+	})
+end
 
 -- Regisiter Leg Armor
 
@@ -92,6 +124,22 @@ minetest.register_tool("3d_armor:leggings_diamond", {
 	wear = 0,
 })
 
+minetest.register_tool("3d_armor:leggings_gold", {
+	description = "Gold Leggings",
+	inventory_image = "3d_armor_inv_leggings_gold.png",
+	groups = {armor_legs=15, armor_heal=6, armor_use=250},
+	wear = 0,
+})
+
+if use_moreores then
+	minetest.register_tool("3d_armor:leggings_mithril", {
+		description = "Mithril Leggings",
+		inventory_image = "3d_armor_inv_leggings_mithril.png",
+		groups = {armor_legs=20, armor_heal=12, armor_use=50},
+		wear = 0,
+	})
+end
+
 -- Regisiter Boots
 
 minetest.register_tool("3d_armor:boots_wood", {
@@ -122,6 +170,22 @@ minetest.register_tool("3d_armor:boots_diamond", {
 	wear = 0,
 })
 
+minetest.register_tool("3d_armor:boots_gold", {
+	description = "Gold Boots",
+	inventory_image = "3d_armor_inv_boots_gold.png",
+	groups = {armor_feet=10, armor_heal=6, armor_use=250},
+	wear = 0,
+})
+
+if use_moreores then
+	minetest.register_tool("3d_armor:boots_mithril", {
+		description = "Mithril Boots",
+		inventory_image = "3d_armor_inv_boots_mithril.png",
+		groups = {armor_feet=15, armor_heal=12, armor_use=50},
+		wear = 0,
+	})
+end
+
 -- Register Craft Recipies
 
 local craft_ingreds = {
@@ -129,7 +193,12 @@ local craft_ingreds = {
 	steel = "default:steel_ingot",
 	bronze = "default:bronze_ingot",
 	diamond = "default:diamond",
-}	
+	gold = "default:gold_ingot",
+}
+
+if use_moreores then
+	craft_ingreds.mithril = "moreores:mithril_ingot"
+end
 
 for k, v in pairs(craft_ingreds) do
 	minetest.register_craft({
@@ -165,4 +234,3 @@ for k, v in pairs(craft_ingreds) do
 	})
 end
 
-

mods/3d_armor/models/3d_armor_character.x

@@ -1998,30 +1998,30 @@ Frame Root {
            0.625000; 0.625000;,
            0.625000; 1.000000;,
            0.500000; 1.000000;,
-           0.625000; 0.250000;,
-           0.625000; 0.500000;,
-           0.500000; 0.500000;,
-           0.500000; 0.250000;,
-           0.625000; 0.250000;,
-           0.625000; 0.000000;,
-           0.750000; 0.000000;,
-           0.750000; 0.250000;,
-           0.750000; 0.250000;,
-           0.750000; 0.000000;,
-           0.875000; 0.000000;,
-           0.875000; 0.250000;,
-           0.750000; 0.500000;,
-           0.625000; 0.500000;,
-           0.625000; 0.250000;,
-           0.750000; 0.250000;,
-           0.875000; 0.500000;,
-           0.750000; 0.500000;,
-           0.750000; 0.250000;,
-           0.875000; 0.250000;,
-           1.000000; 0.500000;,
-           0.875000; 0.500000;,
-           0.875000; 0.250000;,
-           1.000000; 0.250000;,
+           0.622025; 0.250000;,
+           0.622025; 0.500000;,
+           0.497025; 0.500000;,
+           0.497025; 0.250000;,
+           0.622025; 0.250000;,
+           0.622025; 0.000000;,
+           0.747025; 0.000000;,
+           0.747025; 0.250000;,
+           0.747025; 0.250000;,
+           0.747025; 0.000000;,
+           0.872025; 0.000000;,
+           0.872025; 0.250000;,
+           0.747025; 0.500000;,
+           0.622025; 0.500000;,
+           0.622025; 0.250000;,
+           0.747025; 0.250000;,
+           0.872025; 0.500000;,
+           0.747025; 0.500000;,
+           0.747025; 0.250000;,
+           0.872025; 0.250000;,
+           0.997025; 0.500000;,
+           0.872025; 0.500000;,
+           0.872025; 0.250000;,
+           0.997025; 0.250000;,
            0.812500; 0.625000;,
            0.812500; 0.500000;,
            0.750000; 0.500000;,
@@ -2181,8 +2181,8 @@ Frame Root {
            0.250000; 0.500000;,
            0.250000; 0.000000;,
            0.000000; 0.000000;,
-           0.000000; 0.500000;,
-           0.000000; 0.500000;,
+          -0.000000; 0.500000;,
+          -0.000000; 0.500000;,
            0.000000; 0.000000;,
            0.250000; 0.000000;,
            0.250000; 0.500000;,

mods/shields/crafting_guide.txt

@@ -13,5 +13,4 @@ Shields -- Crafting Guide
 [shields:shield_steel] X = [default:steel_ingot]
 [shields:shield_bronze] X = [default:bronze_ingot]
 [shields:shield_diamond] X = [default:diamond]
-
-
+[shields:shield_gold] X = [default:gold_ingot]

mods/shields/depends.txt

@@ -1,3 +1,2 @@
 default
-inventory_plus
 3d_armor

mods/shields/init.lua

@@ -1,3 +1,5 @@
+local use_moreores = minetest.get_modpath("moreores")
+
 -- Regisiter Shields
 
 minetest.register_tool("shields:shield_wood", {
@@ -28,14 +30,34 @@ minetest.register_tool("shields:shield_diamond", {
 	wear = 0,
 })
 
+minetest.register_tool("shields:shield_gold", {
+	description = "Gold Shield",
+	inventory_image = "shields_inv_shield_gold.png",
+	groups = {armor_shield=10, armor_heal=6, armor_use=250},
+	wear = 0,
+})
+
+if use_moreores then
+	minetest.register_tool("shields:shield_mithril", {
+		description = "Mithril Shield",
+		inventory_image = "shields_inv_shield_mithril.png",
+		groups = {armor_shield=15, armor_heal=12, armor_use=50},
+		wear = 0,
+	})
+end
 
 local craft_ingreds = {
 	wood = "default:wood",
 	steel = "default:steel_ingot",
 	bronze = "default:bronze_ingot",
 	diamond = "default:diamond",
+	gold = "default:gold_ingot",
 }	
 
+if has_moreores then
+	craft_ingreds.mithril = "moreores:mithril_ingot"
+end
+
 for k, v in pairs(craft_ingreds) do
 	minetest.register_craft({
 		output = "shields:shield_"..k,
@@ -49,13 +71,6 @@ end
 
 minetest.after(0, function()
 	table.insert(armor.elements, "shield")
-	armor.formspec = "size[8,8.5]button[0,0;2,0.5;main;Back]"
-		.."list[current_player;main;0,4.5;8,4;]"
-		.."list[detached:player_name_armor;armor_head;3,0;1,1;]"
-		.."list[detached:player_name_armor;armor_torso;3,1;1,1;]"
-		.."list[detached:player_name_armor;armor_legs;3,2;1,1;]"
-		.."list[detached:player_name_armor;armor_feet;3,3;1,1;]"
-		.."list[detached:player_name_armor;armor_shield;4,1;1,1;]"
-end)		
-
+end)
 
+ 

mods/unified_skins/README.txt

@@ -1,7 +0,0 @@
-A 3d character model re-texturing api used as the framework for this modpack.
-
-depends: default
-
-Compatible with player skins mod [skins] by Zeg9 and Player Textures [player_textures] by sdzen.
-
-Note: Currently only 64x32px player skins.

mods/unified_skins/depends.txt

@@ -1 +0,0 @@
-default

mods/unified_skins/init.lua

@@ -1,47 +0,0 @@
-
-uniskins = {
-	skin = {},
-	armor = {},
-	wielditem = {},
-	default_skin = "character.png",
-	default_texture = "uniskins_trans.png",
-}
-
-uniskins.update_player_visuals = function(self, player)
-	if not player then
-		return
-	end
-	local name = player:get_player_name()
-	player:set_properties({
-		visual = "mesh",
-		mesh = "uniskins_character.x",
-		textures = {
-			self.skin[name],
-			self.armor[name],
-			self.wielditem[name]
-		},
-		visual_size = {x=1, y=1},
-	})
-end
-
-minetest.register_on_joinplayer(function(player)
-	local name = player:get_player_name()
-	uniskins.skin[name] = uniskins.default_skin
-	uniskins.armor[name] = uniskins.default_texture
-	uniskins.wielditem[name] = uniskins.default_texture
-	if minetest.get_modpath("player_textures") then
-		local filename = minetest.get_modpath("player_textures").."/textures/player_"..name
-		local f = io.open(filename..".png")
-		if f then
-			f:close()
-			uniskins.skin[name] = "player_"..name..".png"
-		end
-	end
-	if minetest.get_modpath("skins") then
-		local skin = skins.skins[name]
-		if skin and skins.get_type(skin) == skins.type.MODEL then
-			uniskins.skin[name] = skin..".png"
-		end
-	end
-end)
-

mods/wieldview/README.txt

@@ -1,11 +1,9 @@
 [mod] visible wielded items [wieldview]
 =======================================
 
-depends: default, unified_skins
+depends: default, 3d_armor
 
-Makes hand wielded items visible to other players. Compatible with player skins mod [skins].
-
-Note: Currently only supports 16x16px texture packs, sorry!
+Makes hand wielded items visible to other players.
 
 default settings: [minetest.conf]
 

mods/wieldview/depends.txt

@@ -1,2 +1,2 @@
 default
-unified_skins
+3d_armor

mods/wieldview/init.lua

@@ -10,14 +10,15 @@ if not node_tiles then
 	minetest.setting_set("wieldview_node_tiles", "false")
 end
 
-dofile(minetest.get_modpath(minetest.get_current_modname()).."/transform.lua")
-
 wieldview = {
 	wielded_item = {},
+	transform = {},
 }
 
+dofile(minetest.get_modpath(minetest.get_current_modname()).."/transform.lua")
+
 wieldview.get_item_texture = function(self, item)
-	local texture = uniskins.default_texture
+	local texture = "3d_armor_trans.png"
 	if item ~= "" then
 		if minetest.registered_items[item] then
 			if minetest.registered_items[item].inventory_image ~= "" then
@@ -26,8 +27,8 @@ wieldview.get_item_texture = function(self, item)
 				texture = minetest.registered_items[item].tiles[1]
 			end
 		end
-		if wieldview_transform[item] then
-			texture = texture.."^[transform"..wieldview_transform[item]
+		if wieldview.transform[item] then
+			texture = texture.."^[transform"..wieldview.transform[item]
 		end
 	end
 	return texture
@@ -47,8 +48,8 @@ wieldview.update_wielded_item = function(self, player)
 		if self.wielded_item[name] == item then
 			return
 		end
-		uniskins.wielditem[name] = self:get_item_texture(item)
-		uniskins:update_player_visuals(player)
+		armor.textures[name].wielditem = self:get_item_texture(item)
+		armor:update_player_visuals(player)
 	end
 	self.wielded_item[name] = item
 end

mods/wieldview/transform.lua

@@ -1,6 +1,6 @@
 -- Wielded Item Transformations - http://dev.minetest.net/texture
 
-wieldview_transform = {
+wieldview.transform = {
 	["default:torch"]="R270",
 	["default:sapling"]="R270",
 	["flowers:dandelion_white"]="R270",