Improve player model hanlding and update to version 0.4.0

Better implementation of support for hud

3d_armor/README.txt

@@ -1,12 +1,13 @@
 [mod] Visible Player Armor [3d_armor]
 =====================================
 
-depends: default, inventory_plus, unified_skins
+depends: default, inventory_plus
 
-Adds craftable armor that is visible to other players. Each armor item worn contibutes to
+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]
 

3d_armor/armor.lua

@@ -14,27 +14,64 @@ armor = {
 		.."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;]",
+	textures = {},
+	default_skin = "character.png",
 }
 
+-- armor.def - Added by BlockMen for HUD integration
+
+armor.def = {
+	state = 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
+	local armor_texture = "3d_armor_trans.png"
 	local armor_level = 0
+	local state = 0
+	local items = 0
 	local textures = {}
-	for _,v in ipairs(self.elements) do
+	local elements = {}
+	for i, 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()
+		elements[i] = string.match(item, "%:.+_(.+)$")
+		if level then
 			table.insert(textures, item:gsub("%:", "_")..".png")
 			armor_level = armor_level + level
+			state = state + stack:get_wear()
+			items = items + 1
 		end
 	end
-	if table.getn(textures) > 0 then
+	if minetest.get_modpath("shields") then
+		armor_level = armor_level * 0.9
+	end
+	if elements[1] == elements[2] and
+		elements[1] == elements[3] and
+		elements[1] == elements[4] then
+		armor_level = armor_level * 1.1
+	end
+	if #textures > 0 then
 		armor_texture = table.concat(textures, "^")
 	end
 	local armor_groups = {fleshy=100}
@@ -43,8 +80,10 @@ 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
+	self.textures[name].armor = armor_texture
-	uniskins:update_player_visuals(player)
+	self.def[name].state = state
+	self.def[name].count = items
+	self:update_player_visuals(player)
 end
 
 armor.update_armor = function(self, player)
@@ -63,6 +102,8 @@ armor.update_armor = function(self, player)
 			return
 		end
 		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)
 			if stack:get_count() > 0 then
@@ -72,6 +113,8 @@ armor.update_armor = function(self, player)
 				stack:add_wear(use)
 				armor_inv:set_stack("armor_"..v, 1, stack)
 				player_inv:set_stack("armor_"..v, 1, stack)
+				state = state + stack:get_wear()
+				items = items + 1
 				if stack:get_count() == 0 then
 					local desc = minetest.registered_items[item].description
 					if desc then
@@ -82,6 +125,8 @@ armor.update_armor = function(self, player)
 				heal_max = heal_max + heal
 			end
 		end
+		self.def[name].state = state
+		self.def[name].count = items
 		if heal_max > math.random(100) then
 			player:set_hp(self.player_hp[name])
 			return
@@ -90,6 +135,25 @@ armor.update_armor = function(self, player)
 	self.player_hp[name] = hp
 end
 
+-- Register Player Model
+
+default.player_register_model("3d_armor_character.x", {
+	animation_speed = 30,
+	textures = {
+		armor.default_skin,
+		"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)
@@ -100,16 +164,17 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		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"
+				armor.textures[name].skin = skins.skins[name]..".png"
-				uniskins:update_player_visuals(player)
+				armor:update_player_visuals(player)
 			end, player)
 		end
 	end
 end)
 
 minetest.register_on_joinplayer(function(player)
+	default.player_set_model(player, "3d_armor_character.x")
 	inventory_plus.register_button(player,"armor", "Armor")
 	local player_inv = player:get_inventory()
 	local name = player:get_player_name()
@@ -142,6 +207,29 @@ minetest.register_on_joinplayer(function(player)
 		armor_inv:set_stack(list, 1, player_inv:get_stack(list, 1))
 	end
 	armor.player_hp[name] = 0
+	armor.def[name] = {
+		state = 0,
+		count = 0,
+	}
+	armor.textures[name] = {
+		skin = armor.default_skin,
+		armor = "3d_armor_trans.png",
+		wielditem = "3d_armor_trans.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
+	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
 	minetest.after(0, function(player)
 		armor:set_player_armor(player)
 	end, player)

3d_armor/crafting_guide.txt

@@ -15,6 +15,7 @@ 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_mithril] X = [moreores:mithril_ingot] *
 
 Chestplates:
 
@@ -30,6 +31,7 @@ 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_mithril] X = [moreores:mithril_ingot] *
 
 Leggings:
 
@@ -45,6 +47,7 @@ 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_mithril] X = [moreores:mithril_ingot] *
 
 Boots:
 
@@ -58,4 +61,7 @@ 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_mithril] X = [moreores:mithril_ingot] *
+
+* Requires moreores mod by Calinou - https://forum.minetest.net/viewtopic.php?id=549
 

3d_armor/depends.txt

@@ -1,3 +1,3 @@
 default
 inventory_plus
-unified_skins
+

3d_armor/init.lua

@@ -1,4 +1,5 @@
 dofile(minetest.get_modpath(minetest.get_current_modname()).."/armor.lua")
+local use_moreores = minetest.get_modpath("moreores")
 
 -- Regisiter Head Armor
 
@@ -30,6 +31,14 @@ minetest.register_tool("3d_armor:helmet_diamond", {
 	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 +70,14 @@ minetest.register_tool("3d_armor:chestplate_diamond", {
 	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 +109,15 @@ minetest.register_tool("3d_armor:leggings_diamond", {
 	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 +148,15 @@ minetest.register_tool("3d_armor:boots_diamond", {
 	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 = {
@@ -131,6 +166,10 @@ local craft_ingreds = {
 	diamond = "default:diamond",
 }
 
+if use_moreores then
+	craft_ingreds.mithril = "moreores:mithril_ingot"
+end
+
 for k, v in pairs(craft_ingreds) do
 	minetest.register_craft({
 		output = "3d_armor:helmet_"..k,
@@ -165,4 +204,3 @@ for k, v in pairs(craft_ingreds) do
 	})
 end
 
-

README.md

@@ -1,36 +1,26 @@
-Modpack - 3d Armor
+Modpack - 3d Armor [0.4.0]
-==================
+==========================
-
-[mod] Unified Skins [unified_skins]
------------------------------------
-
-depends: default
-
-A 3d character model re-texturing api used as the framework for this modpack.
-
-Compatible with player skins mod [skins] by Zeg9 and Player Textures [player_textures] by sdzen.
-
-Note: Currently only supports 64x32px player skins.
-
-[mod] Visible Wielded Items [wieldview]
----------------------------------------
-
-depends: unified_skins
-
-Makes hand wielded items visible to other players.
-
-Note: Currently only supports 16x16px texture packs, sorry!
 
 [mod] Visible Player Armor [3d_armor]
 -------------------------------------
 
-depends: unified_skins, inventory_plus
+depends: default, inventory_plus
 
 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, however, many armor items offer a 'stackable'
-percentage chance of restoring the lost health points.
+percentage chance of restoring the lost health points. Overall armor level is boosted by 10%
+when wearing a full matching set (helmet, chestplate, leggings and boots of the same material)
+
+Compatible with player skins [skins] by Zeg9 and Player Textures [player_textures] by PilzAdam.
+
+[mod] Visible Wielded Items [wieldview]
+---------------------------------------
+
+depends: 3d_armor
+
+Makes hand wielded items visible to other players.
 
 [mod] Shields [shields]
 -------------------------------------
@@ -39,3 +29,4 @@ depends: 3d_armor
 
 Originally a part of 3d_armor, shields have been re-included as an optional extra.
 If you do not want shields then simply remove the shields folder from the modpack.
+

shields/depends.txt

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

shields/init.lua

@@ -1,3 +1,5 @@
+local use_moreores = minetest.get_modpath("moreores")
+
 -- Regisiter Shields
 
 minetest.register_tool("shields:shield_wood", {
@@ -28,6 +30,14 @@ minetest.register_tool("shields:shield_diamond", {
 	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",
@@ -36,6 +46,10 @@ local craft_ingreds = {
 	diamond = "default:diamond",
 }	
 
+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,
@@ -58,4 +72,3 @@ minetest.after(0, function()
 		.."list[detached:player_name_armor;armor_shield;4,1;1,1;]"
 end)
 
-

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.

unified_skins/depends.txt

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

unified_skins/init.lua

@@ -1,51 +0,0 @@
-
-uniskins = {
-	skin = {},
-	armor = {},
-	wielditem = {},
-	default_skin = "character.png",
-	default_texture = nil,
-}
-
-uniskins.update_player_visuals = function(self, player)
-	if not player then
-		return
-	end
-	local name = player:get_player_name()
-	local texture = "uniskins_trans.png"
-	if self.wielditem[name] then
-		texture = texture.."^[combine:64x80:48,64="..self.wielditem[name]
-	end
-	if self.skin[name] then
-		texture = texture.."^[combine:64x80:0,32="..self.skin[name]
-	end
-	if self.armor[name] then
-		texture = texture.."^[combine:64x80:0,0="..self.armor[name]
-	end
-	player:set_properties({
-		visual = "mesh",
-		mesh = "uniskins_character.x",
-		textures = {texture},
-		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
-	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)
-

wieldview/README.txt

@@ -1,15 +1,15 @@
 [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].
+Makes hand wielded items visible to other players.
-
-Note: Currently only supports 16x16px texture packs, sorry!
 
 default settings: [minetest.conf]
 
 # Set number of seconds between visible wielded item updates.
 wieldview_update_time = 2
 
+# Show nodes as tiles, disabled by default
+wieldview_node_tiles = false
 

wieldview/depends.txt

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

wieldview/init.lua

@@ -4,23 +4,34 @@ if not update_time then
 	update_time = 2
 	minetest.setting_set("wieldview_update_time", tostring(update_time))
 end
+local node_tiles = minetest.setting_getbool("wieldview_node_tiles")
+if not node_tiles then
+	node_tiles = false
+	minetest.setting_set("wieldview_node_tiles", "false")
+end
 
 wieldview = {
 	wielded_item = {},
+	transform = {},
 }
 
+dofile(minetest.get_modpath(minetest.get_current_modname()).."/transform.lua")
+
 wieldview.get_item_texture = function(self, item)
+	local texture = "3d_armor_trans.png"
 	if item ~= "" then
 		if minetest.registered_items[item] then
 			if minetest.registered_items[item].inventory_image ~= "" then
-				return minetest.registered_items[item].inventory_image
+				texture = minetest.registered_items[item].inventory_image
-			end
+			elseif node_tiles == true and minetest.registered_items[item].tiles then
-			if minetest.registered_items[item].tiles then
+				texture = minetest.registered_items[item].tiles[1]
-				return minetest.registered_items[item].tiles[1]
 			end
 		end
+		if wieldview.transform[item] then
+			texture = texture.."^[transform"..wieldview.transform[item]
 		end
-	return uniskins.default_texture
+	end
+	return texture
 end
 
 wieldview.update_wielded_item = function(self, player)
@@ -37,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)
+		armor.textures[name].wielditem = self:get_item_texture(item)
-		uniskins:update_player_visuals(player)
+		armor:update_player_visuals(player)
 	end
 	self.wielded_item[name] = item
 end

wieldview/transform.lua

@@ -0,0 +1,24 @@
+-- Wielded Item Transformations - http://dev.minetest.net/texture
+
+wieldview.transform = {
+	["default:torch"]="R270",
+	["default:sapling"]="R270",
+	["flowers:dandelion_white"]="R270",
+	["flowers:dandelion_yellow"]="R270",
+	["flowers:geranium"]="R270",
+	["flowers:rose"]="R270",
+	["flowers:tulip"]="R270",
+	["flowers:viola"]="R270",
+	["bucket:bucket_empty"]="R270",
+	["bucket:bucket_water"]="R270",
+	["bucket:bucket_lava"]="R270",
+	["screwdriver:screwdriver"]="R270",
+	["screwdriver:screwdriver1"]="R270",
+	["screwdriver:screwdriver2"]="R270",
+	["screwdriver:screwdriver3"]="R270",
+	["screwdriver:screwdriver4"]="R270",
+	["vessels:glass_bottle"]="R270",
+	["vessels:drinking_glass"]="R270",
+	["vessels:steel_bottle"]="R270",
+}
+