sergiotarxz/Camas
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some code cleanup and increase the lumien activation range

Browse Source
This commit is contained in:
kaadmy 2016-02-10 13:18:54 -08:00
parent b31ccecc10
commit 8208c8c275
3 changed files with 71 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mods/default/model.lua
View File

@ -57,9 +57,11 @@ end
function default.player_set_model(player, model_name)
local name = player:get_player_name()
local model = models[model_name]
if player_model[name] == model_name then
return
end
player:set_properties(
{
mesh = model_name,
@ -68,6 +70,7 @@ function default.player_set_model(player, model_name)
visual_size = model.visual_size or {x = 1, y = 1},
})
default.player_set_animation(player, "stand")
player_model[name] = model_name
end
@ -81,12 +84,14 @@ end
function default.player_set_textures(player, textures)
local name = player:get_player_name()
player_textures[name] = textures
player:set_properties({textures = textures,})
end
function default.player_set_animation(player, anim_name, speed)
local name = player:get_player_name()
if player_anim[name] == anim_name then
return
end

9
mods/lumien/init.lua
View File

@ -3,6 +3,9 @@
-- By Kaadmy, for Pixture
--
local lumien_on_radius = 2
local lumien_off_radius = 4
minetest.register_node(
"lumien:crystal_on",
{
@ -112,7 +115,7 @@ minetest.register_abm(
)
local ok = true
for _,object in ipairs(minetest.get_objects_inside_radius(pos, 4)) do
for _,object in ipairs(minetest.get_objects_inside_radius(pos, lumien_off_radius)) do
if object:is_player() then
ok = false
end
@ -135,8 +138,8 @@ local function step(dtime)
local pos = player:getpos()
util.nodefunc(
{x = pos.x-1, y = pos.y-1, z = pos.z-1},
{x = pos.x+1, y = pos.y+1, z = pos.z+1},
{x = pos.x-lumien_on_radius, y = pos.y-lumien_on_radius, z = pos.z-lumien_on_radius},
{x = pos.x+lumien_on_radius, y = pos.y+lumien_on_radius, z = pos.z+lumien_on_radius},
"lumien:crystal_off",
function(pos)
local node = minetest.get_node(pos)

12
mods/nav/map.lua
View File

@ -5,7 +5,7 @@ nav.map_radius = 256
nav.waypoints = {}
local form_nav = default.ui.get_page("core")
default.ui.register_page("nav_nav", form_nav)
default.ui.register_page("nav:nav", form_nav)
local open_formspecs = {}
@ -61,11 +61,11 @@ function nav.show_map(player)
local pos = player:getpos()
local form = default.ui.get_page("nav_nav")
local form = default.ui.get_page("nav:nav")
form = form .. "field[-1,-1;0,0;nav_map_tracker;;]"
form = form .. "label[0.25,0.25;"..minetest.formspec_escape(name).." ("..math.floor(pos.x+0.5)..", "..math.floor(pos.y)..", "..math.floor(pos.z+0.5)..")]"
form = form .. "label[0.25,0.25;"..minetest.formspec_escape(name).." (x: "..math.floor(pos.x+0.5)..", y: "..math.floor(pos.y)..", z: "..math.floor(pos.z+0.5)..")]"
form = form .. "image[0.5,3;6,6;nav_background.png]"
@ -86,18 +86,18 @@ function nav.show_map(player)
form = form .. "label[6.25,6.6;"..nav.map_radius.."m]"
form = form .. "image[5.5,5.5;3,3;"..minetest.formspec_escape("nav_legend.png^[transformFX").."]"
minetest.show_formspec(name, "nav_map", form)
minetest.show_formspec(name, "nav:map", form)
end
local function recieve_fields(player, form_name, fields)
if form_name == "nav_map" then
if form_name == "nav:map" then
if fields.quit or fields.nav_map_tracker then
open_formspecs[player:get_player_name()] = false
end
end
end
if not (minetest.is_singleplayer() or not minetest.setting_get_pos("static_spawnpoint")) then
if minetest.setting_get_pos("static_spawnpoint") and (not minetest.is_singleplayer()) then
minetest.after(
1.0,
function()