Wuzzy/BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix prev commit and convert spaces => tabs.

Browse Source
This commit is contained in:
Maksim 2019-05-11 23:20:22 +02:00
parent c95e292e20
commit 6cd76e2e17
7 changed files with 95 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
games/default/files/beds/beds.lua
View File

@ -26,8 +26,8 @@ beds.register_bed("beds:bed", {
}, },
selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5}, selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
recipe = { recipe = {
{"group:wool", "group:wool", "group:wool"}, {"group:wool", "group:wool", "group:wool"},
{"group:wood", "group:wood", "group:wood"} {"group:wood", "group:wood", "group:wood"}
}, },
}) })

94
games/default/files/creative/inventory.lua
View File

@ -46,15 +46,15 @@ hoch["matr"] = "^[transformfy"
hoch["inv"] = "^[transformfy" hoch["inv"] = "^[transformfy"
bg["blocks"] = "default_grass_side.png" bg["blocks"] = "default_grass_side.png"
bg["deco"] = "creative_deko.png" bg["deco"] = "default_sapling.png"
bg["mese"] = "creative_mese.png" bg["mese"] = "jeija_lightstone_gray_on.png"
bg["rail"] = "boats_inventory.png" bg["rail"] = "boats_inventory.png"
bg["misc"] = "bucket_water.png" bg["misc"] = "bucket_water.png"
bg["all"] = "creative_all.png" bg["all"] = "creative_all.png"
bg["food"] = "creative_food.png" bg["food"] = "creative_food.png"
bg["tools"] = "creative_tool.png" bg["tools"] = "default_tool_diamondpick.png"
bg["combat"] = "creative_sword.png" bg["combat"] = "default_tool_steelsword.png"
bg["brew"] = "creative_brew.png" bg["brew"] = "potions_bottle.png"
bg["matr"] = "default_emerald.png" bg["matr"] = "default_emerald.png"
bg["inv"] = "creative_inv.png" bg["inv"] = "creative_inv.png"
@ -166,50 +166,50 @@ trash:set_size("main", 1)
creative.formspec_add = "" creative.formspec_add = ""
local function get_creative_formspec(player_name, start_i, pagenum, page, pagemax) local function get_creative_formspec(player_name, start_i, pagenum, page, pagemax)
pagenum = math.floor(pagenum) or 1 pagenum = math.floor(pagenum) or 1
pagemax = (pagemax and pagemax ~= 0) and pagemax or 1 pagemax = (pagemax and pagemax ~= 0) and pagemax or 1
local slider_height = 4 / pagemax local slider_height = 4 / pagemax
local slider_pos = slider_height * (pagenum - 1) + 2.2 local slider_pos = slider_height * (pagenum - 1) + 2.2
local formspec = "" local formspec = ""
local main_list = "list[detached:creative_" .. player_name .. local main_list = "list[detached:creative_" .. player_name ..
";main;0,1.75;9,5;"..tostring(start_i).."]" ";main;0,1.75;9,5;"..tostring(start_i).."]"
local name = "all" local name = "all"
if page ~= nil then name = page end if page ~= nil then name = page end
if name == "inv" then if name == "inv" then
main_list = "image[-0.2,1.7;11.35,2.33;creative_bg.png]".. main_list = "image[-0.2,1.7;11.35,2.33;creative_bg.png]"..
"image[-0.3,0.15;3,4.3;inventory_armor.png]".. "image[-0.3,0.15;3,4.3;inventory_armor.png]"..
"list[current_player;main;0,3.75;9,3;9]".. "list[current_player;main;0,3.75;9,3;9]"..
"list[detached:"..player_name.."_armor;armor;0.02,1.7;1,1;]".. "list[detached:"..player_name.."_armor;armor;0.02,1.7;1,1;]"..
"list[detached:"..player_name.."_armor;armor;0.02,2.7;1,1;1]".. "list[detached:"..player_name.."_armor;armor;0.02,2.7;1,1;1]"..
"list[detached:"..player_name.."_armor;armor;0.98,1.7;1,1;2]".. "list[detached:"..player_name.."_armor;armor;0.98,1.7;1,1;2]"..
"list[detached:"..player_name.."_armor;armor;0.98,2.7;1,1;3]" "list[detached:"..player_name.."_armor;armor;0.98,2.7;1,1;3]"
end end
local formspec = "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]".. local formspec = "image_button_exit[8.4,-0.1;0.75,0.75;close.png;exit;;true;true;]"..
"background[-0.19,-0.25;10.5,9.87;inventory_creative.png]".. "background[-0.19,-0.25;10.5,9.87;inventory_creative.png]"..
"bgcolor[#080808BB;true]".. "bgcolor[#080808BB;true]"..
"listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]".. "listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..
"label[-5,-5;"..name.."]".. "label[-5,-5;"..name.."]"..
"image_button[-0.1,0;1,1;"..bg["blocks"]..";build;;;false]".. --build blocks "image_button[-0.1,0;1,1;"..bg["blocks"]..";build;;;false]".. --build blocks
"image_button[1.15,0;1,1;"..bg["deco"]..";deco;;;false]".. --decoration blocks "image_button[1.15,0;1,1;"..bg["deco"]..";deco;;;false]".. --decoration blocks
"image_button[2.415,0;1,1;"..bg["mese"]..";mese;;;false]".. --bluestone "image_button[2.415,0;1,1;"..bg["mese"]..";mese;;;false]".. --bluestone
"image_button[3.693,0;1,1;"..bg["rail"]..";rail;;;false]".. --transportation "image_button[3.693,0;1,1;"..bg["rail"]..";rail;;;false]".. --transportation
"image_button[4.93,0;1,1;"..bg["misc"]..";misc;;;false]".. --miscellaneous "image_button[4.93,0;1,1;"..bg["misc"]..";misc;;;false]".. --miscellaneous
"image_button[9.19,0;1,1;"..bg["all"]..";default;;;false]".. --search "image_button[9.19,0;1,1;"..bg["all"]..";default;;;false]".. --search
"image[0,1;5,0.75;fnt_"..name..".png]".. "image[0,1;5,0.75;fnt_"..name..".png]"..
"list[current_player;main;0,7;9,1;]".. "list[current_player;main;0,7;9,1;]"..
main_list.. main_list..
"image_button[9.03,1.74;0.85,0.6;creative_up.png;creative_prev;]".. "image_button[9.03,1.74;0.85,0.6;creative_up.png;creative_prev;]"..
"image_button[9.03,6.15;0.85,0.6;creative_down.png;creative_next;]".. "image_button[9.03,6.15;0.85,0.6;creative_down.png;creative_next;]"..
"image_button[-0.1,8.28;1,1;"..bg["food"]..";food;;;false]".. --foodstuff "image_button[-0.1,8.28;1,1;"..bg["food"]..";food;;;false]".. --foodstuff
"image_button[1.15,8.28;1,1;"..bg["tools"]..";tools;;;false]".. --tools "image_button[1.15,8.28;1,1;"..bg["tools"]..";tools;;;false]".. --tools
"image_button[2.415,8.28;1,1;"..bg["combat"]..";combat;;;false]".. --combat "image_button[2.415,8.28;1,1;"..bg["combat"]..";combat;;;false]".. --combat
"image_button[3.693,8.28;1,1;"..bg["matr"]..";matr;;;false]".. --brewing "image_button[3.693,8.28;1,1;"..bg["matr"]..";matr;;;false]".. --brewing
"image_button[4.93,8.28;1,1;"..bg["brew"]..";brew;;;false]".. --materials "image_button[4.93,8.28;1,1;"..bg["brew"]..";brew;;;false]".. --materials
"image_button[9.19,8.28;1,1;"..bg["inv"]..";inv;;;false]".. --inventory "image_button[9.19,8.28;1,1;"..bg["inv"]..";inv;;;false]".. --inventory
"list[detached:creative_trash;main;9.02,7.02;1,1;]".. "list[detached:creative_trash;main;9.02,7.02;1,1;]"..
"image["..ofs[name].x..", "..ofs[name].y..";1.5,1.44;creative_active.png"..hoch[name].."]".. "image["..ofs[name].x..", "..ofs[name].y..";1.5,1.44;creative_active.png"..hoch[name].."]"..
"image["..(ofs[name].x + 0.17)..", "..(ofs[name].y + ofy[name])..";1,1;"..bg[name].."]".. "image["..(ofs[name].x + 0.17)..", "..(ofs[name].y + ofy[name])..";1,1;"..bg[name].."]"..
"image[9.04," .. tostring(slider_pos) .. ";0.78,"..tostring(slider_height) .. ";creative_slider.png]" "image[9.04," .. tostring(slider_pos) .. ";0.78,"..tostring(slider_height) .. ";creative_slider.png]"
if name == "all" then if name == "all" then
formspec = formspec .. "field_close_on_enter[suche;false]" .. formspec = formspec .. "field_close_on_enter[suche;false]" ..

2
games/default/files/default/functions.lua
View File

@ -401,7 +401,7 @@ local function leafdecay_after_destruct(pos, oldnode, def)
local node = minetest.get_node(v) local node = minetest.get_node(v)
local timer = minetest.get_node_timer(v) local timer = minetest.get_node_timer(v)
if node.param2 == 0 and not timer:is_started() then if node.param2 == 0 and not timer:is_started() then
timer:start(math.random(20, 120) / 10) timer:start(math.random(40, 160) / 10)
end end
end end
end end

19
games/default/files/default/nodes.lua
View File

@ -865,6 +865,7 @@ minetest.register_node("default:water_source", {
tiles = { tiles = {
{ {
name = "default_water_source_animated.png", name = "default_water_source_animated.png",
backface_culling = false,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
@ -872,18 +873,15 @@ minetest.register_node("default:water_source", {
length = 2.0, length = 2.0,
}, },
}, },
},
special_tiles = {
-- New-style water source material (mostly unused)
{ {
name = "default_water_source_animated.png", name = "default_water_source_animated.png",
backface_culling = true,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
aspect_h = 32, aspect_h = 32,
length = 2.0, length = 2.0,
}, },
backface_culling = false,
}, },
}, },
alpha = 160, alpha = 160,
@ -958,6 +956,7 @@ minetest.register_node("default:river_water_source", {
tiles = { tiles = {
{ {
name = "default_river_water_source_animated.png", name = "default_river_water_source_animated.png",
backface_culling = false,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
@ -965,17 +964,15 @@ minetest.register_node("default:river_water_source", {
length = 2.0, length = 2.0,
}, },
}, },
},
special_tiles = {
{ {
name = "default_river_water_source_animated.png", name = "default_river_water_source_animated.png",
backface_culling = true,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
aspect_h = 32, aspect_h = 32,
length = 2.0, length = 2.0,
}, },
backface_culling = false,
}, },
}, },
alpha = 160, alpha = 160,
@ -994,7 +991,7 @@ minetest.register_node("default:river_water_source", {
liquid_renewable = false, liquid_renewable = false,
liquid_range = 2, liquid_range = 2,
post_effect_color = {a = 103, r = 30, g = 76, b = 90}, post_effect_color = {a = 103, r = 30, g = 76, b = 90},
groups = {water = 3, liquid = 3, puts_out_fire = 1, cools_lava = 1, not_in_creative_inventory = 1}, groups = {water = 3, liquid = 3, cools_lava = 1, not_in_creative_inventory = 1},
sounds = default.node_sound_water_defaults(), sounds = default.node_sound_water_defaults(),
}) })
@ -1053,6 +1050,7 @@ minetest.register_node("default:lava_source", {
tiles = { tiles = {
{ {
name = "default_lava_source_animated.png", name = "default_lava_source_animated.png",
backface_culling = false,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
@ -1060,18 +1058,15 @@ minetest.register_node("default:lava_source", {
length = 3.0, length = 3.0,
}, },
}, },
},
special_tiles = {
-- New-style lava source material (mostly unused)
{ {
name = "default_lava_source_animated.png", name = "default_lava_source_animated.png",
backface_culling = true,
animation = { animation = {
type = "vertical_frames", type = "vertical_frames",
aspect_w = 32, aspect_w = 32,
aspect_h = 32, aspect_h = 32,
length = 3.0, length = 3.0,
}, },
backface_culling = false,
}, },
}, },
paramtype = "light", paramtype = "light",

6
games/default/files/farming/init.lua
View File

@ -54,9 +54,9 @@ minetest.register_craft({
-- String -- String
minetest.register_craftitem("farming:string",{ minetest.register_craftitem("farming:string",{
description = "String", description = "String",
inventory_image = "farming_string.png", inventory_image = "farming_string.png",
groups = {materials = 1}, groups = {materials = 1},
}) })
-- Cotton -- Cotton

2
games/default/files/hunger/food.lua
View File

@ -90,7 +90,7 @@ end
if minetest.get_modpath("bushes_classic") then if minetest.get_modpath("bushes_classic") then
-- bushes_classic mod, as found in the plantlife modpack -- bushes_classic mod, as found in the plantlife modpack
local berries = { local berries = {
"strawberry", "strawberry",
"blackberry", "blackberry",
"blueberry", "blueberry",
"raspberry", "raspberry",

68
games/default/files/inventory/init.lua
View File

@ -1,31 +1,31 @@
local show_armor = minetest.get_modpath("3d_armor") local show_armor = minetest.get_modpath("3d_armor")
local function item_drop(itemstack, dropper, pos) local function item_drop(itemstack, dropper, pos)
if dropper:is_player() then if dropper:is_player() then
local v = dropper:get_look_dir() local v = dropper:get_look_dir()
local p = {x=pos.x, y=pos.y+1.2, z=pos.z} local p = {x=pos.x, y=pos.y+1.2, z=pos.z}
p.x = p.x+(math.random(1,3)*0.2) p.x = p.x+(math.random(1,3)*0.2)
p.z = p.z+(math.random(1,3)*0.2) p.z = p.z+(math.random(1,3)*0.2)
local obj = minetest.add_item(p, itemstack) local obj = minetest.add_item(p, itemstack)
if obj then if obj then
v.x = v.x*4 v.x = v.x*4
v.y = v.y*4 + 2 v.y = v.y*4 + 2
v.z = v.z*4 v.z = v.z*4
obj:setvelocity(v) obj:setvelocity(v)
end end
else else
minetest.add_item(pos, itemstack) minetest.add_item(pos, itemstack)
end end
return itemstack return itemstack
end end
local function drop_fields(player, name) local function drop_fields(player, name)
local inv = player:get_inventory() local inv = player:get_inventory()
for i,stack in ipairs(inv:get_list(name)) do for i,stack in ipairs(inv:get_list(name)) do
item_drop(stack, player, player:get_pos()) item_drop(stack, player, player:get_pos())
stack:clear() stack:clear()
inv:set_stack(name, i, stack) inv:set_stack(name, i, stack)
end end
end end
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
@ -51,10 +51,10 @@ sfinv.override_page("sfinv:inventory", {
if show_armor then if show_armor then
local player_name = player:get_player_name() local player_name = player:get_player_name()
form = form .. form = form ..
"list[detached:"..player_name.."_armor;armor;0,0;1,1;]".. "list[detached:"..player_name.."_armor;armor;0,0;1,1;]"..
"list[detached:"..player_name.."_armor;armor;0,1;1,1;1]".. "list[detached:"..player_name.."_armor;armor;0,1;1,1;1]"..
"list[detached:"..player_name.."_armor;armor;0,2;1,1;2]".. "list[detached:"..player_name.."_armor;armor;0,2;1,1;2]"..
"list[detached:"..player_name.."_armor;armor;0,3;1,1;3]" "list[detached:"..player_name.."_armor;armor;0,3;1,1;3]"
end end
return sfinv.make_formspec(player, context, form, true) return sfinv.make_formspec(player, context, form, true)
end, end,
@ -66,14 +66,14 @@ sfinv.override_page("sfinv:inventory", {
}) })
local split_inv = minetest.create_detached_inventory("split", { local split_inv = minetest.create_detached_inventory("split", {
allow_move = function(_, _, _, _, _, count, _) allow_move = function(_, _, _, _, _, count, _)
return count return count
end, end,
allow_put = function(_, _, _, stack, _) allow_put = function(_, _, _, stack, _)
return stack:get_count() / 2 return stack:get_count() / 2
end, end,
allow_take = function(_, _, _, stack, _) allow_take = function(_, _, _, stack, _)
return stack:get_count() return stack:get_count()
end, end,
}) })
split_inv:set_size("main", 1) split_inv:set_size("main", 1)