[minetestforfun_game] Update
This commit is contained in:
parent
ca4778aa53
commit
c5595df77d
@ -42,7 +42,7 @@ creative_inventory.init_creative_inventory = function(player)
|
|||||||
})
|
})
|
||||||
|
|
||||||
creative_inventory.update(player_name, nil, 2)
|
creative_inventory.update(player_name, nil, 2)
|
||||||
--print("creative inventory size: "..dump(creative_inventory.creative_inventory_size))
|
--print("creative inventory size: "..dump(creative_inventory[player_name].size))
|
||||||
end
|
end
|
||||||
|
|
||||||
local function tab_category(tab_id)
|
local function tab_category(tab_id)
|
||||||
@ -128,19 +128,19 @@ end
|
|||||||
|
|
||||||
creative_inventory.set_crafting_formspec = function(player)
|
creative_inventory.set_crafting_formspec = function(player)
|
||||||
player:set_inventory_formspec([[
|
player:set_inventory_formspec([[
|
||||||
size[8,7.5]
|
size[8,8.6]
|
||||||
list[current_player;craft;2,0.25;3,3;]
|
list[current_player;craft;2,0.75;3,3;]
|
||||||
list[current_player;craftpreview;6,1.25;1,1;]
|
list[current_player;craftpreview;6,1.75;1,1;]
|
||||||
list[current_player;main;0,3.6;8,1;]
|
list[current_player;main;0,4.7;8,1;]
|
||||||
list[current_player;main;0,4.75;8,3;8]
|
list[current_player;main;0,5.85;8,3;8]
|
||||||
list[detached:creative_trash;main;0,2.25;1,1;]
|
list[detached:creative_trash;main;0,2.75;1,1;]
|
||||||
image[0.06,2.35;0.8,0.8;trash_icon.png]
|
image[0.06,2.85;0.8,0.8;trash_icon.png]
|
||||||
image[5,1.25;1,1;gui_furnace_arrow_bg.png^[transformR270]
|
image[5,1.75;1,1;gui_furnace_arrow_bg.png^[transformR270]
|
||||||
tabheader[0,0;tabs;Crafting,All,Nodes,Tools,Items;1;true;false]
|
tabheader[0,0;tabs;Crafting,All,Nodes,Tools,Items;1;true;false]
|
||||||
listring[current_player;main]
|
listring[current_player;main]
|
||||||
listring[current_player;craft]
|
listring[current_player;craft]
|
||||||
]] ..
|
]] ..
|
||||||
default.get_hotbar_bg(0,3.6)..
|
default.get_hotbar_bg(0,4.7)..
|
||||||
default.gui_bg .. default.gui_bg_img .. default.gui_slots
|
default.gui_bg .. default.gui_bg_img .. default.gui_slots
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
@ -191,6 +191,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
|||||||
start_i = start_i - 3*8
|
start_i = start_i - 3*8
|
||||||
if start_i < 0 then
|
if start_i < 0 then
|
||||||
start_i = inv_size - (inv_size % (3*8))
|
start_i = inv_size - (inv_size % (3*8))
|
||||||
|
if inv_size == start_i then
|
||||||
|
start_i = math.max(0, inv_size - (3*8))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
elseif fields.creative_next then
|
elseif fields.creative_next then
|
||||||
start_i = start_i + 3*8
|
start_i = start_i + 3*8
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
-- Aliases for map generator outputs
|
-- Aliases for map generator outputs
|
||||||
--
|
--
|
||||||
|
|
||||||
minetest.register_alias("mapgen_air", "air")
|
|
||||||
minetest.register_alias("mapgen_stone", "default:stone")
|
minetest.register_alias("mapgen_stone", "default:stone")
|
||||||
minetest.register_alias("mapgen_dirt", "default:dirt")
|
minetest.register_alias("mapgen_dirt", "default:dirt")
|
||||||
minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
|
minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
|
||||||
@ -706,6 +705,24 @@ function default.register_biomes()
|
|||||||
humidity_point = 35,
|
humidity_point = 35,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
minetest.register_biome({
|
||||||
|
name = "tundra_beach",
|
||||||
|
--node_dust = "",
|
||||||
|
node_top = "default:gravel",
|
||||||
|
depth_top = 1,
|
||||||
|
node_filler = "default:gravel",
|
||||||
|
depth_filler = 2,
|
||||||
|
--node_stone = "",
|
||||||
|
--node_water_top = "",
|
||||||
|
--depth_water_top = ,
|
||||||
|
--node_water = "",
|
||||||
|
--node_river_water = "",
|
||||||
|
y_min = -3,
|
||||||
|
y_max = 1,
|
||||||
|
heat_point = 15,
|
||||||
|
humidity_point = 35,
|
||||||
|
})
|
||||||
|
|
||||||
minetest.register_biome({
|
minetest.register_biome({
|
||||||
name = "tundra_ocean",
|
name = "tundra_ocean",
|
||||||
--node_dust = "",
|
--node_dust = "",
|
||||||
@ -719,7 +736,7 @@ function default.register_biomes()
|
|||||||
--node_water = "",
|
--node_water = "",
|
||||||
--node_river_water = "",
|
--node_river_water = "",
|
||||||
y_min = -112,
|
y_min = -112,
|
||||||
y_max = 1,
|
y_max = -4,
|
||||||
heat_point = 15,
|
heat_point = 15,
|
||||||
humidity_point = 35,
|
humidity_point = 35,
|
||||||
})
|
})
|
||||||
@ -1743,8 +1760,8 @@ if mg_params.mgname == "v6" then
|
|||||||
default.register_mgv6_decorations()
|
default.register_mgv6_decorations()
|
||||||
minetest.register_on_generated(default.generate_nyancats)
|
minetest.register_on_generated(default.generate_nyancats)
|
||||||
elseif mg_params.mgname ~= "singlenode" then
|
elseif mg_params.mgname ~= "singlenode" then
|
||||||
default.register_ores()
|
|
||||||
default.register_biomes()
|
default.register_biomes()
|
||||||
|
default.register_ores()
|
||||||
default.register_decorations()
|
default.register_decorations()
|
||||||
minetest.register_on_generated(default.generate_nyancats)
|
minetest.register_on_generated(default.generate_nyancats)
|
||||||
end
|
end
|
||||||
|
@ -28,7 +28,6 @@ following Textures created by BlockMen (WTFPL):
|
|||||||
door_obsidian_glass_side.png
|
door_obsidian_glass_side.png
|
||||||
|
|
||||||
following textures created by celeron55 (CC BY-SA 3.0):
|
following textures created by celeron55 (CC BY-SA 3.0):
|
||||||
door_trapdoor_side.png
|
|
||||||
door_glass_a.png
|
door_glass_a.png
|
||||||
door_glass_b.png
|
door_glass_b.png
|
||||||
|
|
||||||
@ -36,9 +35,10 @@ following Textures created by PenguinDad (CC BY-SA 4.0):
|
|||||||
door_glass.png
|
door_glass.png
|
||||||
door_obsidian_glass.png
|
door_obsidian_glass.png
|
||||||
|
|
||||||
Steel trapdoor textures by sofar (CC-BY-SA-3.0)
|
following textures created by sofar (CC-BY-SA-3.0)
|
||||||
doors_trapdoor_steel.png
|
doors_trapdoor_steel.png
|
||||||
doors_trapdoor_steel_side.png
|
doors_trapdoor_steel_side.png
|
||||||
|
door_trapdoor_side.png
|
||||||
|
|
||||||
All other textures (created by PilzAdam): WTFPL
|
All other textures (created by PilzAdam): WTFPL
|
||||||
|
|
||||||
|
@ -535,8 +535,6 @@ function doors.register_trapdoor(name, def)
|
|||||||
minetest.swap_node(pos, {name = newname, param1 = node.param1, param2 = node.param2})
|
minetest.swap_node(pos, {name = newname, param1 = node.param1, param2 = node.param2})
|
||||||
end
|
end
|
||||||
|
|
||||||
def.on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple
|
|
||||||
|
|
||||||
-- Common trapdoor configuration
|
-- Common trapdoor configuration
|
||||||
def.drawtype = "nodebox"
|
def.drawtype = "nodebox"
|
||||||
def.paramtype = "light"
|
def.paramtype = "light"
|
||||||
@ -560,25 +558,28 @@ function doors.register_trapdoor(name, def)
|
|||||||
|
|
||||||
def_closed.node_box = {
|
def_closed.node_box = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
fixed = {-0.5, -0.5, -0.5, 0.5, -0.4, 0.5}
|
fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5}
|
||||||
}
|
}
|
||||||
def_closed.selection_box = {
|
def_closed.selection_box = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
fixed = {-0.5, -0.5, -0.5, 0.5, -0.4, 0.5}
|
fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5}
|
||||||
}
|
}
|
||||||
def_closed.tiles = { def.tile_front, def.tile_front, def.tile_side, def.tile_side,
|
def_closed.tiles = { def.tile_front, def.tile_front, def.tile_side, def.tile_side,
|
||||||
def.tile_side, def.tile_side }
|
def.tile_side, def.tile_side }
|
||||||
|
|
||||||
def_opened.node_box = {
|
def_opened.node_box = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
fixed = {-0.5, -0.5, 0.4, 0.5, 0.5, 0.5}
|
fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
|
||||||
}
|
}
|
||||||
def_opened.selection_box = {
|
def_opened.selection_box = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
fixed = {-0.5, -0.5, 0.4, 0.5, 0.5, 0.5}
|
fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5}
|
||||||
}
|
}
|
||||||
def_opened.tiles = { def.tile_side, def.tile_side, def.tile_side, def.tile_side,
|
def_opened.tiles = { def.tile_side, def.tile_side,
|
||||||
def.tile_front, def.tile_front }
|
def.tile_side .. '^[transform3',
|
||||||
|
def.tile_side .. '^[transform1',
|
||||||
|
def.tile_front, def.tile_front }
|
||||||
|
|
||||||
def_opened.drop = name_closed
|
def_opened.drop = name_closed
|
||||||
def_opened.groups.not_in_creative_inventory = 1
|
def_opened.groups.not_in_creative_inventory = 1
|
||||||
|
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 263 B After Width: | Height: | Size: 233 B |
@ -22,6 +22,7 @@ local replace = minetest.setting_getbool("enable_stairs_replace_abm")
|
|||||||
-- Node will be called stairs:stair_<subname>
|
-- Node will be called stairs:stair_<subname>
|
||||||
|
|
||||||
function stairs.register_stair(subname, recipeitem, groups, images, description, sounds)
|
function stairs.register_stair(subname, recipeitem, groups, images, description, sounds)
|
||||||
|
groups.stair = 1
|
||||||
minetest.register_node(":stairs:stair_" .. subname, {
|
minetest.register_node(":stairs:stair_" .. subname, {
|
||||||
description = description,
|
description = description,
|
||||||
drawtype = "mesh",
|
drawtype = "mesh",
|
||||||
@ -111,6 +112,7 @@ end
|
|||||||
-- Node will be called stairs:slab_<subname>
|
-- Node will be called stairs:slab_<subname>
|
||||||
|
|
||||||
function stairs.register_slab(subname, recipeitem, groups, images, description, sounds)
|
function stairs.register_slab(subname, recipeitem, groups, images, description, sounds)
|
||||||
|
groups.slab = 1
|
||||||
minetest.register_node(":stairs:slab_" .. subname, {
|
minetest.register_node(":stairs:slab_" .. subname, {
|
||||||
description = description,
|
description = description,
|
||||||
drawtype = "nodebox",
|
drawtype = "nodebox",
|
||||||
|
@ -9,7 +9,7 @@ local wool = {}
|
|||||||
-- colors, and then some recipes using more specific colors for a few non-base
|
-- colors, and then some recipes using more specific colors for a few non-base
|
||||||
-- colors available. When crafting, the last recipes will be checked first.
|
-- colors available. When crafting, the last recipes will be checked first.
|
||||||
wool.dyes = {
|
wool.dyes = {
|
||||||
{"white", "White", nil},
|
{"white", "White", "basecolor_white"},
|
||||||
{"grey", "Grey", "basecolor_grey"},
|
{"grey", "Grey", "basecolor_grey"},
|
||||||
{"black", "Black", "basecolor_black"},
|
{"black", "Black", "basecolor_black"},
|
||||||
{"red", "Red", "basecolor_red"},
|
{"red", "Red", "basecolor_red"},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user