forked from MineClone5/MineClone5
fix tabs/spaces use
This commit is contained in:
parent
af8bce41aa
commit
f95bc5e878
|
|
@ -11,81 +11,81 @@ local compass_frames = 32
|
||||||
|
|
||||||
-- Timer for random compass spinning
|
-- Timer for random compass spinning
|
||||||
local random_timer = 0
|
local random_timer = 0
|
||||||
local random_timer_trigger = 0.5 -- random compass spinning tick in seconds. Increase if there are performance problems
|
local random_timer_trigger = 0.5 -- random compass spinning tick in seconds. Incr ease if there are performance problems
|
||||||
|
|
||||||
local random_frame = math.random(0, compass_frames-1)
|
local random_frame = math.random(0, compass_frames-1)
|
||||||
|
|
||||||
function mcl_compass.get_compass_image(pos, dir, x, y, z)
|
function mcl_compass.get_compass_image(pos, dir, x, y, z)
|
||||||
-- Compasses do not work in certain zones
|
-- Compasses do not work in certain zones
|
||||||
if mcl_worlds.compass_works(pos) and x ~= nil and y ~= nil and z ~= nil then
|
if mcl_worlds.compass_works(pos) and x ~= nil and y ~= nil and z ~= nil then
|
||||||
local _, dim = mcl_worlds.y_to_layer(y)
|
local _, dim = mcl_worlds.y_to_layer(y)
|
||||||
local _, playerdim = mcl_worlds.y_to_layer(pos.y)
|
local _, playerdim = mcl_worlds.y_to_layer(pos.y)
|
||||||
|
|
||||||
if dim == playerdim then --Check if player and compass target are in the same dimension, above check is just if the diemension is valid for the non lodestone compass
|
if dim == playerdim then --Check if player and compass target are in the same dimension, above check is just if the diemension is valid for the non lodestone compass
|
||||||
local spawn = {x=x,y=y,z=z}
|
local spawn = {x=x,y=y,z=z}
|
||||||
local ssp = minetest.setting_get_pos("static_spawnpoint")
|
local ssp = minetest.setting_get_pos("static_spawnpoint")
|
||||||
if ssp and x == 0 and y == 0 and z == 0 then
|
if ssp and x == 0 and y == 0 and z == 0 then
|
||||||
spawn = ssp
|
spawn = ssp
|
||||||
if type(spawn) ~= "table" or type(spawn.x) ~= "number" or type(spawn.y) ~= "number" or type(spawn.z) ~= "number" then
|
if type(spawn) ~= "table" or type(spawn.x) ~= "number" or type(spawn.y) ~= "number" or type(spawn.z) ~= "number" then
|
||||||
spawn = {x=0,y=0,z=0}
|
spawn = {x=0,y=0,z=0}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
local angle_north = math.deg(math.atan2(spawn.x - pos.x, spawn.z - pos.z))
|
local angle_north = math.deg(math.atan2(spawn.x - pos.x, spawn.z - pos.z))
|
||||||
if angle_north < 0 then angle_north = angle_north + 360 end
|
if angle_north < 0 then angle_north = angle_north + 360 end
|
||||||
local angle_dir = -math.deg(dir)
|
local angle_dir = -math.deg(dir)
|
||||||
local angle_relative = (angle_north - angle_dir + 180) % 360
|
local angle_relative = (angle_north - angle_dir + 180) % 360
|
||||||
return math.floor((angle_relative/11.25) + 0.5) % compass_frames
|
return math.floor((angle_relative/11.25) + 0.5) % compass_frames
|
||||||
else
|
else
|
||||||
return random_frame
|
return random_frame
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
if x ~= 0 and y ~= 0 and z~= 0 and x ~= nil and y ~= nil and x~= nil then
|
if x ~= 0 and y ~= 0 and z~= 0 and x ~= nil and y ~= nil and x~= nil then
|
||||||
local _, dim = mcl_worlds.y_to_layer(y)
|
local _, dim = mcl_worlds.y_to_layer(y)
|
||||||
local _, playerdim = mcl_worlds.y_to_layer(pos.y)
|
local _, playerdim = mcl_worlds.y_to_layer(pos.y)
|
||||||
if dim == playerdim then --already explained that very same if statement above
|
if dim == playerdim then --already explained that very same if statement above
|
||||||
local spawn = {x=x,y=y,z=z}
|
local spawn = {x=x,y=y,z=z}
|
||||||
local ssp = minetest.setting_get_pos("static_spawnpoint")
|
local ssp = minetest.setting_get_pos("static_spawnpoint")
|
||||||
if ssp and x == 0 and y == 0 and z == 0 then
|
if ssp and x == 0 and y == 0 and z == 0 then
|
||||||
spawn = ssp
|
spawn = ssp
|
||||||
if type(spawn) ~= "table" or type(spawn.x) ~= "number" or type(spawn.y) ~= "number" or type(spawn.z) ~= "number" then
|
if type(spawn) ~= "table" or type(spawn.x) ~= "number" or type(spawn.y) ~= "number" or type(spawn.z) ~= "number" then
|
||||||
spawn = {x=0,y=0,z=0}
|
spawn = {x=0,y=0,z=0}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
local angle_north = math.deg(math.atan2(spawn.x - pos.x, spawn.z - pos.z))
|
local angle_north = math.deg(math.atan2(spawn.x - pos.x, spawn.z - pos.z))
|
||||||
if angle_north < 0 then angle_north = angle_north + 360 end
|
if angle_north < 0 then angle_north = angle_north + 360 end
|
||||||
local angle_dir = -math.deg(dir)
|
local angle_dir = -math.deg(dir)
|
||||||
local angle_relative = (angle_north - angle_dir + 180) % 360
|
local angle_relative = (angle_north - angle_dir + 180) % 360
|
||||||
return math.floor((angle_relative/11.25) + 0.5) % compass_frames
|
return math.floor((angle_relative/11.25) + 0.5) % compass_frames
|
||||||
else
|
else
|
||||||
return random_frame
|
return random_frame
|
||||||
end
|
end
|
||||||
|
|
||||||
else
|
else
|
||||||
return random_frame
|
return random_frame
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_globalstep(function(dtime)
|
minetest.register_globalstep(function(dtime)
|
||||||
random_timer = random_timer + dtime
|
random_timer = random_timer + dtime
|
||||||
|
|
||||||
if random_timer >= random_timer_trigger then
|
if random_timer >= random_timer_trigger then
|
||||||
random_frame = (random_frame + math.random(-1, 1)) % compass_frames
|
random_frame = (random_frame + math.random(-1, 1)) % compass_frames
|
||||||
random_timer = 0
|
random_timer = 0
|
||||||
end
|
end
|
||||||
for i,player in pairs(minetest.get_connected_players()) do
|
for i,player in pairs(minetest.get_connected_players()) do
|
||||||
local function has_compass(player)
|
local function has_compass(player)
|
||||||
for _,stack in pairs(player:get_inventory():get_list("main")) do
|
for _,stack in pairs(player:get_inventory():get_list("main")) do
|
||||||
if minetest.get_item_group(stack:get_name(), "compass") ~= 0 then
|
if minetest.get_item_group(stack:get_name(), "compass") ~= 0 then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
if has_compass(player) then
|
if has_compass(player) then
|
||||||
local pos = player:get_pos()
|
local pos = player:get_pos()
|
||||||
|
|
||||||
for j,stack in pairs(player:get_inventory():get_list("main")) do
|
for j,stack in pairs(player:get_inventory():get_list("main")) do
|
||||||
x = stack:get_meta():get_string("x") -- i know i could write the pos in meta, but i like this method more, and it is basicly the same, since else there would be one table with 3 values, and i have 3 values on their own
|
x = stack:get_meta():get_string("x") -- i know i could write the pos in meta, but i like this method more, and it is basicly the same, since else there would be one table with 3 values, and i have 3 values on their own
|
||||||
y = stack:get_meta():get_string("y")
|
y = stack:get_meta():get_string("y")
|
||||||
z = stack:get_meta():get_string("z")
|
z = stack:get_meta():get_string("z")
|
||||||
|
|
@ -117,77 +117,77 @@ minetest.register_globalstep(function(dtime)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if minetest.get_item_group(stack:get_name(), "compass") ~= 0 and
|
if minetest.get_item_group(stack:get_name(), "compass") ~= 0 and
|
||||||
minetest.get_item_group(stack:get_name(), "compass")-1 ~= compass_image then
|
minetest.get_item_group(stack:get_name(), "compass")-1 ~= compass_image then
|
||||||
local itemname = "mcl_compass:"..compass_image
|
local itemname = "mcl_compass:"..compass_image
|
||||||
stack:set_name(itemname)
|
stack:set_name(itemname)
|
||||||
player:get_inventory():set_stack("main", j, stack)
|
player:get_inventory():set_stack("main", j, stack)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
local images = {}
|
local images = {}
|
||||||
for frame = 0, compass_frames-1 do
|
for frame = 0, compass_frames-1 do
|
||||||
local s = string.format("%02d", frame)
|
local s = string.format("%02d", frame)
|
||||||
table.insert(images, "mcl_compass_compass_"..s..".png")
|
table.insert(images, "mcl_compass_compass_"..s..".png")
|
||||||
end
|
end
|
||||||
|
|
||||||
local doc_mod = minetest.get_modpath("doc")
|
local doc_mod = minetest.get_modpath("doc")
|
||||||
|
|
||||||
local stereotype_frame = 18
|
local stereotype_frame = 18
|
||||||
for i,img in ipairs(images) do
|
for i,img in ipairs(images) do
|
||||||
local inv = 1
|
local inv = 1
|
||||||
if i == stereotype_frame then
|
if i == stereotype_frame then
|
||||||
inv = 0
|
inv = 0
|
||||||
end
|
end
|
||||||
local use_doc, longdesc, tt
|
local use_doc, longdesc, tt
|
||||||
--Why is there no usage help? This should be fixed.
|
--Why is there no usage help? This should be fixed.
|
||||||
--local usagehelp
|
--local usagehelp
|
||||||
use_doc = i == stereotype_frame
|
use_doc = i == stereotype_frame
|
||||||
if use_doc then
|
if use_doc then
|
||||||
tt = S("Points to the world origin")
|
tt = S("Points to the world origin")
|
||||||
longdesc = S("Compasses are tools which point to the world origin (X=0, Z=0) or the spawn point in the Overworld.")
|
longdesc = S("Compasses are tools which point to the world origin (X=0, Z=0) or the spawn point in the Overworld.")
|
||||||
end
|
end
|
||||||
local itemstring = "mcl_compass:"..(i-1)
|
local itemstring = "mcl_compass:"..(i-1)
|
||||||
minetest.register_craftitem(itemstring, {
|
minetest.register_craftitem(itemstring, {
|
||||||
description = S("Compass"),
|
description = S("Compass"),
|
||||||
_tt_help = tt,
|
_tt_help = tt,
|
||||||
_doc_items_create_entry = use_doc,
|
_doc_items_create_entry = use_doc,
|
||||||
_doc_items_longdesc = longdesc,
|
_doc_items_longdesc = longdesc,
|
||||||
--_doc_items_usagehelp = usagehelp,
|
--_doc_items_usagehelp = usagehelp,
|
||||||
inventory_image = img,
|
inventory_image = img,
|
||||||
wield_image = img,
|
wield_image = img,
|
||||||
stack_max = 64,
|
stack_max = 64,
|
||||||
groups = {not_in_creative_inventory=inv, compass=i, tool=1, disable_repair=1 }
|
groups = {not_in_creative_inventory=inv, compass=i, tool=1, disable_repair=1 }
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craftitem(itemstring .. "_lodestone", {
|
minetest.register_craftitem(itemstring .. "_lodestone", {
|
||||||
description = S("Lodestone Compass"),
|
description = S("Lodestone Compass"),
|
||||||
_tt_help = tt,
|
_tt_help = tt,
|
||||||
_doc_items_create_entry = use_doc,
|
_doc_items_create_entry = use_doc,
|
||||||
_doc_items_longdesc = longdesc,
|
_doc_items_longdesc = longdesc,
|
||||||
--_doc_items_usagehelp = usagehelp,
|
--_doc_items_usagehelp = usagehelp,
|
||||||
inventory_image = img .. "^[colorize:purple:50",
|
inventory_image = img .. "^[colorize:purple:50",
|
||||||
wield_image = img .. "^[colorize:purple:50",
|
wield_image = img .. "^[colorize:purple:50",
|
||||||
stack_max = 64,
|
stack_max = 64,
|
||||||
groups = {not_in_creative_inventory=1, compass=i, tool=1, disable_repair=1 }
|
groups = {not_in_creative_inventory=1, compass=i, tool=1, disable_repair=1 }
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Help aliases. Makes sure the lookup tool works correctly
|
-- Help aliases. Makes sure the lookup tool works correctly
|
||||||
if not use_doc and doc_mod then
|
if not use_doc and doc_mod then
|
||||||
doc.add_entry_alias("craftitems", "mcl_compass:"..(stereotype_frame-1), "craftitems", itemstring)
|
doc.add_entry_alias("craftitems", "mcl_compass:"..(stereotype_frame-1), "craftitems", itemstring)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
output = "mcl_compass:"..stereotype_frame,
|
output = "mcl_compass:"..stereotype_frame,
|
||||||
recipe = {
|
recipe = {
|
||||||
{"", "mcl_core:iron_ingot", ""},
|
{"", "mcl_core:iron_ingot", ""},
|
||||||
{"mcl_core:iron_ingot", "mesecons:redstone", "mcl_core:iron_ingot"},
|
{"mcl_core:iron_ingot", "mesecons:redstone", "mcl_core:iron_ingot"},
|
||||||
{"", "mcl_core:iron_ingot", ""}
|
{"", "mcl_core:iron_ingot", ""}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
|
|
@ -217,13 +217,13 @@ minetest.register_node("mcl_compass:lodestone",{
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
tiles = {
|
tiles = {
|
||||||
"lodestone_top.png",
|
"lodestone_top.png",
|
||||||
"lodestone_bottom.png",
|
"lodestone_bottom.png",
|
||||||
"lodestone_side1.png",
|
"lodestone_side1.png",
|
||||||
"lodestone_side2.png",
|
"lodestone_side2.png",
|
||||||
"lodestone_side3.png",
|
"lodestone_side3.png",
|
||||||
"lodestone_side4.png"
|
"lodestone_side4.png"
|
||||||
},
|
},
|
||||||
groups = {pickaxey=1, material_stone=1},
|
groups = {pickaxey=1, material_stone=1},
|
||||||
_mcl_hardness = 1.5,
|
_mcl_hardness = 1.5,
|
||||||
_mcl_blast_resistance = 6,
|
_mcl_blast_resistance = 6,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue