forked from mtcontrib/3d_armor
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
9417629f51
@ -55,12 +55,14 @@ armor = {
|
|||||||
crystal = "ethereal:crystal_ingot",
|
crystal = "ethereal:crystal_ingot",
|
||||||
},
|
},
|
||||||
fire_nodes = {
|
fire_nodes = {
|
||||||
|
{"nether:lava_source", 5, 8},
|
||||||
{"default:lava_source", 5, 8},
|
{"default:lava_source", 5, 8},
|
||||||
{"default:lava_flowing", 5, 8},
|
{"default:lava_flowing", 5, 8},
|
||||||
{"fire:basic_flame", 3, 4},
|
{"fire:basic_flame", 3, 4},
|
||||||
{"fire:permanent_flame", 3, 4},
|
{"fire:permanent_flame", 3, 4},
|
||||||
{"ethereal:crystal_spike", 2, 1},
|
{"ethereal:crystal_spike", 2, 1},
|
||||||
{"ethereal:fire_flower", 2, 1},
|
{"ethereal:fire_flower", 2, 1},
|
||||||
|
{"nether:lava_crust", 2, 1},
|
||||||
{"default:torch", 1, 1},
|
{"default:torch", 1, 1},
|
||||||
{"default:torch_ceiling", 1, 1},
|
{"default:torch_ceiling", 1, 1},
|
||||||
{"default:torch_wall", 1, 1},
|
{"default:torch_wall", 1, 1},
|
||||||
@ -200,6 +202,10 @@ armor.update_player_visuals = function(self, player)
|
|||||||
self:run_callbacks("on_update", player)
|
self:run_callbacks("on_update", player)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
-- armor is not visible on player model if enabled
|
||||||
|
local transparent_armor = minetest.settings:get_bool("armor_transparent", false)
|
||||||
|
|
||||||
armor.set_player_armor = function(self, player)
|
armor.set_player_armor = function(self, player)
|
||||||
local name, armor_inv = self:get_valid_player(player, "[set_player_armor]")
|
local name, armor_inv = self:get_valid_player(player, "[set_player_armor]")
|
||||||
if not name then
|
if not name then
|
||||||
@ -258,7 +264,9 @@ armor.set_player_armor = function(self, player)
|
|||||||
tex = tex:gsub(".png$", "")
|
tex = tex:gsub(".png$", "")
|
||||||
local prev = def.preview or tex.."_preview"
|
local prev = def.preview or tex.."_preview"
|
||||||
prev = prev:gsub(".png$", "")
|
prev = prev:gsub(".png$", "")
|
||||||
|
if not transparent_armor then
|
||||||
texture = texture.."^"..tex..".png"
|
texture = texture.."^"..tex..".png"
|
||||||
|
end
|
||||||
preview = preview.."^"..prev..".png"
|
preview = preview.."^"..prev..".png"
|
||||||
state = state + stack:get_wear()
|
state = state + stack:get_wear()
|
||||||
count = count + 1
|
count = count + 1
|
||||||
|
@ -58,6 +58,9 @@ armor_punch_damage (Enable damage effects) bool true
|
|||||||
# Enable migration of old armor inventories.
|
# Enable migration of old armor inventories.
|
||||||
armor_migrate_old_inventory (Migrate old armor inventories) bool true
|
armor_migrate_old_inventory (Migrate old armor inventories) bool true
|
||||||
|
|
||||||
|
# Don't show armor on character model.
|
||||||
|
armor_transparent (Transparent armor) bool false
|
||||||
|
|
||||||
|
|
||||||
[shields]
|
[shields]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user