nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-06-28 06:11:47 +02:00
Code Issues Releases Wiki Activity

Removed all whitespaces (using new script)

Browse Source
This commit is contained in:
LeMagnesium
2015-06-10 19:12:48 +02:00
parent f81b8ca677
commit 2913bcb93d
101 changed files with 589 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
minetestforfun_game/mods/default/commands.lua
View File

@ -13,7 +13,7 @@ minetest.register_craftitem("default:infotool", {
if minetest.registered_items[nn] == nil or minetest.registered_items[nn].tiles == nil or type(minetest.registered_items[nn].tiles[1]) ~= "string" then return end
local def = minetest.registered_nodes[nn]
if not def then return end
local textures = def.tiles
local description = def.description
if not textures then

2
minetestforfun_game/mods/default/functions.lua
View File

@ -176,7 +176,7 @@ local function cool_wf_vm(pos, node1, node2)
nodes[i] = stone
end
end
manip:set_data(nodes)
manip:write_to_map()
-- minetest.log("action", "Lava cooling happened at (" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ").")

50
minetestforfun_game/mods/default/furnace.lua
View File

@ -4,7 +4,7 @@
--
local function active_formspec(fuel_percent, item_percent)
local formspec =
local formspec =
"size[8,8.5]"..
default.gui_slots..
"list[current_name;src;2.75,0.5;1,1;]"..
@ -94,9 +94,9 @@ minetest.register_node("default:furnace", {
legacy_facedir_simple = true,
is_ground_content = false,
sounds = default.node_sound_stone_defaults(),
can_dig = can_dig,
allow_metadata_inventory_put = allow_metadata_inventory_put,
allow_metadata_inventory_move = allow_metadata_inventory_move,
allow_metadata_inventory_take = allow_metadata_inventory_take,
@ -126,9 +126,9 @@ minetest.register_node("default:furnace_active", {
legacy_facedir_simple = true,
is_ground_content = false,
sounds = default.node_sound_stone_defaults(),
can_dig = can_dig,
allow_metadata_inventory_put = allow_metadata_inventory_put,
allow_metadata_inventory_move = allow_metadata_inventory_move,
allow_metadata_inventory_take = allow_metadata_inventory_take,
@ -335,7 +335,7 @@ minetest.register_abm({
local fuel_time = meta:get_float("fuel_time") or 0
local src_time = meta:get_float("src_time") or 0
local fuel_totaltime = meta:get_float("fuel_totaltime") or 0
--
-- Inizialize inventory
--
@ -352,24 +352,24 @@ minetest.register_abm({
local srclist = inv:get_list("src")
local fuellist = inv:get_list("fuel")
local dstlist = inv:get_list("dst")
--
-- Cooking
--
-- Check if we have cookable content
local cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
local cookable = true
if cooked.time == 0 then
cookable = false
end
-- Check if we have enough fuel to burn
if fuel_time < fuel_totaltime then
-- The furnace is currently active and has enough fuel
fuel_time = fuel_time + 1
-- If there is a cookable item then check if it is ready yet
if cookable then
src_time = src_time + 1
@ -387,7 +387,7 @@ minetest.register_abm({
if cookable then
-- We need to get new fuel
local fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist})
if fuel.time == 0 then
-- No valid fuel in fuel list
fuel_totaltime = 0
@ -396,10 +396,10 @@ minetest.register_abm({
else
-- Take fuel from fuel list
inv:set_stack("fuel", 1, afterfuel.items[1])
fuel_totaltime = fuel.time
fuel_time = 0
end
else
-- We don't need to get new fuel since there is no cookable item
@ -408,7 +408,7 @@ minetest.register_abm({
src_time = 0
end
end
--
-- Update formspec, infotext and node
--
@ -425,7 +425,7 @@ minetest.register_abm({
item_state = "Not cookable"
end
end
local fuel_state = "Empty"
local active = "inactive "
if fuel_time <= fuel_totaltime and fuel_totaltime ~= 0 then
@ -440,9 +440,9 @@ minetest.register_abm({
end
swap_node(pos, "default:furnace")
end
local infotext = "Furnace " .. active .. "(Item: " .. item_state .. "; Fuel: " .. fuel_state .. ")"
--
-- Set meta values
--
@ -475,13 +475,13 @@ minetest.register_abm({
local srclist = inv:get_list("src")
local cooked = nil
if srclist then
cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
end
local was_active = false
if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then
was_active = true
meta:set_float("fuel_time", meta:get_float("fuel_time") + 1)
@ -501,12 +501,12 @@ minetest.register_abm({
meta:set_string("src_time", 0)
end
end
local item_percent = 0
if cooked then
item_percent = meta:get_float("src_time") * 100 / cooked.time
end
if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then
local percent = math.floor(meta:get_float("fuel_time") /
meta:get_float("fuel_totaltime") * 100)
@ -520,7 +520,7 @@ minetest.register_abm({
local cooked = nil
local fuellist = inv:get_list("fuel")
local srclist = inv:get_list("src")
if srclist then
cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
end
@ -546,7 +546,7 @@ minetest.register_abm({
meta:set_string("fuel_totaltime", fuel.time)
meta:set_string("fuel_time", 0)
local stack = inv:get_stack("fuel", 1)
stack:take_item()
inv:set_stack("fuel", 1, stack)

10
minetestforfun_game/mods/default/mapgen.lua
View File

@ -387,7 +387,7 @@ function default.register_ores()
end
-- Underground springs:
minetest.register_ore({
ore_type = "scatter",
ore = "default:water_source",
@ -721,7 +721,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
break
end
end
if ground_y then
local p = {x=x,y =ground_y+1,z=z}
local nn = minetest.get_node(p).name
@ -732,14 +732,14 @@ minetest.register_on_generated(function(minp, maxp, seed)
-- If desert sand, add dry shrub
if nn == "default:desert_sand" then
minetest.set_node(p,{name = "default:dry_shrub"})
-- If dirt with grass, add grass
elseif nn == "default:dirt_with_grass" then
minetest.set_node(p,{name = "default:grass_" .. pr:next(1, 5)})
end
end
end
end
end
end
@ -989,7 +989,7 @@ end
--
function default.register_blobs()
minetest.register_ore({
minetest.register_ore({
ore_type = "blob",
ore = "default:sand",
wherein = {"default:stone"},

4
minetestforfun_game/mods/default/nodes.lua
View File

@ -1613,7 +1613,7 @@ minetest.register_node("default:meze", {
drop = "",
groups = {cracky = 1, level = 2, fall_damage_add_percent = -75},
sounds = default.node_sound_wood_defaults(), -- Intended.
on_dig = function(pos, node, digger)
if digger and minetest.setting_getbool("enable_damage") and not minetest.setting_getbool("creative_mode") then
minetest.after(3, die_later, digger)
@ -2170,7 +2170,7 @@ if minetest.setting_getbool("xray") then
minetest.override_item("default:stone_with_mese", {tiles = {"default_mineral_mese.png"}})
minetest.override_item("default:stone_with_diamond", {tiles = {"default_mineral_diamond.png"}})
minetest.override_item("default:stone_with_coin", {tiles = {"maptools_gold_coin.png"}})
-- Nodes to hide:
minetest.override_item("default:stone", {drawtype = "airlike", pointable = false,})
minetest.override_item("default:dirt", {drawtype = "airlike", pointable = false,})

2
minetestforfun_game/mods/default/player.lua
View File

@ -95,7 +95,7 @@ minetest.register_on_joinplayer(function(player)
default.player_attached[player:get_player_name()] = false
default.player_set_model(player, "character.b3d")
player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30)
-- set GUI
if not minetest.setting_getbool("creative_mode") then
player:set_inventory_formspec(default.gui_survival_form)

16
minetestforfun_game/mods/default/trees.lua
View File

@ -57,13 +57,13 @@ minetest.register_abm({
if not can_grow(pos) then
return
end
minetest.log("action", "A pine sapling grows into a tree at "..
minetest.pos_to_string(pos))
default.grow_pine_tree(pos)
end
})
-- Appletree, jungletree function
local function add_trunk_and_leaves(data, a, pos, tree_cid, leaves_cid,
@ -72,7 +72,7 @@ local function add_trunk_and_leaves(data, a, pos, tree_cid, leaves_cid,
local c_air = minetest.get_content_id("air")
local c_ignore = minetest.get_content_id("ignore")
local c_apple = minetest.get_content_id("default:apple")
-- Trunk
for y_dist = 0, height - 1 do
local vi = a:index(x, y + y_dist, z)
@ -139,7 +139,7 @@ function default.grow_tree(pos, is_apple_tree, bad)
local height = random(4, 5)
local c_tree = minetest.get_content_id("default:tree")
local c_leaves = minetest.get_content_id("default:leaves")
local vm = minetest.get_voxel_manip()
local minp, maxp = vm:read_from_map(
{x = pos.x - 2, y = pos.y, z = pos.z - 2},
@ -410,15 +410,15 @@ minetest.register_abm({
interval = 80,
chance = 3,
action = function(pos, node)
local nu = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name
local is_soil = minetest.get_item_group(nu, "soil")
if is_soil == 0 then
return
end
minetest.remove_node({x=pos.x, y=pos.y, z=pos.z})
default.grow_cherry_tree(pos, false, "default:cherry_tree", "default:cherry_blossom_leaves")
end,