svennd
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Update mcl_fire itemstrings

This commit is contained in:
Wuzzy 2017-02-19 22:48:46 +01:00
parent 13ec1ce743
commit 8527d684f4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mods/ENTITIES/mobs/api.lua
View File

@ -475,8 +475,8 @@ local do_env_damage = function(self)
-- lava or fire -- lava or fire
if self.lava_damage ~= 0 if self.lava_damage ~= 0
and (nodef.groups.lava and (nodef.groups.lava
or self.standing_in == "mcl_fire:basic_flame" or self.standing_in == "mcl_fire:fire"
or self.standing_in == "mcl_fire:permanent_flame") then or self.standing_in == "mcl_fire:eternal_fire") then
self.health = self.health - self.lava_damage self.health = self.health - self.lava_damage
@ -2594,7 +2594,7 @@ local c_air = minetest.get_content_id("air")
local c_ignore = minetest.get_content_id("ignore") local c_ignore = minetest.get_content_id("ignore")
local c_obsidian = minetest.get_content_id("mcl_core:obsidian") local c_obsidian = minetest.get_content_id("mcl_core:obsidian")
local c_chest = minetest.get_content_id("mcl_core:chest") local c_chest = minetest.get_content_id("mcl_core:chest")
local c_fire = minetest.get_content_id("mcl_fire:basic_flame") local c_fire = minetest.get_content_id("mcl_fire:fire")
-- explosion (cannot break protected or unbreakable nodes) -- explosion (cannot break protected or unbreakable nodes)
function mobs:explosion(pos, radius, fire, smoke, sound) function mobs:explosion(pos, radius, fire, smoke, sound)
@ -2662,7 +2662,7 @@ function mobs:explosion(pos, radius, fire, smoke, sound)
and (minetest.registered_nodes[n].groups.flammable and (minetest.registered_nodes[n].groups.flammable
or random(1, 100) <= 30) then or random(1, 100) <= 30) then
minetest.set_node(p, {name = "mcl_fire:basic_flame"}) minetest.set_node(p, {name = "mcl_fire:fire"})
else else
minetest.set_node(p, {name = "air"}) minetest.set_node(p, {name = "air"})

2
mods/ENTITIES/mobs_mc/blaze.lua
View File

@ -94,7 +94,7 @@ mobs:register_arrow("mobs_mc:blaze_fireball", {
hit_node = function(self, pos, node) hit_node = function(self, pos, node)
local pos_above = {x=pos.x, y=pos.y+1, z=pos.z} local pos_above = {x=pos.x, y=pos.y+1, z=pos.z}
if minetest.registered_nodes[minetest.get_node(pos_above).name].buildable_to then if minetest.registered_nodes[minetest.get_node(pos_above).name].buildable_to then
minetest.set_node(pos_above, {name="mcl_fire:basic_flame"}) minetest.set_node(pos_above, {name="mcl_fire:fire"})
end end
end end
}) })

2
mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
View File

@ -114,7 +114,7 @@ local dispenserdef = {
elseif iname == "mcl_fire:flint_and_steel" then elseif iname == "mcl_fire:flint_and_steel" then
-- Ignite air or fire -- Ignite air or fire
if dropnode.name == "air" then if dropnode.name == "air" then
minetest.add_node(droppos, {name="mcl_fire:basic_flame"}) minetest.add_node(droppos, {name="mcl_fire:fire"})
if not minetest.setting_getbool("creative_mode") then if not minetest.setting_getbool("creative_mode") then
stack:add_wear(65535/65) -- 65 uses stack:add_wear(65535/65) -- 65 uses
end end

4
mods/ITEMS/minetest-3d_armor/3d_armor/armor.conf
View File

@ -12,8 +12,8 @@ ARMOR_FIRE_PROTECT = false
ARMOR_FIRE_NODES = { ARMOR_FIRE_NODES = {
{"default:lava_source", 5, 4}, {"default:lava_source", 5, 4},
{"default:lava_flowing", 5, 4}, {"default:lava_flowing", 5, 4},
{"mcl_fire:basic_flame", 3, 4}, {"mcl_fire:fire", 3, 4},
{"mcl_fire:permanent_flame", 3, 4}, {"mcl_fire:eternal_fire", 3, 4},
} }
ARMOR_DROP = true ARMOR_DROP = true