diff --git a/3d_armor/admin.lua b/3d_armor/admin.lua index f499987..eaa71ad 100644 --- a/3d_armor/admin.lua +++ b/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 diff --git a/3d_armor/armor.conf.example b/3d_armor/armor.conf.example index 75e072d..2e1149a 100644 --- a/3d_armor/armor.conf.example +++ b/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 diff --git a/3d_armor/armor.lua b/3d_armor/armor.lua index 2bd865d..6f561db 100644 --- a/3d_armor/armor.lua +++ b/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") - preview = preview.."^"..texture.."_preview.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", { diff --git a/3d_armor/crafting_guide.txt b/3d_armor/crafting_guide.txt index abd1519..2086f8c 100644 --- a/3d_armor/crafting_guide.txt +++ b/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 diff --git a/3d_armor/depends.txt b/3d_armor/depends.txt index 3acf737..0dd76f9 100644 --- a/3d_armor/depends.txt +++ b/3d_armor/depends.txt @@ -1,4 +1,5 @@ default +player_physics inventory_plus? unified_inventory? fire? diff --git a/3d_armor/init.lua b/3d_armor/init.lua index 4a2116f..f8aa862 100644 --- a/3d_armor/init.lua +++ b/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 diff --git a/3d_armor/models/3d_armor_character.b3d b/3d_armor/models/3d_armor_character.b3d index a24cb65..278956b 100644 Binary files a/3d_armor/models/3d_armor_character.b3d and b/3d_armor/models/3d_armor_character.b3d differ diff --git a/3d_armor/models/3d_armor_character.blend b/3d_armor/models/3d_armor_character.blend index d2031ce..5ded978 100644 Binary files a/3d_armor/models/3d_armor_character.blend and b/3d_armor/models/3d_armor_character.blend differ diff --git a/3d_armor/textures/3d_armor_boots_admin.png b/3d_armor/textures/3d_armor_boots_admin.png index a05e4c5..e9fa153 100644 Binary files a/3d_armor/textures/3d_armor_boots_admin.png and b/3d_armor/textures/3d_armor_boots_admin.png differ diff --git a/3d_armor/textures/3d_armor_boots_admin_preview.png b/3d_armor/textures/3d_armor_boots_admin_preview.png index d61ab25..9ef1884 100644 Binary files a/3d_armor/textures/3d_armor_boots_admin_preview.png and b/3d_armor/textures/3d_armor_boots_admin_preview.png differ diff --git a/3d_armor/textures/3d_armor_boots_bronze.png b/3d_armor/textures/3d_armor_boots_bronze.png index 7cfe378..05fb1e8 100644 Binary files a/3d_armor/textures/3d_armor_boots_bronze.png and b/3d_armor/textures/3d_armor_boots_bronze.png differ diff --git a/3d_armor/textures/3d_armor_boots_bronze_preview.png b/3d_armor/textures/3d_armor_boots_bronze_preview.png index 6da8019..5b00282 100644 Binary files a/3d_armor/textures/3d_armor_boots_bronze_preview.png and b/3d_armor/textures/3d_armor_boots_bronze_preview.png differ diff --git a/3d_armor/textures/3d_armor_boots_cactus.png b/3d_armor/textures/3d_armor_boots_cactus.png index 7dc43e3..a4d8d8f 100644 Binary files a/3d_armor/textures/3d_armor_boots_cactus.png and b/3d_armor/textures/3d_armor_boots_cactus.png differ diff --git a/3d_armor/textures/3d_armor_boots_cactus_preview.png b/3d_armor/textures/3d_armor_boots_cactus_preview.png index 33f9221..b77493d 100644 Binary files a/3d_armor/textures/3d_armor_boots_cactus_preview.png and b/3d_armor/textures/3d_armor_boots_cactus_preview.png differ diff --git a/3d_armor/textures/3d_armor_boots_crystal.png b/3d_armor/textures/3d_armor_boots_crystal.png index 50bbf20..c4ccdc2 100644 Binary files a/3d_armor/textures/3d_armor_boots_crystal.png and b/3d_armor/textures/3d_armor_boots_crystal.png differ diff --git a/3d_armor/textures/3d_armor_boots_crystal_preview.png b/3d_armor/textures/3d_armor_boots_crystal_preview.png index a3ab7d1..494c6ee 100644 Binary files a/3d_armor/textures/3d_armor_boots_crystal_preview.png and b/3d_armor/textures/3d_armor_boots_crystal_preview.png differ diff --git a/3d_armor/textures/3d_armor_boots_diamond.png b/3d_armor/textures/3d_armor_boots_diamond.png index 6678b16..c37e2e7 100644 Binary files a/3d_armor/textures/3d_armor_boots_diamond.png and b/3d_armor/textures/3d_armor_boots_diamond.png differ diff --git a/3d_armor/textures/3d_armor_boots_diamond_preview.png b/3d_armor/textures/3d_armor_boots_diamond_preview.png index eb99c4e..b7e01d4 100644 Binary files a/3d_armor/textures/3d_armor_boots_diamond_preview.png and b/3d_armor/textures/3d_armor_boots_diamond_preview.png differ diff --git a/3d_armor/textures/3d_armor_boots_gold.png b/3d_armor/textures/3d_armor_boots_gold.png index 2de3966..17992c2 100644 Binary files a/3d_armor/textures/3d_armor_boots_gold.png and b/3d_armor/textures/3d_armor_boots_gold.png differ diff --git a/3d_armor/textures/3d_armor_boots_gold_preview.png b/3d_armor/textures/3d_armor_boots_gold_preview.png index 5ca40ac..c6b55b2 100644 Binary files a/3d_armor/textures/3d_armor_boots_gold_preview.png and b/3d_armor/textures/3d_armor_boots_gold_preview.png differ diff --git a/3d_armor/textures/3d_armor_boots_mithril.png b/3d_armor/textures/3d_armor_boots_mithril.png index 3e4173b..0004786 100644 Binary files a/3d_armor/textures/3d_armor_boots_mithril.png and b/3d_armor/textures/3d_armor_boots_mithril.png differ diff --git a/3d_armor/textures/3d_armor_boots_mithril_preview.png b/3d_armor/textures/3d_armor_boots_mithril_preview.png index b0c4684..308194f 100644 Binary files a/3d_armor/textures/3d_armor_boots_mithril_preview.png and b/3d_armor/textures/3d_armor_boots_mithril_preview.png differ diff --git a/3d_armor/textures/3d_armor_boots_steel.png b/3d_armor/textures/3d_armor_boots_steel.png index 4664be5..0a7e2cb 100644 Binary files a/3d_armor/textures/3d_armor_boots_steel.png and b/3d_armor/textures/3d_armor_boots_steel.png differ diff --git a/3d_armor/textures/3d_armor_boots_steel_preview.png b/3d_armor/textures/3d_armor_boots_steel_preview.png index 25fc47a..c73a6e8 100644 Binary files a/3d_armor/textures/3d_armor_boots_steel_preview.png and b/3d_armor/textures/3d_armor_boots_steel_preview.png differ diff --git a/3d_armor/textures/3d_armor_boots_wood.png b/3d_armor/textures/3d_armor_boots_wood.png index 0ec5d6c..50371af 100644 Binary files a/3d_armor/textures/3d_armor_boots_wood.png and b/3d_armor/textures/3d_armor_boots_wood.png differ diff --git a/3d_armor/textures/3d_armor_boots_wood_preview.png b/3d_armor/textures/3d_armor_boots_wood_preview.png index 53d6d15..7f12ffb 100644 Binary files a/3d_armor/textures/3d_armor_boots_wood_preview.png and b/3d_armor/textures/3d_armor_boots_wood_preview.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_admin.png b/3d_armor/textures/3d_armor_chestplate_admin.png index 404d6e8..ff580a3 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_admin.png and b/3d_armor/textures/3d_armor_chestplate_admin.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_admin_preview.png b/3d_armor/textures/3d_armor_chestplate_admin_preview.png index 09325a5..59d729b 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_admin_preview.png and b/3d_armor/textures/3d_armor_chestplate_admin_preview.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_bronze.png b/3d_armor/textures/3d_armor_chestplate_bronze.png index d9c7267..6a6957e 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_bronze.png and b/3d_armor/textures/3d_armor_chestplate_bronze.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_bronze_preview.png b/3d_armor/textures/3d_armor_chestplate_bronze_preview.png index 90d887a..d8b1478 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_bronze_preview.png and b/3d_armor/textures/3d_armor_chestplate_bronze_preview.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_cactus.png b/3d_armor/textures/3d_armor_chestplate_cactus.png index ee433de..49c07dd 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_cactus.png and b/3d_armor/textures/3d_armor_chestplate_cactus.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_cactus_preview.png b/3d_armor/textures/3d_armor_chestplate_cactus_preview.png index 32bf6f6..bfde0c2 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_cactus_preview.png and b/3d_armor/textures/3d_armor_chestplate_cactus_preview.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_crystal.png b/3d_armor/textures/3d_armor_chestplate_crystal.png index e36aa49..9ed661a 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_crystal.png and b/3d_armor/textures/3d_armor_chestplate_crystal.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_crystal_preview.png b/3d_armor/textures/3d_armor_chestplate_crystal_preview.png index c43015c..febb1dc 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_crystal_preview.png and b/3d_armor/textures/3d_armor_chestplate_crystal_preview.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_diamond.png b/3d_armor/textures/3d_armor_chestplate_diamond.png index 81a7b21..a1750b6 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_diamond.png and b/3d_armor/textures/3d_armor_chestplate_diamond.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_diamond_preview.png b/3d_armor/textures/3d_armor_chestplate_diamond_preview.png index 17e2eb8..69b13f6 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_diamond_preview.png and b/3d_armor/textures/3d_armor_chestplate_diamond_preview.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_gold.png b/3d_armor/textures/3d_armor_chestplate_gold.png index 91b1631..dd872ab 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_gold.png and b/3d_armor/textures/3d_armor_chestplate_gold.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_gold_preview.png b/3d_armor/textures/3d_armor_chestplate_gold_preview.png index cb11321..9381b9e 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_gold_preview.png and b/3d_armor/textures/3d_armor_chestplate_gold_preview.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_mithril.png b/3d_armor/textures/3d_armor_chestplate_mithril.png index 2bbeab8..a8193fb 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_mithril.png and b/3d_armor/textures/3d_armor_chestplate_mithril.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_mithril_preview.png b/3d_armor/textures/3d_armor_chestplate_mithril_preview.png index eca051c..993b9d2 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_mithril_preview.png and b/3d_armor/textures/3d_armor_chestplate_mithril_preview.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_steel.png b/3d_armor/textures/3d_armor_chestplate_steel.png index 23cdbda..ee1a73a 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_steel.png and b/3d_armor/textures/3d_armor_chestplate_steel.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_steel_preview.png b/3d_armor/textures/3d_armor_chestplate_steel_preview.png index 0e45907..33fb2ab 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_steel_preview.png and b/3d_armor/textures/3d_armor_chestplate_steel_preview.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_wood.png b/3d_armor/textures/3d_armor_chestplate_wood.png index ea7a1d7..b39be33 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_wood.png and b/3d_armor/textures/3d_armor_chestplate_wood.png differ diff --git a/3d_armor/textures/3d_armor_chestplate_wood_preview.png b/3d_armor/textures/3d_armor_chestplate_wood_preview.png index cdca575..02b1f31 100644 Binary files a/3d_armor/textures/3d_armor_chestplate_wood_preview.png and b/3d_armor/textures/3d_armor_chestplate_wood_preview.png differ diff --git a/3d_armor/textures/3d_armor_helmet_admin.png b/3d_armor/textures/3d_armor_helmet_admin.png index 3a75a85..37e3bb9 100644 Binary files a/3d_armor/textures/3d_armor_helmet_admin.png and b/3d_armor/textures/3d_armor_helmet_admin.png differ diff --git a/3d_armor/textures/3d_armor_helmet_admin_preview.png b/3d_armor/textures/3d_armor_helmet_admin_preview.png index 51ecb9b..d653a25 100644 Binary files a/3d_armor/textures/3d_armor_helmet_admin_preview.png and b/3d_armor/textures/3d_armor_helmet_admin_preview.png differ diff --git a/3d_armor/textures/3d_armor_helmet_bronze.png b/3d_armor/textures/3d_armor_helmet_bronze.png index 91d15d7..4f50d22 100644 Binary files a/3d_armor/textures/3d_armor_helmet_bronze.png and b/3d_armor/textures/3d_armor_helmet_bronze.png differ diff --git a/3d_armor/textures/3d_armor_helmet_bronze_preview.png b/3d_armor/textures/3d_armor_helmet_bronze_preview.png index 61fa1af..ae44bfb 100644 Binary files a/3d_armor/textures/3d_armor_helmet_bronze_preview.png and b/3d_armor/textures/3d_armor_helmet_bronze_preview.png differ diff --git a/3d_armor/textures/3d_armor_helmet_cactus.png b/3d_armor/textures/3d_armor_helmet_cactus.png index 3021f20..80dfeae 100644 Binary files a/3d_armor/textures/3d_armor_helmet_cactus.png and b/3d_armor/textures/3d_armor_helmet_cactus.png differ diff --git a/3d_armor/textures/3d_armor_helmet_cactus_preview.png b/3d_armor/textures/3d_armor_helmet_cactus_preview.png index 4e3bfe2..ab3ad6e 100644 Binary files a/3d_armor/textures/3d_armor_helmet_cactus_preview.png and b/3d_armor/textures/3d_armor_helmet_cactus_preview.png differ diff --git a/3d_armor/textures/3d_armor_helmet_crystal.png b/3d_armor/textures/3d_armor_helmet_crystal.png index 7a2c774..f8ef044 100644 Binary files a/3d_armor/textures/3d_armor_helmet_crystal.png and b/3d_armor/textures/3d_armor_helmet_crystal.png differ diff --git a/3d_armor/textures/3d_armor_helmet_crystal_preview.png b/3d_armor/textures/3d_armor_helmet_crystal_preview.png index 451a15d..9c1735a 100644 Binary files a/3d_armor/textures/3d_armor_helmet_crystal_preview.png and b/3d_armor/textures/3d_armor_helmet_crystal_preview.png differ diff --git a/3d_armor/textures/3d_armor_helmet_diamond.png b/3d_armor/textures/3d_armor_helmet_diamond.png index e1768b3..6ce507c 100644 Binary files a/3d_armor/textures/3d_armor_helmet_diamond.png and b/3d_armor/textures/3d_armor_helmet_diamond.png differ diff --git a/3d_armor/textures/3d_armor_helmet_diamond_preview.png b/3d_armor/textures/3d_armor_helmet_diamond_preview.png index 33a273a..4dd76c1 100644 Binary files a/3d_armor/textures/3d_armor_helmet_diamond_preview.png and b/3d_armor/textures/3d_armor_helmet_diamond_preview.png differ diff --git a/3d_armor/textures/3d_armor_helmet_gold.png b/3d_armor/textures/3d_armor_helmet_gold.png index 4d701b4..eac5e6e 100644 Binary files a/3d_armor/textures/3d_armor_helmet_gold.png and b/3d_armor/textures/3d_armor_helmet_gold.png differ diff --git a/3d_armor/textures/3d_armor_helmet_gold_preview.png b/3d_armor/textures/3d_armor_helmet_gold_preview.png index d2e7ac8..f721408 100644 Binary files a/3d_armor/textures/3d_armor_helmet_gold_preview.png and b/3d_armor/textures/3d_armor_helmet_gold_preview.png differ diff --git a/3d_armor/textures/3d_armor_helmet_mithril.png b/3d_armor/textures/3d_armor_helmet_mithril.png index 916e69d..909154e 100644 Binary files a/3d_armor/textures/3d_armor_helmet_mithril.png and b/3d_armor/textures/3d_armor_helmet_mithril.png differ diff --git a/3d_armor/textures/3d_armor_helmet_mithril_preview.png b/3d_armor/textures/3d_armor_helmet_mithril_preview.png index a331f6a..567a7ec 100644 Binary files a/3d_armor/textures/3d_armor_helmet_mithril_preview.png and b/3d_armor/textures/3d_armor_helmet_mithril_preview.png differ diff --git a/3d_armor/textures/3d_armor_helmet_steel.png b/3d_armor/textures/3d_armor_helmet_steel.png index e0a5afd..2571105 100644 Binary files a/3d_armor/textures/3d_armor_helmet_steel.png and b/3d_armor/textures/3d_armor_helmet_steel.png differ diff --git a/3d_armor/textures/3d_armor_helmet_steel_preview.png b/3d_armor/textures/3d_armor_helmet_steel_preview.png index 2c8721c..bcc9398 100644 Binary files a/3d_armor/textures/3d_armor_helmet_steel_preview.png and b/3d_armor/textures/3d_armor_helmet_steel_preview.png differ diff --git a/3d_armor/textures/3d_armor_helmet_wood.png b/3d_armor/textures/3d_armor_helmet_wood.png index fd5f712..66b484a 100644 Binary files a/3d_armor/textures/3d_armor_helmet_wood.png and b/3d_armor/textures/3d_armor_helmet_wood.png differ diff --git a/3d_armor/textures/3d_armor_helmet_wood_preview.png b/3d_armor/textures/3d_armor_helmet_wood_preview.png index fe1cead..36a8976 100644 Binary files a/3d_armor/textures/3d_armor_helmet_wood_preview.png and b/3d_armor/textures/3d_armor_helmet_wood_preview.png differ diff --git a/3d_armor/textures/3d_armor_inv_boots_admin.png b/3d_armor/textures/3d_armor_inv_boots_admin.png index f94c844..b124c88 100644 Binary files a/3d_armor/textures/3d_armor_inv_boots_admin.png and b/3d_armor/textures/3d_armor_inv_boots_admin.png differ diff --git a/3d_armor/textures/3d_armor_inv_boots_bronze.png b/3d_armor/textures/3d_armor_inv_boots_bronze.png index 7f5f968..1f66bf9 100644 Binary files a/3d_armor/textures/3d_armor_inv_boots_bronze.png and b/3d_armor/textures/3d_armor_inv_boots_bronze.png differ diff --git a/3d_armor/textures/3d_armor_inv_boots_cactus.png b/3d_armor/textures/3d_armor_inv_boots_cactus.png index b665eb8..a5ec82c 100644 Binary files a/3d_armor/textures/3d_armor_inv_boots_cactus.png and b/3d_armor/textures/3d_armor_inv_boots_cactus.png differ diff --git a/3d_armor/textures/3d_armor_inv_boots_crystal.png b/3d_armor/textures/3d_armor_inv_boots_crystal.png index 5709a17..68cb6d1 100644 Binary files a/3d_armor/textures/3d_armor_inv_boots_crystal.png and b/3d_armor/textures/3d_armor_inv_boots_crystal.png differ diff --git a/3d_armor/textures/3d_armor_inv_boots_diamond.png b/3d_armor/textures/3d_armor_inv_boots_diamond.png index 6bcd620..262489c 100644 Binary files a/3d_armor/textures/3d_armor_inv_boots_diamond.png and b/3d_armor/textures/3d_armor_inv_boots_diamond.png differ diff --git a/3d_armor/textures/3d_armor_inv_boots_gold.png b/3d_armor/textures/3d_armor_inv_boots_gold.png index 8598cf9..00385cd 100644 Binary files a/3d_armor/textures/3d_armor_inv_boots_gold.png and b/3d_armor/textures/3d_armor_inv_boots_gold.png differ diff --git a/3d_armor/textures/3d_armor_inv_boots_mithril.png b/3d_armor/textures/3d_armor_inv_boots_mithril.png index a4c180d..f57efc0 100644 Binary files a/3d_armor/textures/3d_armor_inv_boots_mithril.png and b/3d_armor/textures/3d_armor_inv_boots_mithril.png differ diff --git a/3d_armor/textures/3d_armor_inv_boots_steel.png b/3d_armor/textures/3d_armor_inv_boots_steel.png index 77286b5..0a89d92 100644 Binary files a/3d_armor/textures/3d_armor_inv_boots_steel.png and b/3d_armor/textures/3d_armor_inv_boots_steel.png differ diff --git a/3d_armor/textures/3d_armor_inv_boots_wood.png b/3d_armor/textures/3d_armor_inv_boots_wood.png index 66993a1..b6a9244 100644 Binary files a/3d_armor/textures/3d_armor_inv_boots_wood.png and b/3d_armor/textures/3d_armor_inv_boots_wood.png differ diff --git a/3d_armor/textures/3d_armor_inv_chestplate_admin.png b/3d_armor/textures/3d_armor_inv_chestplate_admin.png index 29f3897..ee6254c 100644 Binary files a/3d_armor/textures/3d_armor_inv_chestplate_admin.png and b/3d_armor/textures/3d_armor_inv_chestplate_admin.png differ diff --git a/3d_armor/textures/3d_armor_inv_chestplate_bronze.png b/3d_armor/textures/3d_armor_inv_chestplate_bronze.png index da2f3e0..9ce96bc 100644 Binary files a/3d_armor/textures/3d_armor_inv_chestplate_bronze.png and b/3d_armor/textures/3d_armor_inv_chestplate_bronze.png differ diff --git a/3d_armor/textures/3d_armor_inv_chestplate_cactus.png b/3d_armor/textures/3d_armor_inv_chestplate_cactus.png index a695e78..eabccce 100644 Binary files a/3d_armor/textures/3d_armor_inv_chestplate_cactus.png and b/3d_armor/textures/3d_armor_inv_chestplate_cactus.png differ diff --git a/3d_armor/textures/3d_armor_inv_chestplate_crystal.png b/3d_armor/textures/3d_armor_inv_chestplate_crystal.png index 4d23066..d14de1b 100644 Binary files a/3d_armor/textures/3d_armor_inv_chestplate_crystal.png and b/3d_armor/textures/3d_armor_inv_chestplate_crystal.png differ diff --git a/3d_armor/textures/3d_armor_inv_chestplate_diamond.png b/3d_armor/textures/3d_armor_inv_chestplate_diamond.png index eee800b..73ae2f9 100644 Binary files a/3d_armor/textures/3d_armor_inv_chestplate_diamond.png and b/3d_armor/textures/3d_armor_inv_chestplate_diamond.png differ diff --git a/3d_armor/textures/3d_armor_inv_chestplate_gold.png b/3d_armor/textures/3d_armor_inv_chestplate_gold.png index 1dddc3d..387f526 100644 Binary files a/3d_armor/textures/3d_armor_inv_chestplate_gold.png and b/3d_armor/textures/3d_armor_inv_chestplate_gold.png differ diff --git a/3d_armor/textures/3d_armor_inv_chestplate_mithril.png b/3d_armor/textures/3d_armor_inv_chestplate_mithril.png index e4c50a7..f2cd956 100644 Binary files a/3d_armor/textures/3d_armor_inv_chestplate_mithril.png and b/3d_armor/textures/3d_armor_inv_chestplate_mithril.png differ diff --git a/3d_armor/textures/3d_armor_inv_chestplate_steel.png b/3d_armor/textures/3d_armor_inv_chestplate_steel.png index 421b3e3..32b5ab4 100644 Binary files a/3d_armor/textures/3d_armor_inv_chestplate_steel.png and b/3d_armor/textures/3d_armor_inv_chestplate_steel.png differ diff --git a/3d_armor/textures/3d_armor_inv_chestplate_wood.png b/3d_armor/textures/3d_armor_inv_chestplate_wood.png index 434374f..c746491 100644 Binary files a/3d_armor/textures/3d_armor_inv_chestplate_wood.png and b/3d_armor/textures/3d_armor_inv_chestplate_wood.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_admin.png b/3d_armor/textures/3d_armor_inv_helmet_admin.png index e019702..0eaf9ee 100644 Binary files a/3d_armor/textures/3d_armor_inv_helmet_admin.png and b/3d_armor/textures/3d_armor_inv_helmet_admin.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_bronze.png b/3d_armor/textures/3d_armor_inv_helmet_bronze.png index 53cdaf1..39418bd 100644 Binary files a/3d_armor/textures/3d_armor_inv_helmet_bronze.png and b/3d_armor/textures/3d_armor_inv_helmet_bronze.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_cactus.png b/3d_armor/textures/3d_armor_inv_helmet_cactus.png index 746c264..ca66318 100644 Binary files a/3d_armor/textures/3d_armor_inv_helmet_cactus.png and b/3d_armor/textures/3d_armor_inv_helmet_cactus.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_crystal.png b/3d_armor/textures/3d_armor_inv_helmet_crystal.png index 8a29eec..5b9d031 100644 Binary files a/3d_armor/textures/3d_armor_inv_helmet_crystal.png and b/3d_armor/textures/3d_armor_inv_helmet_crystal.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_diamond.png b/3d_armor/textures/3d_armor_inv_helmet_diamond.png index 2eb3a5c..c0a6f11 100644 Binary files a/3d_armor/textures/3d_armor_inv_helmet_diamond.png and b/3d_armor/textures/3d_armor_inv_helmet_diamond.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_gold.png b/3d_armor/textures/3d_armor_inv_helmet_gold.png index e8f83d8..e4edc1f 100644 Binary files a/3d_armor/textures/3d_armor_inv_helmet_gold.png and b/3d_armor/textures/3d_armor_inv_helmet_gold.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_mithril.png b/3d_armor/textures/3d_armor_inv_helmet_mithril.png index abdd0ca..259f249 100644 Binary files a/3d_armor/textures/3d_armor_inv_helmet_mithril.png and b/3d_armor/textures/3d_armor_inv_helmet_mithril.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_steel.png b/3d_armor/textures/3d_armor_inv_helmet_steel.png index 4c636f2..519ef9a 100644 Binary files a/3d_armor/textures/3d_armor_inv_helmet_steel.png and b/3d_armor/textures/3d_armor_inv_helmet_steel.png differ diff --git a/3d_armor/textures/3d_armor_inv_helmet_wood.png b/3d_armor/textures/3d_armor_inv_helmet_wood.png index e8ee2fe..fbeea44 100644 Binary files a/3d_armor/textures/3d_armor_inv_helmet_wood.png and b/3d_armor/textures/3d_armor_inv_helmet_wood.png differ diff --git a/3d_armor/textures/3d_armor_inv_leggings_admin.png b/3d_armor/textures/3d_armor_inv_leggings_admin.png index 04b64c0..9358e26 100644 Binary files a/3d_armor/textures/3d_armor_inv_leggings_admin.png and b/3d_armor/textures/3d_armor_inv_leggings_admin.png differ diff --git a/3d_armor/textures/3d_armor_inv_leggings_bronze.png b/3d_armor/textures/3d_armor_inv_leggings_bronze.png index b574108..75bd902 100644 Binary files a/3d_armor/textures/3d_armor_inv_leggings_bronze.png and b/3d_armor/textures/3d_armor_inv_leggings_bronze.png differ diff --git a/3d_armor/textures/3d_armor_inv_leggings_cactus.png b/3d_armor/textures/3d_armor_inv_leggings_cactus.png index c011db8..734907f 100644 Binary files a/3d_armor/textures/3d_armor_inv_leggings_cactus.png and b/3d_armor/textures/3d_armor_inv_leggings_cactus.png differ diff --git a/3d_armor/textures/3d_armor_inv_leggings_crystal.png b/3d_armor/textures/3d_armor_inv_leggings_crystal.png index 5b3f703..7ed14fe 100644 Binary files a/3d_armor/textures/3d_armor_inv_leggings_crystal.png and b/3d_armor/textures/3d_armor_inv_leggings_crystal.png differ diff --git a/3d_armor/textures/3d_armor_inv_leggings_diamond.png b/3d_armor/textures/3d_armor_inv_leggings_diamond.png index 2ab1c8e..b0cf151 100644 Binary files a/3d_armor/textures/3d_armor_inv_leggings_diamond.png and b/3d_armor/textures/3d_armor_inv_leggings_diamond.png differ diff --git a/3d_armor/textures/3d_armor_inv_leggings_gold.png b/3d_armor/textures/3d_armor_inv_leggings_gold.png index 7424833..ff38e6c 100644 Binary files a/3d_armor/textures/3d_armor_inv_leggings_gold.png and b/3d_armor/textures/3d_armor_inv_leggings_gold.png differ diff --git a/3d_armor/textures/3d_armor_inv_leggings_mithril.png b/3d_armor/textures/3d_armor_inv_leggings_mithril.png index b9b1b3c..a0f8a05 100644 Binary files a/3d_armor/textures/3d_armor_inv_leggings_mithril.png and b/3d_armor/textures/3d_armor_inv_leggings_mithril.png differ diff --git a/3d_armor/textures/3d_armor_inv_leggings_steel.png b/3d_armor/textures/3d_armor_inv_leggings_steel.png index 77ee17e..5f95a1b 100644 Binary files a/3d_armor/textures/3d_armor_inv_leggings_steel.png and b/3d_armor/textures/3d_armor_inv_leggings_steel.png differ diff --git a/3d_armor/textures/3d_armor_inv_leggings_wood.png b/3d_armor/textures/3d_armor_inv_leggings_wood.png index f162e51..32a19e2 100644 Binary files a/3d_armor/textures/3d_armor_inv_leggings_wood.png and b/3d_armor/textures/3d_armor_inv_leggings_wood.png differ diff --git a/3d_armor/textures/3d_armor_leggings_admin.png b/3d_armor/textures/3d_armor_leggings_admin.png index 6752256..2840034 100644 Binary files a/3d_armor/textures/3d_armor_leggings_admin.png and b/3d_armor/textures/3d_armor_leggings_admin.png differ diff --git a/3d_armor/textures/3d_armor_leggings_admin_preview.png b/3d_armor/textures/3d_armor_leggings_admin_preview.png index fe47999..7900a4c 100644 Binary files a/3d_armor/textures/3d_armor_leggings_admin_preview.png and b/3d_armor/textures/3d_armor_leggings_admin_preview.png differ diff --git a/3d_armor/textures/3d_armor_leggings_bronze.png b/3d_armor/textures/3d_armor_leggings_bronze.png index 3394288..99ebdaa 100644 Binary files a/3d_armor/textures/3d_armor_leggings_bronze.png and b/3d_armor/textures/3d_armor_leggings_bronze.png differ diff --git a/3d_armor/textures/3d_armor_leggings_bronze_preview.png b/3d_armor/textures/3d_armor_leggings_bronze_preview.png index c4aa7b9..73f7a11 100644 Binary files a/3d_armor/textures/3d_armor_leggings_bronze_preview.png and b/3d_armor/textures/3d_armor_leggings_bronze_preview.png differ diff --git a/3d_armor/textures/3d_armor_leggings_cactus.png b/3d_armor/textures/3d_armor_leggings_cactus.png index 7d22404..6b50367 100644 Binary files a/3d_armor/textures/3d_armor_leggings_cactus.png and b/3d_armor/textures/3d_armor_leggings_cactus.png differ diff --git a/3d_armor/textures/3d_armor_leggings_cactus_preview.png b/3d_armor/textures/3d_armor_leggings_cactus_preview.png index 1a24863..1bc7ffa 100644 Binary files a/3d_armor/textures/3d_armor_leggings_cactus_preview.png and b/3d_armor/textures/3d_armor_leggings_cactus_preview.png differ diff --git a/3d_armor/textures/3d_armor_leggings_crystal.png b/3d_armor/textures/3d_armor_leggings_crystal.png index cc61390..26793a7 100644 Binary files a/3d_armor/textures/3d_armor_leggings_crystal.png and b/3d_armor/textures/3d_armor_leggings_crystal.png differ diff --git a/3d_armor/textures/3d_armor_leggings_crystal_preview.png b/3d_armor/textures/3d_armor_leggings_crystal_preview.png index 559d008..31ed4f4 100644 Binary files a/3d_armor/textures/3d_armor_leggings_crystal_preview.png and b/3d_armor/textures/3d_armor_leggings_crystal_preview.png differ diff --git a/3d_armor/textures/3d_armor_leggings_diamond.png b/3d_armor/textures/3d_armor_leggings_diamond.png index a646ba2..ba7659f 100644 Binary files a/3d_armor/textures/3d_armor_leggings_diamond.png and b/3d_armor/textures/3d_armor_leggings_diamond.png differ diff --git a/3d_armor/textures/3d_armor_leggings_diamond_preview.png b/3d_armor/textures/3d_armor_leggings_diamond_preview.png index a6ac2e2..af43c4e 100644 Binary files a/3d_armor/textures/3d_armor_leggings_diamond_preview.png and b/3d_armor/textures/3d_armor_leggings_diamond_preview.png differ diff --git a/3d_armor/textures/3d_armor_leggings_gold.png b/3d_armor/textures/3d_armor_leggings_gold.png index d207dff..0e513cb 100644 Binary files a/3d_armor/textures/3d_armor_leggings_gold.png and b/3d_armor/textures/3d_armor_leggings_gold.png differ diff --git a/3d_armor/textures/3d_armor_leggings_gold_preview.png b/3d_armor/textures/3d_armor_leggings_gold_preview.png index 75e6ca4..101eb14 100644 Binary files a/3d_armor/textures/3d_armor_leggings_gold_preview.png and b/3d_armor/textures/3d_armor_leggings_gold_preview.png differ diff --git a/3d_armor/textures/3d_armor_leggings_mithril.png b/3d_armor/textures/3d_armor_leggings_mithril.png index ffff3ee..9302b93 100644 Binary files a/3d_armor/textures/3d_armor_leggings_mithril.png and b/3d_armor/textures/3d_armor_leggings_mithril.png differ diff --git a/3d_armor/textures/3d_armor_leggings_mithril_preview.png b/3d_armor/textures/3d_armor_leggings_mithril_preview.png index ee99178..734564e 100644 Binary files a/3d_armor/textures/3d_armor_leggings_mithril_preview.png and b/3d_armor/textures/3d_armor_leggings_mithril_preview.png differ diff --git a/3d_armor/textures/3d_armor_leggings_steel.png b/3d_armor/textures/3d_armor_leggings_steel.png index 78d5874..b04a4d8 100644 Binary files a/3d_armor/textures/3d_armor_leggings_steel.png and b/3d_armor/textures/3d_armor_leggings_steel.png differ diff --git a/3d_armor/textures/3d_armor_leggings_steel_preview.png b/3d_armor/textures/3d_armor_leggings_steel_preview.png index 3e3ec85..8ad4aff 100644 Binary files a/3d_armor/textures/3d_armor_leggings_steel_preview.png and b/3d_armor/textures/3d_armor_leggings_steel_preview.png differ diff --git a/3d_armor/textures/3d_armor_leggings_wood.png b/3d_armor/textures/3d_armor_leggings_wood.png index 3880fc0..e4c8e94 100644 Binary files a/3d_armor/textures/3d_armor_leggings_wood.png and b/3d_armor/textures/3d_armor_leggings_wood.png differ diff --git a/3d_armor/textures/3d_armor_leggings_wood_preview.png b/3d_armor/textures/3d_armor_leggings_wood_preview.png index f8ee8e8..5f40278 100644 Binary files a/3d_armor/textures/3d_armor_leggings_wood_preview.png and b/3d_armor/textures/3d_armor_leggings_wood_preview.png differ diff --git a/3d_armor/textures/3d_armor_ui_form.png b/3d_armor/textures/3d_armor_ui_form.png index 6e5cfee..6998031 100644 Binary files a/3d_armor/textures/3d_armor_ui_form.png and b/3d_armor/textures/3d_armor_ui_form.png differ diff --git a/3d_armor/textures/character_preview.png b/3d_armor/textures/character_preview.png index 4ac4602..23d6464 100644 Binary files a/3d_armor/textures/character_preview.png and b/3d_armor/textures/character_preview.png differ diff --git a/README.md b/README.md index f74ce04..54548bf 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,6 @@ Modpack - 3d Armor [0.4.5] ========================== -### Table of Contents - - - - -- [[mod] Visible Player Armor [3d_armor]](#mod-visible-player-armor-3d_armor) -- [[mod] Visible Wielded Items [wieldview]](#mod-visible-wielded-items-wieldview) -- [[mod] Shields [shields]](#mod-shields-shields) -- [[mod] Technic Armor [technic_armor]](#mod-technic-armor-technic_armor) -- [[mod] Hazmat Suit [hazmat_suit]](#mod-hazmat-suit-hazmat_suit) -- [[mod] 3d Armor Stand [3d_armor_stand]](#mod-3d-armor-stand-3d_armor_stand) - - - - [mod] Visible Player Armor [3d_armor] ------------------------------------- diff --git a/shields/crafting_guide.txt b/shields/crafting_guide.txt index 9b61dde..651d94c 100644 --- a/shields/crafting_guide.txt +++ b/shields/crafting_guide.txt @@ -15,7 +15,7 @@ Shields -- Crafting Guide [shields:shield_bronze] X = [default:bronze_ingot] [shields:shield_diamond] X = [default:diamond] [shields:shield_gold] X = [default:gold_ingot] -[shields:shield_mithril] X = [moreores:mithril_ingot] +[shields:shield_mithril] X = [default:mithril_ingot] [shields:shield_crystal] X = [ethereal:crystal_ingot] Enhanced Shields diff --git a/shields/init.lua b/shields/init.lua index 2234fa4..a24d523 100644 --- a/shields/init.lua +++ b/shields/init.lua @@ -1,11 +1,9 @@ -local use_moreores = minetest.get_modpath("moreores") - -- Regisiter Shields minetest.register_tool("shields:shield_admin", { description = "Admin Shield", inventory_image = "shields_inv_shield_admin.png", - groups = {armor_shield=1000, armor_heal=100, armor_use=0, not_in_creative_inventory=1}, + groups = {armor_shield=1000, armor_heal=100, armor_use=0}, wear = 0, }) @@ -13,13 +11,13 @@ if ARMOR_MATERIALS.wood then minetest.register_tool("shields:shield_wood", { description = "Wooden Shield", inventory_image = "shields_inv_shield_wood.png", - groups = {armor_shield=5, armor_heal=0, armor_use=2000}, + groups = {armor_shield=3, armor_heal=0, armor_use=2000}, wear = 0, }) minetest.register_tool("shields:shield_enhanced_wood", { description = "Enhanced Wood Shield", inventory_image = "shields_inv_shield_enhanced_wood.png", - groups = {armor_shield=8, armor_heal=0, armor_use=1000}, + groups = {armor_shield=4, armor_heal=0, armor_use=1000}, wear = 0, }) minetest.register_craft({ @@ -36,13 +34,13 @@ if ARMOR_MATERIALS.cactus then minetest.register_tool("shields:shield_cactus", { description = "Cactus Shield", inventory_image = "shields_inv_shield_cactus.png", - groups = {armor_shield=5, armor_heal=0, armor_use=2000}, + groups = {armor_shield=5, armor_heal=0, armor_use=1000}, wear = 0, }) minetest.register_tool("shields:shield_enhanced_cactus", { description = "Enhanced Cactus Shield", inventory_image = "shields_inv_shield_enhanced_cactus.png", - groups = {armor_shield=8, armor_heal=0, armor_use=1000}, + groups = {armor_shield=6, armor_heal=0, armor_use=500}, wear = 0, }) minetest.register_craft({ @@ -59,7 +57,7 @@ if ARMOR_MATERIALS.steel then minetest.register_tool("shields:shield_steel", { description = "Steel Shield", inventory_image = "shields_inv_shield_steel.png", - groups = {armor_shield=10, armor_heal=0, armor_use=500}, + groups = {armor_shield=7, armor_heal=0, armor_use=500}, wear = 0, }) end @@ -68,7 +66,7 @@ if ARMOR_MATERIALS.bronze then minetest.register_tool("shields:shield_bronze", { description = "Bronze Shield", inventory_image = "shields_inv_shield_bronze.png", - groups = {armor_shield=10, armor_heal=6, armor_use=250}, + groups = {armor_shield=8, armor_heal=0, armor_use=250}, wear = 0, }) end @@ -77,7 +75,7 @@ if ARMOR_MATERIALS.diamond then minetest.register_tool("shields:shield_diamond", { description = "Diamond Shield", inventory_image = "shields_inv_shield_diamond.png", - groups = {armor_shield=15, armor_heal=12, armor_use=100}, + groups = {armor_shield=11, armor_heal=0, armor_use=100}, wear = 0, }) end @@ -86,16 +84,25 @@ if ARMOR_MATERIALS.gold then 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}, + groups = {armor_shield=9, armor_heal=0, armor_use=200}, wear = 0, }) end if ARMOR_MATERIALS.mithril then minetest.register_tool("shields:shield_mithril", { - description = "Mithril Shield", + description = "Mithril Shield (Warrior)", inventory_image = "shields_inv_shield_mithril.png", - groups = {armor_shield=15, armor_heal=12, armor_use=50}, + groups = {armor_shield=13, armor_heal=0, armor_use=50}, + wear = 0, + }) +end + +if ARMOR_MATERIALS.blackmithril then + minetest.register_tool("shields:shield_blackmithril", { + description = "Black Mithril Shield (Warrior)", + inventory_image = "shields_inv_shield_black_mithril_warrior.png", + groups = {armor_shield=15, armor_heal=0, armor_use=50}, wear = 0, }) end @@ -104,7 +111,7 @@ if ARMOR_MATERIALS.crystal then minetest.register_tool("shields:shield_crystal", { description = "Crystal Shield", inventory_image = "shields_inv_shield_crystal.png", - groups = {armor_shield=15, armor_heal=12, armor_use=50, armor_fire=1}, + groups = {armor_shield=15, armor_heal=0, armor_use=50, armor_fire=1}, wear = 0, }) end diff --git a/shields/textures/shields_inv_shield_admin.png b/shields/textures/shields_inv_shield_admin.png index ae5ab7d..eb9a0cd 100644 Binary files a/shields/textures/shields_inv_shield_admin.png and b/shields/textures/shields_inv_shield_admin.png differ diff --git a/shields/textures/shields_inv_shield_black_mithril_warrior.png b/shields/textures/shields_inv_shield_black_mithril_warrior.png new file mode 100644 index 0000000..c4e9c9a Binary files /dev/null and b/shields/textures/shields_inv_shield_black_mithril_warrior.png differ diff --git a/shields/textures/shields_inv_shield_bronze.png b/shields/textures/shields_inv_shield_bronze.png index 67bac0f..ae70293 100644 Binary files a/shields/textures/shields_inv_shield_bronze.png and b/shields/textures/shields_inv_shield_bronze.png differ diff --git a/shields/textures/shields_inv_shield_cactus.png b/shields/textures/shields_inv_shield_cactus.png index 00d1d58..e06ff5b 100644 Binary files a/shields/textures/shields_inv_shield_cactus.png and b/shields/textures/shields_inv_shield_cactus.png differ diff --git a/shields/textures/shields_inv_shield_crystal.png b/shields/textures/shields_inv_shield_crystal.png index 1ec1981..fdc5f32 100644 Binary files a/shields/textures/shields_inv_shield_crystal.png and b/shields/textures/shields_inv_shield_crystal.png differ diff --git a/shields/textures/shields_inv_shield_diamond.png b/shields/textures/shields_inv_shield_diamond.png index ea7c567..0d54498 100644 Binary files a/shields/textures/shields_inv_shield_diamond.png and b/shields/textures/shields_inv_shield_diamond.png differ diff --git a/shields/textures/shields_inv_shield_enhanced_cactus.png b/shields/textures/shields_inv_shield_enhanced_cactus.png index 39436cd..6bbe19f 100644 Binary files a/shields/textures/shields_inv_shield_enhanced_cactus.png and b/shields/textures/shields_inv_shield_enhanced_cactus.png differ diff --git a/shields/textures/shields_inv_shield_enhanced_wood.png b/shields/textures/shields_inv_shield_enhanced_wood.png index 058e042..bd2bebc 100644 Binary files a/shields/textures/shields_inv_shield_enhanced_wood.png and b/shields/textures/shields_inv_shield_enhanced_wood.png differ diff --git a/shields/textures/shields_inv_shield_gold.png b/shields/textures/shields_inv_shield_gold.png index 8995834..30f4d79 100644 Binary files a/shields/textures/shields_inv_shield_gold.png and b/shields/textures/shields_inv_shield_gold.png differ diff --git a/shields/textures/shields_inv_shield_mithril.png b/shields/textures/shields_inv_shield_mithril.png index d32665a..2e0a767 100644 Binary files a/shields/textures/shields_inv_shield_mithril.png and b/shields/textures/shields_inv_shield_mithril.png differ diff --git a/shields/textures/shields_inv_shield_steel.png b/shields/textures/shields_inv_shield_steel.png index 178b507..b39120e 100644 Binary files a/shields/textures/shields_inv_shield_steel.png and b/shields/textures/shields_inv_shield_steel.png differ diff --git a/shields/textures/shields_inv_shield_wood.png b/shields/textures/shields_inv_shield_wood.png index dcbe933..da40020 100644 Binary files a/shields/textures/shields_inv_shield_wood.png and b/shields/textures/shields_inv_shield_wood.png differ diff --git a/shields/textures/shields_shield_admin.png b/shields/textures/shields_shield_admin.png index 430c3e3..8b466d3 100644 Binary files a/shields/textures/shields_shield_admin.png and b/shields/textures/shields_shield_admin.png differ diff --git a/shields/textures/shields_shield_admin_preview.png b/shields/textures/shields_shield_admin_preview.png index 762c2d2..86d2f9b 100644 Binary files a/shields/textures/shields_shield_admin_preview.png and b/shields/textures/shields_shield_admin_preview.png differ diff --git a/shields/textures/shields_shield_blackmithril.png b/shields/textures/shields_shield_blackmithril.png new file mode 100755 index 0000000..f19048a Binary files /dev/null and b/shields/textures/shields_shield_blackmithril.png differ diff --git a/shields/textures/shields_shield_blackmithril_preview.png b/shields/textures/shields_shield_blackmithril_preview.png new file mode 100644 index 0000000..64f58e6 Binary files /dev/null and b/shields/textures/shields_shield_blackmithril_preview.png differ diff --git a/shields/textures/shields_shield_bronze.png b/shields/textures/shields_shield_bronze.png index 89d6799..1f25ada 100644 Binary files a/shields/textures/shields_shield_bronze.png and b/shields/textures/shields_shield_bronze.png differ diff --git a/shields/textures/shields_shield_bronze_preview.png b/shields/textures/shields_shield_bronze_preview.png index 5f9ca7b..18acce9 100644 Binary files a/shields/textures/shields_shield_bronze_preview.png and b/shields/textures/shields_shield_bronze_preview.png differ diff --git a/shields/textures/shields_shield_cactus.png b/shields/textures/shields_shield_cactus.png index 8679aa5..19cca87 100644 Binary files a/shields/textures/shields_shield_cactus.png and b/shields/textures/shields_shield_cactus.png differ diff --git a/shields/textures/shields_shield_cactus_preview.png b/shields/textures/shields_shield_cactus_preview.png index ae83661..67cc4de 100644 Binary files a/shields/textures/shields_shield_cactus_preview.png and b/shields/textures/shields_shield_cactus_preview.png differ diff --git a/shields/textures/shields_shield_crystal.png b/shields/textures/shields_shield_crystal.png index 888bc5a..c991a28 100644 Binary files a/shields/textures/shields_shield_crystal.png and b/shields/textures/shields_shield_crystal.png differ diff --git a/shields/textures/shields_shield_crystal_preview.png b/shields/textures/shields_shield_crystal_preview.png index 299776f..2fd8d8d 100644 Binary files a/shields/textures/shields_shield_crystal_preview.png and b/shields/textures/shields_shield_crystal_preview.png differ diff --git a/shields/textures/shields_shield_diamond.png b/shields/textures/shields_shield_diamond.png index e4938f9..dc6a7d2 100644 Binary files a/shields/textures/shields_shield_diamond.png and b/shields/textures/shields_shield_diamond.png differ diff --git a/shields/textures/shields_shield_diamond_preview.png b/shields/textures/shields_shield_diamond_preview.png index afd004e..6ea838a 100644 Binary files a/shields/textures/shields_shield_diamond_preview.png and b/shields/textures/shields_shield_diamond_preview.png differ diff --git a/shields/textures/shields_shield_enhanced_cactus.png b/shields/textures/shields_shield_enhanced_cactus.png index 50d7673..fe81651 100644 Binary files a/shields/textures/shields_shield_enhanced_cactus.png and b/shields/textures/shields_shield_enhanced_cactus.png differ diff --git a/shields/textures/shields_shield_enhanced_cactus_preview.png b/shields/textures/shields_shield_enhanced_cactus_preview.png index b15df06..0da7f56 100644 Binary files a/shields/textures/shields_shield_enhanced_cactus_preview.png and b/shields/textures/shields_shield_enhanced_cactus_preview.png differ diff --git a/shields/textures/shields_shield_enhanced_wood.png b/shields/textures/shields_shield_enhanced_wood.png index 14bd057..a86c4fd 100644 Binary files a/shields/textures/shields_shield_enhanced_wood.png and b/shields/textures/shields_shield_enhanced_wood.png differ diff --git a/shields/textures/shields_shield_enhanced_wood_preview.png b/shields/textures/shields_shield_enhanced_wood_preview.png index 9298383..adfe1a6 100644 Binary files a/shields/textures/shields_shield_enhanced_wood_preview.png and b/shields/textures/shields_shield_enhanced_wood_preview.png differ diff --git a/shields/textures/shields_shield_gold.png b/shields/textures/shields_shield_gold.png index b198d18..abfc7a1 100644 Binary files a/shields/textures/shields_shield_gold.png and b/shields/textures/shields_shield_gold.png differ diff --git a/shields/textures/shields_shield_gold_preview.png b/shields/textures/shields_shield_gold_preview.png index 66d8f2e..94317c6 100644 Binary files a/shields/textures/shields_shield_gold_preview.png and b/shields/textures/shields_shield_gold_preview.png differ diff --git a/shields/textures/shields_shield_mithril.png b/shields/textures/shields_shield_mithril.png index 2fb622e..d64a144 100644 Binary files a/shields/textures/shields_shield_mithril.png and b/shields/textures/shields_shield_mithril.png differ diff --git a/shields/textures/shields_shield_mithril_preview.png b/shields/textures/shields_shield_mithril_preview.png index 45306e3..209dc80 100644 Binary files a/shields/textures/shields_shield_mithril_preview.png and b/shields/textures/shields_shield_mithril_preview.png differ diff --git a/shields/textures/shields_shield_steel.png b/shields/textures/shields_shield_steel.png index cfe58a1..df54f9c 100644 Binary files a/shields/textures/shields_shield_steel.png and b/shields/textures/shields_shield_steel.png differ diff --git a/shields/textures/shields_shield_steel_preview.png b/shields/textures/shields_shield_steel_preview.png index 0a3d36a..b922bf8 100644 Binary files a/shields/textures/shields_shield_steel_preview.png and b/shields/textures/shields_shield_steel_preview.png differ diff --git a/shields/textures/shields_shield_wood.png b/shields/textures/shields_shield_wood.png index baf092d..4646e3d 100644 Binary files a/shields/textures/shields_shield_wood.png and b/shields/textures/shields_shield_wood.png differ diff --git a/shields/textures/shields_shield_wood_preview.png b/shields/textures/shields_shield_wood_preview.png index b446e4e..2197248 100644 Binary files a/shields/textures/shields_shield_wood_preview.png and b/shields/textures/shields_shield_wood_preview.png differ diff --git a/wieldview/init.lua b/wieldview/init.lua index 7a5a619..d7b78c5 100644 --- a/wieldview/init.lua +++ b/wieldview/init.lua @@ -64,13 +64,12 @@ minetest.register_on_joinplayer(function(player) end, player) end) -minetest.register_globalstep(function(dtime) - time = time + dtime - if time > update_time then - for _,player in ipairs(minetest.get_connected_players()) do - wieldview:update_wielded_item(player) - end - time = 0 +function step() + for _,player in ipairs(minetest.get_connected_players()) do + wieldview:update_wielded_item(player) end -end) + time = 0 + minetest.after(update_time, step) +end +minetest.after(0, step)