Rename torches mod to mcl_torches

This commit is contained in:
Wuzzy 2017-02-10 14:41:36 +01:00
parent 70e529be4d
commit b4c5a96d7c
19 changed files with 19 additions and 63 deletions

@ -1,4 +1,4 @@
mcl_core mcl_core
bucket bucket
mcl_wool mcl_wool
torches mcl_torches

@ -280,7 +280,7 @@ minetest.register_node("mcl_farming:pumpkin_face_light", {
minetest.register_craft({ minetest.register_craft({
output = "mcl_farming:pumpkin_face_light", output = "mcl_farming:pumpkin_face_light",
recipe = {{"mcl_farming:pumpkin_face"}, recipe = {{"mcl_farming:pumpkin_face"},
{"torches:torch"}} {"mcl_torches:torch"}}
}) })
minetest.register_craft({ minetest.register_craft({

@ -24,6 +24,8 @@ Changes for MineClone:
~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~
- Torch does not generate light when wielding - Torch does not generate light when wielding
- Torch drops when near water - Torch drops when near water
- Torch can't be placed on ceiling
- Simple API (WIP)
License: License:
~~~~~~~~ ~~~~~~~~

@ -6,12 +6,12 @@
mcl_torches = {} mcl_torches = {}
mcl_torches.register_torch = function(substring, description, icon, mesh_floor, mesh_wall, tiles, light, groups, sounds) mcl_torches.register_torch = function(substring, description, icon, mesh_floor, mesh_wall, tiles, light, groups, sounds)
local itemstring = "torches:"..substring local itemstring = "mcl_torches:"..substring
local itemstring_wall = "torches:"..substring.."_wall" local itemstring_wall = "mcl_torches:"..substring.."_wall"
if light == nil then light = 14 end if light == nil then light = 14 end
if mesh_floor == nil then mesh_floor = "torch_floor.obj" end if mesh_floor == nil then mesh_floor = "mcl_torches_torch_floor.obj" end
if mesh_wall == nil then mesh_wall = "torch_wall.obj" end if mesh_wall == nil then mesh_wall = "mcl_torches_torch_wall.obj" end
if groups == nil then groups = {} end if groups == nil then groups = {} end
groups.attached_node = 1 groups.attached_node = 1
@ -63,16 +63,16 @@ mcl_torches.register_torch = function(substring, description, icon, mesh_floor,
-- Prevent placement of ceiling torches -- Prevent placement of ceiling torches
return itemstack return itemstack
elseif wdir == 1 then elseif wdir == 1 then
retval = fakestack:set_name("torches:torch") retval = fakestack:set_name("mcl_torches:torch")
else else
retval = fakestack:set_name("torches:torch_wall") retval = fakestack:set_name("mcl_torches:torch_wall")
end end
if not retval then if not retval then
return itemstack return itemstack
end end
itemstack = minetest.item_place(fakestack, placer, pointed_thing, wdir) itemstack = minetest.item_place(fakestack, placer, pointed_thing, wdir)
itemstack:set_name("torches:torch") itemstack:set_name("mcl_torches:torch")
return itemstack return itemstack
end end
@ -103,7 +103,7 @@ mcl_torches.register_torch = function(substring, description, icon, mesh_floor,
end end
mcl_torches.register_torch("torch", "Torch", "default_torch_on_floor.png", mcl_torches.register_torch("torch", "Torch", "default_torch_on_floor.png",
"torch_floor.obj", "torch_wall.obj", "mcl_torches_torch_floor.obj", "mcl_torches_torch_wall.obj",
{{ {{
name = "default_torch_on_floor_animated.png", name = "default_torch_on_floor_animated.png",
animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3} animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3}
@ -114,7 +114,7 @@ mcl_torches.register_torch("torch", "Torch", "default_torch_on_floor.png",
minetest.register_craft({ minetest.register_craft({
output = "torches:torch 4", output = "mcl_torches:torch 4",
recipe = { recipe = {
{ "group:coal" }, { "group:coal" },
{ "mcl_core:stick" }, { "mcl_core:stick" },

@ -0,0 +1 @@
name = mcl_torches

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

@ -45,7 +45,7 @@ local function update_wall(pos)
-- Torches or walkable nodes above the wall -- Torches or walkable nodes above the wall
local upnode = minetest.get_node({x = pos.x, y = pos.y+1, z = pos.z}) local upnode = minetest.get_node({x = pos.x, y = pos.y+1, z = pos.z})
if sum == 5 or sum == 10 then if sum == 5 or sum == 10 then
if minetest.registered_nodes[upnode.name].walkable or upnode.name == "torches:floor" then if minetest.registered_nodes[upnode.name].walkable or upnode.name == "mcl_torches:floor" then
sum = sum + 11 sum = sum + 11
end end
end end

@ -25,7 +25,7 @@ ARMOR_FIRE_NODES = {
{"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},
{"torches:torch", 1, 1}, {"mcl_torches:torch", 1, 1},
} }
local skin_mod = nil local skin_mod = nil

@ -1,7 +1,7 @@
-- Wielded Item Transformations - http://dev.minetest.net/texture -- Wielded Item Transformations - http://dev.minetest.net/texture
wieldview_transform = { wieldview_transform = {
["torches:torch"]="R270", ["mcl_torches:torch"]="R270",
["mcl_core:sapling"]="R270", ["mcl_core:sapling"]="R270",
["flowers:dandelion_white"]="R270", ["flowers:dandelion_white"]="R270",
["flowers:dandelion_yellow"]="R270", ["flowers:dandelion_yellow"]="R270",

@ -54,7 +54,7 @@ mobs:register_mob("mobs_mc:enderman", {
view_range = 16, view_range = 16,
attack_type = "dogfight", attack_type = "dogfight",
replace_rate = 1, replace_rate = 1,
replace_what = {"torches:torch","mcl_core:sand","mcl_core:desert_sand","mcl_core:cobble","mcl_core:dirt","mcl_core:dirt_with_glass","mcl_core:dirt_with_dry_grass","mcl_core:wood","mcl_core:stone","mcl_core:sandstone"}, replace_what = {"mcl_torches:torch","mcl_core:sand","mcl_core:desert_sand","mcl_core:cobble","mcl_core:dirt","mcl_core:dirt_with_glass","mcl_core:dirt_with_dry_grass","mcl_core:wood","mcl_core:stone","mcl_core:sandstone"},
replace_with = "air", replace_with = "air",
replace_offset = -1, replace_offset = -1,

@ -35,7 +35,7 @@ mobs:register_mob("mobs_mc:spider", {
floats = 0, floats = 0,
group_attack = true, group_attack = true,
replace_rate = 5, replace_rate = 5,
replace_what = {"torches:torch"}, replace_what = {"mcl_torches:torch"},
replace_with = "air", replace_with = "air",
replace_offset = -1, replace_offset = -1,
peaceful = false, peaceful = false,

@ -1,37 +0,0 @@
Changelog:
----------
1.1 - 1.2.x:
- Torches on wall dont fall when node under it is dug
- Torches fall directly when not placed on floor or wall
- fixed different placing bugs
1.3:
- Torches only show flames when player is near (13 blocks)
- Old torches are converted to new, ceiling torches are dropped
1.3.1:
- fix dropping torches when digging a block next to it
- all torches attached to a block get droped when dug
1.3.2:
- fix crashes by unknown nodes
2.0:
- Use new mesh drawtype to improve wallmounted torches
- Update particle usage
- New textures; flame texture fix by Yepoleb
- Fix for doors, chests, etc (rightclick support)
2.1
- Fix wallmounted torch mesh
- Clean up code, use wallmounted paramtype2
- Fix torches being placeable on ceilings (reported by kilbith)
3.0
- Minetest style added and used by default
- style can be changed via settings
- using Minetest style allows ceiling torches via settings
- Minetest style supports all texturepacks (as long torch shaped)
3.0.1
- Fix global variable that caused rarely placing issues (thanks to tchncs for pointing out)

@ -1 +0,0 @@
name = torches

@ -1,9 +0,0 @@
# Enable wielded torches to light the area around it as the player moves. This is
# somewhat resource intensive and may be disabled to reduce lag.
torches_wieldlight_enable (Enable held torch to emit light) bool false
# How often the wieldlight should be moved if the player moves with a torch in their
# hand. Reducing this makes it feel more laggy, but reduces the amount of network
# packets sent to clients.
torches_wieldlight_interval (Torch light from held torch update interval) float 0.25