Re-add MTG: Trim out the remaining bloat from default

This commit is contained in:
LoneWolfHT 2020-09-22 15:48:35 -07:00
parent 65652ec405
commit 779e0973a6
7 changed files with 1 additions and 91 deletions

View file

@ -73,9 +73,6 @@ for _, chest_color in pairs(colors) do
local formspec = table.concat({ local formspec = table.concat({
"size[8,12]", "size[8,12]",
default.gui_bg,
default.gui_bg_img,
default.gui_slots,
default.get_hotbar_bg(0,7.85), default.get_hotbar_bg(0,7.85),
"list[current_player;main;0,7.85;8,1;]", "list[current_player;main;0,7.85;8,1;]",
"list[current_player;main;0,9.08;8,3;8]", "list[current_player;main;0,9.08;8,3;8]",

View file

@ -5,8 +5,6 @@ function map_maker.show_gui(name)
local formspec = { local formspec = {
"size[9,9.5]", "size[9,9.5]",
"bgcolor[#080808BB;true]", "bgcolor[#080808BB;true]",
default.gui_bg,
default.gui_bg_img,
"label[0,0;1. Select Area]", "label[0,0;1. Select Area]",
"field[0.4,1;1,1;posx;X;", context.center.x, "]", "field[0.4,1;1,1;posx;X;", context.center.x, "]",
@ -57,8 +55,7 @@ end
function map_maker.show_progress_formspec(name, text) function map_maker.show_progress_formspec(name, text)
minetest.show_formspec(name, "ctf_map:progress", minetest.show_formspec(name, "ctf_map:progress",
"size[6,1]bgcolor[#080808BB;true]" .. "size[6,1]bgcolor[#080808BB;true]" ..
default.gui_bg .. "label[0,0;" ..
default.gui_bg_img .. "label[0,0;" ..
minetest.formspec_escape(text) .. "]") minetest.formspec_escape(text) .. "]")
end end

View file

@ -102,7 +102,6 @@ function ctf_stats.get_formspec(title, players, header, target)
end) end)
local ret = "size[14," .. 7 + header .. "]" local ret = "size[14," .. 7 + header .. "]"
ret = ret .. default.gui_bg .. default.gui_bg_img
ret = ret .. "container[0," .. header .. "]" ret = ret .. "container[0," .. header .. "]"
ret = ret .. "vertlabel[0,1;" .. title .. "]" ret = ret .. "vertlabel[0,1;" .. title .. "]"

View file

@ -130,21 +130,6 @@ function default.node_sound_snow_defaults(table)
end end
--
-- Lavacooling
--
default.cool_lava = function(pos, node)
if node.name == "default:lava_source" then
minetest.set_node(pos, {name = "default:obsidian"})
else -- Lava flowing
minetest.set_node(pos, {name = "default:stone"})
end
minetest.sound_play("default_cool_lava",
{pos = pos, max_hear_distance = 16, gain = 0.25})
end
-- --
-- Optimized helper to put all items in an inventory into a drops list -- Optimized helper to put all items in an inventory into a drops list
-- --
@ -162,63 +147,6 @@ function default.get_inventory_drops(pos, inventory, drops)
end end
--
-- Papyrus and cactus growing
--
-- Wrapping the functions in ABM action is necessary to make overriding them possible
function default.grow_cactus(pos, node)
if node.param2 >= 4 then
return
end
pos.y = pos.y - 1
if minetest.get_item_group(minetest.get_node(pos).name, "sand") == 0 then
return
end
pos.y = pos.y + 1
local height = 0
while node.name == "default:cactus" and height < 4 do
height = height + 1
pos.y = pos.y + 1
node = minetest.get_node(pos)
end
if height == 4 or node.name ~= "air" then
return
end
if minetest.get_node_light(pos) < 13 then
return
end
minetest.set_node(pos, {name = "default:cactus"})
return true
end
function default.grow_papyrus(pos, node)
pos.y = pos.y - 1
local name = minetest.get_node(pos).name
if name ~= "default:dirt_with_grass" and name ~= "default:dirt" then
return
end
if not minetest.find_node_near(pos, 3, {"group:water"}) then
return
end
pos.y = pos.y + 1
local height = 0
while node.name == "default:papyrus" and height < 4 do
height = height + 1
pos.y = pos.y + 1
node = minetest.get_node(pos)
end
if height == 4 or node.name ~= "air" then
return
end
if minetest.get_node_light(pos) < 13 then
return
end
minetest.set_node(pos, {name = "default:papyrus"})
return true
end
-- --
-- Dig upwards -- Dig upwards
-- --

View file

@ -44,6 +44,4 @@ dofile(default_path.."/tools.lua")
dofile(default_path.."/item_entity.lua") dofile(default_path.."/item_entity.lua")
dofile(default_path.."/craftitems.lua") dofile(default_path.."/craftitems.lua")
dofile(default_path.."/crafting.lua") dofile(default_path.."/crafting.lua")
dofile(default_path.."/mapgen.lua")
dofile(default_path.."/aliases.lua") dofile(default_path.."/aliases.lua")
dofile(default_path.."/legacy.lua")

View file

@ -5,9 +5,6 @@
function default.get_furnace_active_formspec(fuel_percent, item_percent) function default.get_furnace_active_formspec(fuel_percent, item_percent)
return "size[8,8.5]".. return "size[8,8.5]"..
default.gui_bg..
default.gui_bg_img..
default.gui_slots..
"list[context;src;2.75,0.5;1,1;]".. "list[context;src;2.75,0.5;1,1;]"..
"list[context;fuel;2.75,2.5;1,1;]".. "list[context;fuel;2.75,2.5;1,1;]"..
"image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:".. "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
@ -28,9 +25,6 @@ end
function default.get_furnace_inactive_formspec() function default.get_furnace_inactive_formspec()
return "size[8,8.5]".. return "size[8,8.5]"..
default.gui_bg..
default.gui_bg_img..
default.gui_slots..
"list[context;src;2.75,0.5;1,1;]".. "list[context;src;2.75,0.5;1,1;]"..
"list[context;fuel;2.75,2.5;1,1;]".. "list[context;fuel;2.75,2.5;1,1;]"..
"image[2.75,1.5;1,1;default_furnace_fire_bg.png]".. "image[2.75,1.5;1,1;default_furnace_fire_bg.png]"..

View file

@ -27,9 +27,6 @@ local non_ground_nodes = {
local chest_formspec = local chest_formspec =
"size[8,9]" .. "size[8,9]" ..
default.gui_bg ..
default.gui_bg_img ..
default.gui_slots ..
"list[current_name;main;0,0.3;8,4;]" .. "list[current_name;main;0,0.3;8,4;]" ..
"list[current_player;main;0,4.85;8,1;]" .. "list[current_player;main;0,4.85;8,1;]" ..
"list[current_player;main;0,6.08;8,3;8]" .. "list[current_player;main;0,6.08;8,3;8]" ..