From c5595df77d07d0e3b553a2fcf0e5efc3c6bb0725 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Sun, 31 Jan 2016 15:17:49 +0100 Subject: [PATCH] [minetestforfun_game] Update --- minetestforfun_game/mods/creative/init.lua | 23 ++++++++++-------- minetestforfun_game/mods/default/mapgen.lua | 23 +++++++++++++++--- minetestforfun_game/mods/doors/README.txt | 4 +-- minetestforfun_game/mods/doors/init.lua | 17 +++++++------ .../doors/textures/doors_trapdoor_side.png | Bin 263 -> 233 bytes minetestforfun_game/mods/stairs/init.lua | 2 ++ minetestforfun_game/mods/wool/init.lua | 2 +- 7 files changed, 47 insertions(+), 24 deletions(-) diff --git a/minetestforfun_game/mods/creative/init.lua b/minetestforfun_game/mods/creative/init.lua index edbfb79c..bcc6c233 100755 --- a/minetestforfun_game/mods/creative/init.lua +++ b/minetestforfun_game/mods/creative/init.lua @@ -42,7 +42,7 @@ creative_inventory.init_creative_inventory = function(player) }) 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 local function tab_category(tab_id) @@ -128,19 +128,19 @@ end creative_inventory.set_crafting_formspec = function(player) player:set_inventory_formspec([[ - size[8,7.5] - list[current_player;craft;2,0.25;3,3;] - list[current_player;craftpreview;6,1.25;1,1;] - list[current_player;main;0,3.6;8,1;] - list[current_player;main;0,4.75;8,3;8] - list[detached:creative_trash;main;0,2.25;1,1;] - image[0.06,2.35;0.8,0.8;trash_icon.png] - image[5,1.25;1,1;gui_furnace_arrow_bg.png^[transformR270] + size[8,8.6] + list[current_player;craft;2,0.75;3,3;] + list[current_player;craftpreview;6,1.75;1,1;] + list[current_player;main;0,4.7;8,1;] + list[current_player;main;0,5.85;8,3;8] + list[detached:creative_trash;main;0,2.75;1,1;] + image[0.06,2.85;0.8,0.8;trash_icon.png] + image[5,1.75;1,1;gui_furnace_arrow_bg.png^[transformR270] tabheader[0,0;tabs;Crafting,All,Nodes,Tools,Items;1;true;false] listring[current_player;main] 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 ) end @@ -191,6 +191,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) start_i = start_i - 3*8 if start_i < 0 then 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 elseif fields.creative_next then start_i = start_i + 3*8 diff --git a/minetestforfun_game/mods/default/mapgen.lua b/minetestforfun_game/mods/default/mapgen.lua index f8d97c99..bbd2beee 100755 --- a/minetestforfun_game/mods/default/mapgen.lua +++ b/minetestforfun_game/mods/default/mapgen.lua @@ -2,7 +2,6 @@ -- Aliases for map generator outputs -- -minetest.register_alias("mapgen_air", "air") minetest.register_alias("mapgen_stone", "default:stone") minetest.register_alias("mapgen_dirt", "default:dirt") minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass") @@ -706,6 +705,24 @@ function default.register_biomes() 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({ name = "tundra_ocean", --node_dust = "", @@ -719,7 +736,7 @@ function default.register_biomes() --node_water = "", --node_river_water = "", y_min = -112, - y_max = 1, + y_max = -4, heat_point = 15, humidity_point = 35, }) @@ -1743,8 +1760,8 @@ if mg_params.mgname == "v6" then default.register_mgv6_decorations() minetest.register_on_generated(default.generate_nyancats) elseif mg_params.mgname ~= "singlenode" then - default.register_ores() default.register_biomes() + default.register_ores() default.register_decorations() minetest.register_on_generated(default.generate_nyancats) end diff --git a/minetestforfun_game/mods/doors/README.txt b/minetestforfun_game/mods/doors/README.txt index c83720ce..27f0507a 100755 --- a/minetestforfun_game/mods/doors/README.txt +++ b/minetestforfun_game/mods/doors/README.txt @@ -28,7 +28,6 @@ following Textures created by BlockMen (WTFPL): door_obsidian_glass_side.png following textures created by celeron55 (CC BY-SA 3.0): - door_trapdoor_side.png door_glass_a.png door_glass_b.png @@ -36,9 +35,10 @@ following Textures created by PenguinDad (CC BY-SA 4.0): door_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_side.png + door_trapdoor_side.png All other textures (created by PilzAdam): WTFPL diff --git a/minetestforfun_game/mods/doors/init.lua b/minetestforfun_game/mods/doors/init.lua index 8c60be2d..4df14826 100755 --- a/minetestforfun_game/mods/doors/init.lua +++ b/minetestforfun_game/mods/doors/init.lua @@ -535,8 +535,6 @@ function doors.register_trapdoor(name, def) minetest.swap_node(pos, {name = newname, param1 = node.param1, param2 = node.param2}) end - def.on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple - -- Common trapdoor configuration def.drawtype = "nodebox" def.paramtype = "light" @@ -560,25 +558,28 @@ function doors.register_trapdoor(name, def) def_closed.node_box = { 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 = { 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.tile_side, def.tile_side } def_opened.node_box = { 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 = { 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.tile_front, def.tile_front } + def_opened.tiles = { def.tile_side, def.tile_side, + def.tile_side .. '^[transform3', + def.tile_side .. '^[transform1', + def.tile_front, def.tile_front } + def_opened.drop = name_closed def_opened.groups.not_in_creative_inventory = 1 diff --git a/minetestforfun_game/mods/doors/textures/doors_trapdoor_side.png b/minetestforfun_game/mods/doors/textures/doors_trapdoor_side.png index 6e316c14b596be7e5ac39b8c3337b34745c746de..c45d870d90c4b50e495c4cc48911eb4e62717bc2 100755 GIT binary patch delta 213 zcmZo?ddXERLtqy<2jg9%7Zn3!P(q}Y|gW!U_%O_9t zl&gQhC?KwGv}e*xS)hEGr;B5V#`(9C4EdT31X!*Mp4jL7E~A1|{(n@8vcuY^We;vN0Xl)f)78&q Iol`;+06O?jj{pDw literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4*JyXm1aF;=O!JAwE}Oc8 zkk1(gU8OwT* zv2~s function stairs.register_stair(subname, recipeitem, groups, images, description, sounds) + groups.stair = 1 minetest.register_node(":stairs:stair_" .. subname, { description = description, drawtype = "mesh", @@ -111,6 +112,7 @@ end -- Node will be called stairs:slab_ function stairs.register_slab(subname, recipeitem, groups, images, description, sounds) + groups.slab = 1 minetest.register_node(":stairs:slab_" .. subname, { description = description, drawtype = "nodebox", diff --git a/minetestforfun_game/mods/wool/init.lua b/minetestforfun_game/mods/wool/init.lua index 9c17b0ce..f485e4fb 100755 --- a/minetestforfun_game/mods/wool/init.lua +++ b/minetestforfun_game/mods/wool/init.lua @@ -9,7 +9,7 @@ local wool = {} -- 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. wool.dyes = { - {"white", "White", nil}, + {"white", "White", "basecolor_white"}, {"grey", "Grey", "basecolor_grey"}, {"black", "Black", "basecolor_black"}, {"red", "Red", "basecolor_red"},