Version MFF

3d_armor/admin.lua

@@ -6,7 +6,7 @@ minetest.register_alias("adminleggings","3d_armor:leggings_admin")
 minetest.register_tool("3d_armor:helmet_admin", {
 	description = "Admin Helmet",
 	inventory_image = "3d_armor_inv_helmet_admin.png",
-	groups = {armor_head=1000, armor_heal=1000, armor_use=0, armor_water=1, not_in_creative_inventory=1},
+	groups = {armor_head=1000, armor_heal=1000, armor_use=0, armor_water=1,},
 	wear = 0,
 	on_drop = function(itemstack, dropper, pos)
 		return
@@ -16,7 +16,7 @@ minetest.register_tool("3d_armor:helmet_admin", {
 minetest.register_tool("3d_armor:chestplate_admin", {
 	description = "Admin Chestplate",
 	inventory_image = "3d_armor_inv_chestplate_admin.png",
-	groups = {armor_torso=1000, armor_heal=1000, armor_use=0, not_in_creative_inventory=1},
+	groups = {armor_torso=1000, armor_heal=1000, armor_use=0},
 	wear = 0,
 	on_drop = function(itemstack, dropper, pos)
 		return
@@ -26,7 +26,7 @@ minetest.register_tool("3d_armor:chestplate_admin", {
 minetest.register_tool("3d_armor:leggings_admin", {
 	description = "Admin Leggings",
 	inventory_image = "3d_armor_inv_leggings_admin.png",
-	groups = {armor_legs=1000, armor_heal=1000, armor_use=0, not_in_creative_inventory=1},
+	groups = {armor_legs=1000, armor_heal=1000, armor_use=0},
 	wear = 0,
 	on_drop = function(itemstack, dropper, pos)
 		return
@@ -36,7 +36,7 @@ minetest.register_tool("3d_armor:leggings_admin", {
 minetest.register_tool("3d_armor:boots_admin", {
 	description = "Admin Boots",
 	inventory_image = "3d_armor_inv_boots_admin.png",
-	groups = {armor_feet=1000, armor_heal=1000, armor_use=0, not_in_creative_inventory=1},
+	groups = {armor_feet=1000, armor_heal=1000, armor_use=0},
 	wear = 0,
 	on_drop = function(itemstack, dropper, pos)
 		return

3d_armor/armor.conf.example

@@ -9,7 +9,7 @@ ARMOR_MATERIALS = {
 	bronze = "default:bronze_ingot",
 	diamond = "default:diamond",
 	gold = "default:gold_ingot",
-	mithril = "moreores:mithril_ingot",
+	mithril = "default:mithril_ingot",
 	crystal = "ethereal:crystal_ingot",
 }
 
@@ -55,7 +55,3 @@ ARMOR_LEVEL_MULTIPLIER = 1
 -- eg: ARMOR_HEAL_MULTIPLIER = 0 will disable healing altogether.
 ARMOR_HEAL_MULTIPLIER = 1
 
--- You can use this to increase or decrease overall armor radiation protection,
--- eg: ARMOR_RADIATION_MULTIPLIER = 0 will completely disable radiation protection.
--- Note: patched technic mod is required
-ARMOR_RADIATION_MULTIPLIER = 1

3d_armor/armor.lua

@@ -1,3 +1,10 @@
+local armors_no_shields = { ["3d_armor:helmet_hardenedleather"] = true,["3d_armor:chestplate_hardenedleather"] = true,
+							["3d_armor:leggings_hardenedleather"] = true,["3d_armor:boots_hardenedleather"] = true,
+							["3d_armor:helmet_reinforcedleather"] = true,["3d_armor:chestplate_reinforcedleather"] = true,
+							["3d_armor:leggings_reinforcedleather"] = true,["3d_armor:boots_reinforcedleather"] = true,
+} -- modif MFF (crabman/24/06/2015)
+
+
 ARMOR_INIT_DELAY = 1
 ARMOR_INIT_TIMES = 1
 ARMOR_BONES_DELAY = 1
@@ -14,8 +21,16 @@ ARMOR_MATERIALS = {
 	bronze = "default:bronze_ingot",
 	diamond = "default:diamond",
 	gold = "default:gold_ingot",
-	mithril = "moreores:mithril_ingot",
+	mithril = "default:mithril_ingot",
 	crystal = "ethereal:crystal_ingot",
+	-- Hunter armors (A déc-ommenter quand activation de l'armure au total)
+	hardenedleather = "3d_armor:hardenedleather",
+	reinforcedleather = "3d_armor:reinforcedleather",
+	-- Warrior armors
+	blackmithril = "3d_armor:blackmithril_ingot"
+	-- Wizard armors
+	--armor = "xxx",
+	--armor = "xxx",
 }
 ARMOR_FIRE_PROTECT = minetest.get_modpath("ethereal") ~= nil
 ARMOR_FIRE_NODES = {
@@ -45,9 +60,6 @@ if input then
 	input:close()
 	input = nil
 end
-if not minetest.get_modpath("moreores") then
-	ARMOR_MATERIALS.mithril = nil
-end
 if not minetest.get_modpath("ethereal") then
 	ARMOR_MATERIALS.crystal = nil
 end
@@ -85,6 +97,8 @@ elseif minetest.get_modpath("unified_inventory") then
 	unified_inventory.register_button("armor", {
 		type = "image",
 		image = "inventory_plus_armor.png",
+		tooltip = "Armor inventory",
+		show_with = false, --Modif MFF (Crabman 30/06/2015)
 	})
 	unified_inventory.register_page("armor", {
 		get_formspec = function(player, perplayer_formspec)
@@ -95,9 +109,12 @@ elseif minetest.get_modpath("unified_inventory") then
 				.."list[detached:"..name.."_armor;armor;0,"..fy..";2,3;]"
 				.."image[2.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]"
 				.."label[5.0,"..(fy + 0.0)..";Level: "..armor.def[name].level.."]"
-				.."label[5.0,"..(fy + 0.5)..";Heal:  "..armor.def[name].heal.."]"
-				.."label[5.0,"..(fy + 1.0)..";Fire:  "..armor.def[name].fire.."]"
-				.."label[5.0,"..(fy + 1.5)..";Radiation:  "..armor.def[name].radiation.."]"
+				.."label[5.0,"..(fy + 0.4)..";Heal:  "..armor.def[name].heal.."]"
+				.."label[5.0,"..(fy + 0.8)..";Fire:  "..armor.def[name].fire.."]"
+				.."label[5.0,"..(fy + 1.2)..";Radiation:  "..armor.def[name].radiation.."]"
+				.."label[5.0,"..(fy + 1.6)..";Speed:  "..armor.def[name].speed.."]"
+				.."label[5.0,"..(fy + 2)..";Jump:  "..armor.def[name].jump.."]"
+				.."label[5.0,"..(fy + 2.4)..";Gravity:  "..armor.def[name].gravity.."]"
 				.."listring[current_player;main]"
 				.."listring[detached:"..name.."_armor;armor]"
 			return {formspec=formspec}
@@ -153,7 +170,7 @@ armor.set_player_armor = function(self, player)
 	local textures = {}
 	local physics_o = {speed=1,gravity=1,jump=1}
 	local material = {type=nil, count=1}
-	local preview = armor:get_preview(name) or "character_preview.png"
+	local preview = ""
 	for _,v in ipairs(self.elements) do
 		elements[v] = false
 	end
@@ -166,9 +183,20 @@ armor.set_player_armor = function(self, player)
 				if v == false then
 					local level = def.groups["armor_"..k]
 					if level then
-						local texture = def.texture or item:gsub("%:", "_")
+						local texture = item:gsub("%:", "_")
+						if texture:find("enchanted") then --MFF xdecor enchanting preview fix
+							texture = texture:gsub("_enchanted", "")
+							texture = texture:gsub("_strong", "")
+							texture = texture:gsub("_speed", "")
+						end
 						table.insert(textures, texture..".png")
+						if preview == "" then
+							preview = texture .. "_preview.png"
+						elseif stack:get_name():find("shield") then -- //MFF(Mg|09/05/15)
 							preview = preview.. "^" .. texture.."_preview.png"
+						else
+							preview = texture .. "_preview.png^" .. preview
+						end
 						armor_level = armor_level + level
 						state = state + stack:get_wear()
 						items = items + 1
@@ -196,6 +224,10 @@ armor.set_player_armor = function(self, player)
 			end
 		end
 	end
+	if preview ~= "" then
+		preview = "^" .. preview
+	end
+	preview = armor:get_preview(name) .. preview -- //MFF(Mg|09/05/15)
 	if minetest.get_modpath("shields") then
 		armor_level = armor_level * 0.9
 	end
@@ -215,7 +247,9 @@ armor.set_player_armor = function(self, player)
 		armor_groups.radiation = 100 - armor_radiation
 	end
 	player:set_armor_groups(armor_groups)
-	player:set_physics_override(physics_o)
+	--player:set_physics_override(physics_o)
+	player_physics.set_stats(player, "3d_armor", {speed=physics_o.speed-1, jump=physics_o.jump-1, gravity=physics_o.gravity-1})
+	pclasses.api.util.on_update(name)
 	self.textures[name].armor = armor_texture
 	self.textures[name].preview = preview
 	self.def[name].state = state
@@ -251,7 +285,10 @@ end
 armor.get_preview = function(self, name)
 	if skin_mod == "skins" then
 		return armor:get_player_skin(name).."_preview.png"
+	elseif skin_mod == "u_skins"then
+		return string.gsub(armor.textures[name].skin, ".png", "_preview.png")
 	end
+	return "character_preview.png"
 end
 
 armor.get_armor_formspec = function(self, name)
@@ -269,6 +306,9 @@ armor.get_armor_formspec = function(self, name)
 	formspec = formspec:gsub("armor_heal", armor.def[name].heal)
 	formspec = formspec:gsub("armor_fire", armor.def[name].fire)
 	formspec = formspec:gsub("armor_radiation", armor.def[name].radiation)
+	formspec = formspec:gsub("armor_speed", armor.def[name].speed)
+	formspec = formspec:gsub("armor_jump", armor.def[name].jump)
+	formspec = formspec:gsub("armor_gravity", armor.def[name].gravity)
 	return formspec
 end
 
@@ -290,7 +330,7 @@ armor.update_inventory = function(self, player)
 			if page:find("detached:"..name.."_armor") then
 				inventory_plus.set_inventory_formspec(player, formspec)
 			end
-		elseif not core.setting_getbool("creative_mode") then
+		else
 			player:set_inventory_formspec(formspec)
 		end
 	end
@@ -382,13 +422,63 @@ minetest.register_on_joinplayer(function(player)
 		end,
 		on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
 			local plaver_inv = player:get_inventory()
+			local old_stack = inv:get_stack(from_list, from_index)
 			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)
+			player_inv:set_stack(from_list, from_index, old_stack)
 			armor:set_player_armor(player)
 			armor:update_inventory(player)
 		end,
 		allow_put = function(inv, listname, index, stack, player)
+			--DEBUT modif MFF (crabman/24/06/2015)
+			local name = stack:get_name()
+			local player_inv = player:get_inventory()
+			local size = player_inv:get_size(listname)
+			if not ( (name:split(":")[1] == "3d_armor" and stack:get_definition().groups["armor_heal"]) or name:split(":")[1] == "shields") then
+				return 0
+			end
+
+			-- if player class != item class
+			if not pclasses.api.util.can_have_item(player:get_player_name(), name) then
+				return 0
+			end
+
+			--MFF (crabman/27/11/2015) no same item type. *helmet*
+			local ptype = name:split(":")[2]:split("_")[1]
+			if ptype == "enchanted" then
+			   ptype = name:split(":")[2]:split("_")[2]
+			end
+			for i=1, size do
+				local stack = player_inv:get_stack(listname, i)
+				if stack:get_count() > 0 then
+					if stack:get_name():find(ptype) then
+						return 0
+					end
+				end
+			end
+
+			if name:find("shield") then
+				for i=1, size do
+					local stack = player_inv:get_stack(listname, i)
+					if stack:get_count() > 0 then
+						if armors_no_shields[stack:get_name()] ~= nil then
+							return 0
+						end
+					end
+				end
+			else
+				if armors_no_shields[name] ~= nil then
+					for i=1, size do
+						local stack = player_inv:get_stack(listname, i)
+						if stack:get_count() > 0 then
+							if stack:get_name():find("shields:") then
+								return 0
+							end
+						end
+					end
+				end
+			end
+			--FIN modif MFF (crabman/24/06/2015)
 			return 1
 		end,
 		allow_take = function(inv, listname, index, stack, player)
@@ -463,7 +553,7 @@ minetest.register_on_joinplayer(function(player)
 		end, player)
 	end
 end)
-
+--[[
 if ARMOR_DROP == true or ARMOR_DESTROY == true then
 	armor.drop_armor = function(pos, stack)
 		local obj = minetest.add_item(pos, stack)
@@ -479,7 +569,9 @@ if ARMOR_DROP == true or ARMOR_DESTROY == true then
 		local drop = {}
 		for i=1, player_inv:get_size("armor") do
 			local stack = armor_inv:get_stack("armor", i)
-			if stack:get_count() > 0 then
+			-- Modification for MFF
+			if stack:get_count() > 0 and (not pclasses.data.reserved_items[armor_inv:get_stack("armor", i):get_name()] or
+	            not pclasses.api.util.can_have_item(name, armor_inv:get_stack("armor", i):get_name())) then
 				table.insert(drop, stack)
 				armor_inv:set_stack("armor", i, nil)
 				player_inv:set_stack("armor", i, nil)
@@ -497,15 +589,8 @@ if ARMOR_DROP == true or ARMOR_DESTROY == true then
 		if ARMOR_DESTROY == false then
 			minetest.after(ARMOR_BONES_DELAY, function()
 				local node = minetest.get_node(vector.round(pos))
-				if node then
-					if node.name ~= "bones:bones" then
-						pos.y = pos.y+1
-						node = minetest.get_node(vector.round(pos))
-						if node.name ~= "bones:bones" then
-							minetest.log("warning", "Failed to add armor to bones node.")
-							return
-						end
-					end
+				-- Modification for MFF
+				if node and node.name == "bones:bones" then
 					local meta = minetest.get_meta(vector.round(pos))
 					local owner = meta:get_string("owner")
 					local inv = meta:get_inventory()
@@ -525,6 +610,7 @@ if ARMOR_DROP == true or ARMOR_DESTROY == true then
 		end
 	end)
 end
+--]]
 
 minetest.register_on_player_hpchange(function(player, hp_change)
 	local name, player_inv, armor_inv = armor:get_valid_player(player, "[on_hpchange]")
@@ -581,14 +667,10 @@ if ARMOR_FIRE_PROTECT == true then
 		end
 	end
 else
-	print ("[3d_armor] Fire Nodes disabled")
+	minetest.log("info", "[3d_armor] Fire Nodes disabled")
 end
 
-minetest.register_globalstep(function(dtime)
-	armor.timer = armor.timer + dtime
-	if armor.timer < ARMOR_UPDATE_TIME then
-		return
-	end
+function armor_step()
 	for _,player in pairs(minetest.get_connected_players()) do
 		local name = player:get_player_name()
 		local pos = player:getpos()
@@ -619,8 +701,12 @@ minetest.register_globalstep(function(dtime)
 			end
 		end
 	end
-	armor.timer = 0
-end)
+	minetest.after(ARMOR_UPDATE_TIME, armor_step)
+end
+
+-- Launch once started
+minetest.after(0, armor_step)
+
 
 -- kill player when command issued
 minetest.register_chatcommand("kill", {

3d_armor/crafting_guide.txt

@@ -17,8 +17,8 @@ Helmets:
 [3d_armor:helmet_bronze] X = [default:bronze_ingot]
 [3d_armor:helmet_diamond] X = [default:diamond]
 [3d_armor:helmet_gold] X = [default:gold_ingot]
-[3d_armor:helmet_mithril] X = [moreores:mithril_ingot] *
-[3d_armor:helmet_crystal] X = [ethereal:crystal_ingot] **
+[3d_armor:helmet_mithril] X = [default:mithril_ingot]
+[3d_armor:helmet_crystal] X = [ethereal:crystal_ingot] *
 
 Chestplates:
 
@@ -36,8 +36,8 @@ Chestplates:
 [3d_armor:chestplate_bronze] X = [default:bronze_ingot]
 [3d_armor:chestplate_diamond] X = [default:diamond]
 [3d_armor:chestplate_gold] X = [default:gold_ingot]
-[3d_armor:chestplate_mithril] X = [moreores:mithril_ingot] *
-[3d_armor:chestplate_crystal] X = [ethereal:crystal_ingot] **
+[3d_armor:chestplate_mithril] X = [default:mithril_ingot]
+[3d_armor:chestplate_crystal] X = [ethereal:crystal_ingot] *
 
 Leggings:
 
@@ -55,8 +55,8 @@ Leggings:
 [3d_armor:leggings_bronze] X = [default:bronze_ingot]
 [3d_armor:leggings_diamond] X = [default:diamond]
 [3d_armor:leggings_gold] X = [default:gold_ingot]
-[3d_armor:leggings_mithril] X = [moreores:mithril_ingot] *
-[3d_armor:leggings_crystal] X = [ethereal:crystal_ingot] **
+[3d_armor:leggings_mithril] X = [default:mithril_ingot]
+[3d_armor:leggings_crystal] X = [ethereal:crystal_ingot] *
 
 Boots:
 
@@ -72,8 +72,7 @@ Boots:
 [3d_armor:boots_bronze] X = [default:bronze_ingot
 [3d_armor:boots_diamond] X = [default:diamond]
 [3d_armor:boots_gold] X = [default:gold_ingot]
-[3d_armor:boots_mithril] X = [moreores:mithril_ingot] *
-[3d_armor:boots_crystal] X = [ethereal:crystal_ingot] **
+[3d_armor:boots_mithril] X = [default:mithril_ingot]
+[3d_armor:boots_crystal] X = [ethereal:crystal_ingot] *
 
- * Requires moreores mod by Calinou - https://forum.minetest.net/viewtopic.php?id=549
-** Requires ethereal mod by Chinchow & TenPlus1 - https://github.com/tenplus1/ethereal
+ * Requires ethereal mod by Chinchow & TenPlus1 - https://github.com/tenplus1/ethereal

3d_armor/depends.txt

@@ -1,4 +1,5 @@
 default
+player_physics
 inventory_plus?
 unified_inventory?
 fire?

3d_armor/init.lua

@@ -6,40 +6,40 @@ if ARMOR_MATERIALS.wood then
 	minetest.register_tool("3d_armor:helmet_wood", {
 		description = "Wood Helmet",
 		inventory_image = "3d_armor_inv_helmet_wood.png",
-		groups = {armor_head=5, armor_heal=0, armor_use=2000},
+		groups = {armor_head=1, armor_heal=0, armor_use=2000},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:chestplate_wood", {
 		description = "Wood Chestplate",
 		inventory_image = "3d_armor_inv_chestplate_wood.png",
-		groups = {armor_torso=10, armor_heal=0, armor_use=2000},
+		groups = {armor_torso=3, armor_heal=0, armor_use=2000},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:leggings_wood", {
 		description = "Wood Leggings",
 		inventory_image = "3d_armor_inv_leggings_wood.png",
-		groups = {armor_legs=5, armor_heal=0, armor_use=2000},
+		groups = {armor_legs=3, armor_heal=0, armor_use=2000},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:boots_wood", {
 		description = "Wood Boots",
 		inventory_image = "3d_armor_inv_boots_wood.png",
-		groups = {armor_feet=5, armor_heal=0, armor_use=2000},
+		groups = {armor_feet=1, armor_heal=0, armor_use=2000},
 		wear = 0,
 	})
 end
 
 if ARMOR_MATERIALS.cactus then
 	minetest.register_tool("3d_armor:helmet_cactus", {
-		description = "Cactuc Helmet",
+		description = "Cactus Helmet",
 		inventory_image = "3d_armor_inv_helmet_cactus.png",
-		groups = {armor_head=5, armor_heal=0, armor_use=1000},
+		groups = {armor_head=3, armor_heal=0, armor_use=1000},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:chestplate_cactus", {
 		description = "Cactus Chestplate",
 		inventory_image = "3d_armor_inv_chestplate_cactus.png",
-		groups = {armor_torso=10, armor_heal=0, armor_use=1000},
+		groups = {armor_torso=5, armor_heal=0, armor_use=1000},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:leggings_cactus", {
@@ -51,7 +51,7 @@ if ARMOR_MATERIALS.cactus then
 	minetest.register_tool("3d_armor:boots_cactus", {
 		description = "Cactus Boots",
 		inventory_image = "3d_armor_inv_boots_cactus.png",
-		groups = {armor_feet=5, armor_heal=0, armor_use=2000},
+		groups = {armor_feet=3, armor_heal=0, armor_use=1000},
 		wear = 0,
 	})
 end
@@ -60,25 +60,25 @@ if ARMOR_MATERIALS.steel then
 	minetest.register_tool("3d_armor:helmet_steel", {
 		description = "Steel Helmet",
 		inventory_image = "3d_armor_inv_helmet_steel.png",
-		groups = {armor_head=10, armor_heal=0, armor_use=500},
+		groups = {armor_head=4, armor_heal=0, armor_use=500},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:chestplate_steel", {
 		description = "Steel Chestplate",
 		inventory_image = "3d_armor_inv_chestplate_steel.png",
-		groups = {armor_torso=15, armor_heal=0, armor_use=500},
+		groups = {armor_torso=8, armor_heal=0, armor_use=500},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:leggings_steel", {
 		description = "Steel Leggings",
 		inventory_image = "3d_armor_inv_leggings_steel.png",
-		groups = {armor_legs=15, armor_heal=0, armor_use=500},
+		groups = {armor_legs=8, armor_heal=0, armor_use=500},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:boots_steel", {
 		description = "Steel Boots",
 		inventory_image = "3d_armor_inv_boots_steel.png",
-		groups = {armor_feet=10, armor_heal=0, armor_use=500},
+		groups = {armor_feet=4, armor_heal=0, armor_use=500},
 		wear = 0,
 	})
 end
@@ -87,25 +87,25 @@ if ARMOR_MATERIALS.bronze then
 	minetest.register_tool("3d_armor:helmet_bronze", {
 		description = "Bronze Helmet",
 		inventory_image = "3d_armor_inv_helmet_bronze.png",
-		groups = {armor_head=10, armor_heal=6, armor_use=250},
+		groups = {armor_head=5, armor_heal=0, armor_use=250},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:chestplate_bronze", {
 		description = "Bronze Chestplate",
 		inventory_image = "3d_armor_inv_chestplate_bronze.png",
-		groups = {armor_torso=15, armor_heal=6, armor_use=250},
+		groups = {armor_torso=9, armor_heal=0, armor_use=250},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:leggings_bronze", {
 		description = "Bronze Leggings",
 		inventory_image = "3d_armor_inv_leggings_bronze.png",
-		groups = {armor_legs=15, armor_heal=6, armor_use=250},
+		groups = {armor_legs=9, armor_heal=0, armor_use=250},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:boots_bronze", {
 		description = "Bronze Boots",
 		inventory_image = "3d_armor_inv_boots_bronze.png",
-		groups = {armor_feet=10, armor_heal=6, armor_use=250},
+		groups = {armor_feet=5, armor_heal=0, armor_use=250},
 		wear = 0,
 	})
 end
@@ -114,25 +114,25 @@ if ARMOR_MATERIALS.diamond then
 	minetest.register_tool("3d_armor:helmet_diamond", {
 		description = "Diamond Helmet",
 		inventory_image = "3d_armor_inv_helmet_diamond.png",
-		groups = {armor_head=15, armor_heal=12, armor_use=100},
+		groups = {armor_head=7, armor_heal=0, armor_use=100},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:chestplate_diamond", {
 		description = "Diamond Chestplate",
 		inventory_image = "3d_armor_inv_chestplate_diamond.png",
-		groups = {armor_torso=20, armor_heal=12, armor_use=100},
+		groups = {armor_torso=13, armor_heal=0, armor_use=100},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:leggings_diamond", {
 		description = "Diamond Leggings",
 		inventory_image = "3d_armor_inv_leggings_diamond.png",
-		groups = {armor_legs=20, armor_heal=12, armor_use=100},
+		groups = {armor_legs=13, armor_heal=0, armor_use=100},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:boots_diamond", {
 		description = "Diamond Boots",
 		inventory_image = "3d_armor_inv_boots_diamond.png",
-		groups = {armor_feet=15, armor_heal=12, armor_use=100},
+		groups = {armor_feet=7, armor_heal=0, armor_use=100},
 		wear = 0,
 	})
 end
@@ -141,52 +141,52 @@ if ARMOR_MATERIALS.gold then
 	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},
+		groups = {armor_head=5, armor_heal=0, armor_use=200},
 		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},
+		groups = {armor_torso=11, armor_heal=0, armor_use=200},
 		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},
+		groups = {armor_legs=11, armor_heal=0, armor_use=200},
 		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},
+		groups = {armor_feet=5, armor_heal=0, armor_use=200},
 		wear = 0,
 	})
 end
 
 if ARMOR_MATERIALS.mithril then
 	minetest.register_tool("3d_armor:helmet_mithril", {
-		description = "Mithril Helmet",
+		description = "Mithril Helmet (Warrior)",
 		inventory_image = "3d_armor_inv_helmet_mithril.png",
-		groups = {armor_head=15, armor_heal=12, armor_use=50},
+		groups = {armor_head=9, armor_heal=0, armor_use=50},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:chestplate_mithril", {
-		description = "Mithril Chestplate",
+		description = "Mithril Chestplate (Warrior)",
 		inventory_image = "3d_armor_inv_chestplate_mithril.png",
-		groups = {armor_torso=20, armor_heal=12, armor_use=50},
+		groups = {armor_torso=15, armor_heal=0, armor_use=50},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:leggings_mithril", {
-		description = "Mithril Leggings",
+		description = "Mithril Leggings (Warrior)",
 		inventory_image = "3d_armor_inv_leggings_mithril.png",
-		groups = {armor_legs=20, armor_heal=12, armor_use=50},
+		groups = {armor_legs=15, armor_heal=0, armor_use=50},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:boots_mithril", {
-		description = "Mithril Boots",
+		description = "Mithril Boots (Warrior)",
 		inventory_image = "3d_armor_inv_boots_mithril.png",
-		groups = {armor_feet=15, armor_heal=12, armor_use=50},
+		groups = {armor_feet=9, armor_heal=0, armor_use=50},
 		wear = 0,
 	})
 end
@@ -195,25 +195,25 @@ if ARMOR_MATERIALS.crystal then
 	minetest.register_tool("3d_armor:helmet_crystal", {
 		description = "Crystal Helmet",
 		inventory_image = "3d_armor_inv_helmet_crystal.png",
-		groups = {armor_head=15, armor_heal=12, armor_use=50, armor_fire=1},
+		groups = {armor_head=15, armor_heal=0, armor_use=50, armor_fire=1},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:chestplate_crystal", {
 		description = "Crystal Chestplate",
 		inventory_image = "3d_armor_inv_chestplate_crystal.png",
-		groups = {armor_torso=20, armor_heal=12, armor_use=50, armor_fire=1},
+		groups = {armor_torso=20, armor_heal=0, armor_use=50, armor_fire=1},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:leggings_crystal", {
 		description = "Crystal Leggings",
 		inventory_image = "3d_armor_inv_leggings_crystal.png",
-		groups = {armor_legs=20, armor_heal=12, armor_use=50, armor_fire=1},
+		groups = {armor_legs=20, armor_heal=0, armor_use=50, armor_fire=1},
 		wear = 0,
 	})
 	minetest.register_tool("3d_armor:boots_crystal", {
 		description = "Crystal Boots",
 		inventory_image = "3d_armor_inv_boots_crystal.png",
-		groups = {armor_feet=15, armor_heal=12, armor_use=50, physics_speed=1, physics_jump=0.5, armor_fire=1},
+		groups = {armor_feet=15, armor_heal=0, armor_use=50, physics_speed=1, physics_jump=0.5, armor_fire=1},
 		wear = 0,
 	})
 end