diff --git a/README.txt b/README.txt index 35d1a13..af4a1df 100644 --- a/README.txt +++ b/README.txt @@ -13,5 +13,4 @@ See README.txt in each mod for more information Every code written by me is LGPLv2.1 Notes: -sfinv mod changed mtg_craftguide mod deleted \ No newline at end of file diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 1358c70..a297451 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1450,7 +1450,7 @@ minetest.register_node("default:junglegrass", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1}, + groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, junglegrass = 1, flammable = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1471,7 +1471,8 @@ minetest.register_node("default:grass_1", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, flammable = 1}, + groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, + normal_grass = 1, flammable = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1501,7 +1502,8 @@ for i = 2, 5 do buildable_to = true, drop = "default:grass_1", groups = {snappy = 3, flora = 1, attached_node = 1, - not_in_creative_inventory = 1, grass = 1, flammable = 1}, + not_in_creative_inventory = 1, grass = 1, + normal_grass = 1, flammable = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1523,7 +1525,7 @@ minetest.register_node("default:dry_grass_1", { walkable = false, buildable_to = true, groups = {snappy = 3, flammable = 3, flora = 1, - attached_node = 1, dry_grass = 1}, + attached_node = 1, grass = 1, dry_grass = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1552,7 +1554,7 @@ for i = 2, 5 do walkable = false, buildable_to = true, groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1, - not_in_creative_inventory=1, dry_grass = 1}, + not_in_creative_inventory = 1, grass = 1, dry_grass = 1}, drop = "default:dry_grass_1", sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -1574,7 +1576,8 @@ minetest.register_node("default:fern_1", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1}, + groups = {snappy = 3, flammable = 3, flora = 1, grass = 1, + fern = 1, attached_node = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1604,7 +1607,7 @@ for i = 2, 3 do walkable = false, buildable_to = true, groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1, - not_in_creative_inventory=1}, + grass = 1, fern = 1, not_in_creative_inventory = 1}, drop = "default:fern_1", sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -1626,7 +1629,8 @@ minetest.register_node("default:marram_grass_1", { sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flammable = 3, attached_node = 1}, + groups = {snappy = 3, flammable = 3, flora = 1, grass = 1, marram_grass = 1, + attached_node = 1}, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", @@ -1654,8 +1658,8 @@ for i = 2, 3 do sunlight_propagates = true, walkable = false, buildable_to = true, - groups = {snappy = 3, flammable = 3, attached_node = 1, - not_in_creative_inventory=1}, + groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1, + grass = 1, marram_grass = 1, not_in_creative_inventory = 1}, drop = "default:marram_grass_1", sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -1961,6 +1965,7 @@ minetest.register_node("default:sand_with_kelp", { tiles = {"default_sand.png"}, special_tiles = {{name = "default_kelp.png", tileable_vertical = true}}, inventory_image = "default_kelp.png", + wield_image = "default_kelp.png", paramtype = "light", paramtype2 = "leveled", groups = {snappy = 3}, @@ -2077,6 +2082,7 @@ minetest.register_node("default:coral_green", { tiles = {"default_coral_skeleton.png"}, special_tiles = {{name = "default_coral_green.png", tileable_vertical = true}}, inventory_image = "default_coral_green.png", + wield_image = "default_coral_green.png", groups = {snappy = 3}, selection_box = { type = "fixed", @@ -2107,6 +2113,7 @@ minetest.register_node("default:coral_pink", { tiles = {"default_coral_skeleton.png"}, special_tiles = {{name = "default_coral_pink.png", tileable_vertical = true}}, inventory_image = "default_coral_pink.png", + wield_image = "default_coral_pink.png", groups = {snappy = 3}, selection_box = { type = "fixed", @@ -2137,6 +2144,7 @@ minetest.register_node("default:coral_cyan", { tiles = {"default_coral_skeleton.png"}, special_tiles = {{name = "default_coral_cyan.png", tileable_vertical = true}}, inventory_image = "default_coral_cyan.png", + wield_image = "default_coral_cyan.png", groups = {snappy = 3}, selection_box = { type = "fixed", diff --git a/mods/sfinv/init.lua b/mods/sfinv/init.lua index fbecbef..71e9ee7 100644 --- a/mods/sfinv/init.lua +++ b/mods/sfinv/init.lua @@ -14,10 +14,6 @@ sfinv.register_page("sfinv:crafting", { image[4.75,1.5;1,1;sfinv_crafting_arrow.png] listring[current_player;main] listring[current_player;craft] - image_button[0,0;1.6,1.6;inventory_plus_inven.png;inven;] - label[0.3,1.5;selection] - button[6.6,1.4;1.5,0.5;craft10;Craft (10)] - button[6.6,2.2;1.5,0.5;craft99;Craft (99)] ]], true) end }) diff --git a/mods/tutorial/init.lua b/mods/tutorial/init.lua index c19de5a..57359d6 100644 --- a/mods/tutorial/init.lua +++ b/mods/tutorial/init.lua @@ -6,7 +6,7 @@ minetest.register_on_joinplayer(function(player) offset = {x=0, y=10}, alignment = {x=1, y=0}, number = 0xFFFFFF , - text = "For Minetest : 5.4.0", + text = "For Minetest : 5.4.x", }) player:hud_add({ hud_elem_type = "text", @@ -14,7 +14,7 @@ minetest.register_on_joinplayer(function(player) offset = {x=0, y=30}, alignment = {x=1, y=0}, number = 0xFFFFFF , - text = "Game Version : 1.3.4", + text = "Game Version : 1.3.5", }) end) @@ -53,6 +53,24 @@ backward.get_formspec = function(player, pos) return formspec end +local S = minetest.get_translator("sfinv") +sfinv.override_page("sfinv:crafting", { + title = S("Crafting"), + get = function(self, player, context) + return sfinv.make_formspec(player, context, [[ + list[current_player;craft;1.75,0.5;3,3;] + list[current_player;craftpreview;5.75,1.5;1,1;] + image[4.75,1.5;1,1;sfinv_crafting_arrow.png] + listring[current_player;main] + listring[current_player;craft] + image_button[0,0;1.6,1.6;inventory_plus_inven.png;inven;] + label[0.3,1.5;selection] + button[6.6,1.4;1.5,0.5;craft10;Craft (10)] + button[6.6,2.2;1.5,0.5;craft99;Craft (99)] + ]], true) + end +}) + minetest.register_craft({ output = "tutorial:spawn_egg", recipe = { @@ -640,8 +658,8 @@ minetest.register_globalstep(function(dtime) end player_inv:set_size("year", 3) if player_inv:room_for_item("main", "tutorial:trophy_year3") and player_inv:get_stack("year", 3):get_count() == 0 then - player_inv:add_item("main", "tutorial:trophy_year3") - player_inv:set_stack("year", 3, "default:dirt") + --player_inv:add_item("main", "tutorial:trophy_year3") + --player_inv:set_stack("year", 3, "default:dirt") end local stack = player:get_inventory():get_stack("heart", 1) player:set_attribute("hpnum", player:get_hp())