master
Pinky 2016-01-18 11:29:41 -05:00
parent 2a5cabc10c
commit 8851aea715
10 changed files with 19 additions and 19 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -45,7 +45,7 @@ function game.hp_loss(pos, damage, color)
})
end
function game.get_time ()
function game.get_time()
local t, m, h, d
t = 24*60*minetest.get_timeofday()
m = floormod(t, 60)

View File

@ -38,7 +38,7 @@ function game.load_old()
end
end
local function savehome(name,pos)
function game.savehome(name,pos)
if not pos then pos = minetest.get_player_by_name(name):getpos() end
local output = io.open(homes_file..name..".phf", "w")
output:write(name.." "..pos.x.." "..pos.y.." "..pos.z)
@ -66,7 +66,7 @@ minetest.register_chatcommand("sethome", {
description = "Sets your home.",
privs = {interact=true},
func = function(name)
savehome(name)
game.savehome(name)
return true, "Home is set!"
end,
})

View File

@ -181,7 +181,7 @@ game.set_formspec = function(player, pagenum, inv_type)
"tooltip[trash;Empty all]",
"list[detached:trash;main;5.0,4;1,1;]",
"image_button[6,2;1,1;game_pvp_btn.png;pvp;;false;false;game_pvp_btn_pr.png]",
"tablecolumns[color;text]",
"ztablecolumns[color;text]",
"tableoptions[background=#00000000;highlight=#00000000;border=false]",
"table[7,1.9;2.5,3;info;#FF9000,Race: "..race..",#FF9000,Gender: "..gender..",#FF9000,PvP: "..pvp..",#FF9000,Hp: "..hp..
"/"..max_hp..",#FF9000,Lvl: "..lvl..",#FF9000,Exp: "..exp.."/"..next_exp..";]",

View File

@ -332,7 +332,7 @@ function game.add_exp(player, amount, lvl_or_xp, divider)
if game.stats.race[name] == "admin" then return false, "Error "..name.." is an admin!!!" end
if lvl_or_xp then
if type(lvl_or_xp) == "boolean" then
game.stats.exp[name] = (amount/10)
--game.stats.exp[name] = (amount/10)
elseif type(lvl_or_xp) == "number" then
local extra = 0
local pl_lvl = game.stats.lvl[name]
@ -340,9 +340,9 @@ function game.add_exp(player, amount, lvl_or_xp, divider)
extra = ((lvl_or_xp - pl_lvl)+lvl_or_xp)/divider
end
game.stats.exp[name] = game.stats.exp[name] + (amount/10) + (extra/10)
else
game.stats.exp[name] = game.stats.exp[name] + (amount/10)
end
else
game.stats.exp[name] = game.stats.exp[name] + (amount/10)
end
game.is_next_lvl(name)
player:hud_change(game.exp_bar[name], "text", game.get_bar_texture(name, "exp"))

View File

@ -140,10 +140,10 @@ game.register_race("orcf", {
game.register_race("nymph", {
mesh = "nymph.b3d",
texture = {"character.png"},
texture = {"characternymph.png"}, --done
collisionbox = {-0.3,-1.0,-0.3, 0.3,0.8,0.3},
physics = {speed=1.2, jump=1.3, gravity=1.0},
armor_groups = {fleshy=105},
armor_groups = {fleshy=115},
size = {x=1.0, y = 1.05, z = 1.0},
}, true)
@ -152,16 +152,16 @@ game.register_race("nymphf", {
texture = {"characternymph_f.png"}, --done
collisionbox = {-0.3,-1.0,-0.3, 0.3,0.8,0.3},
physics = {speed=1.2, jump=1.3, gravity=1.0},
armor_groups = {fleshy=105},
armor_groups = {fleshy=115},
size = {x=0.8, y = 1.0, z = 0.8},
})
game.register_race("symbian", {
mesh = "charactersymbian.b3d",
texture = {"character.png"},
texture = {"charactersymbian.png"}, --done
collisionbox = {-0.3,-1.0,-0.3, 0.3,0.8,0.3},
physics = {speed=1.0, jump=1.0, gravity=1.0},
armor_groups = {fleshy=100},
physics = {speed=1.2, jump=1.1, gravity=1.0},
armor_groups = {fleshy=90},
size = {x=1.1, y = 1.05, z = 1.1},
}, true)
@ -169,8 +169,8 @@ game.register_race("symbianf", {
mesh = "charactersymbianf.b3d",
texture = {"charactersymbian_f.png"}, --done
collisionbox = {-0.3,-1.0,-0.3, 0.3,0.8,0.3},
physics = {speed=1.1, jump=1.1, gravity=1.0},
armor_groups = {fleshy=100},
physics = {speed=1.3, jump=1.2, gravity=1.0},
armor_groups = {fleshy=90},
size = {x=0.9, y = 1.0, z = 0.9},
})
@ -178,8 +178,8 @@ game.register_race("dwarf", {
mesh = "characterdwarf.b3d",
texture = {"characterdwarf.png"}, --done
collisionbox = {-0.3,-1.0,-0.3, 0.3,0.8,0.3},
physics = {speed=1.0, jump=1.0, gravity=1.0},
armor_groups = {fleshy=100},
physics = {speed=0.9, jump=1.0, gravity=1.0},
armor_groups = {fleshy=110},
size = {x=1.0, y = 1.05, z = 1.0},
}, true)
@ -187,8 +187,8 @@ game.register_race("dwarff", {
mesh = "characterdwarff.b3d",
texture = {"characterdwarf_f.png"}, --done
collisionbox = {-0.3,-1.0,-0.3, 0.3,0.8,0.3},
physics = {speed=1.0, jump=1.0, gravity=1.0},
armor_groups = {fleshy=100},
physics = {speed=0.9, jump=1.0, gravity=1.0},
armor_groups = {fleshy=110},
size = {x=0.8, y = 1.0, z = 0.8},
})