diff --git a/mods/amogus_blocks/init.lua b/mods/amogus_blocks/init.lua index a6c59d4..513802f 100644 --- a/mods/amogus_blocks/init.lua +++ b/mods/amogus_blocks/init.lua @@ -143,6 +143,29 @@ minetest.register_node("amogus_blocks:transparent", { groups = {cracky=3,oddly_breakable_by_hand=3}, }) +---- grasses and dirts (blocks) ---- + +minetest.register_node("amogus_blocks:dirt", { + description = "Dirt", + tiles = {"d.png"}, + groups = {crumbly = 3}, + + drop = { + max_items = 2, + items = { + { + items = {"amogus_blocks:dirt"}, -- always drop one dirt + rarity = 1, + }, + { + items = {"amogus_items:rock"}, + rarity = 3, + }, + }, + }, + +}) + minetest.register_node("amogus_blocks:grass", { description = "Grass", tiles = { @@ -158,15 +181,16 @@ minetest.register_node("amogus_blocks:grass", { max_items = 2, items = { { - items = {'amogus_blocks:dirt 5'}, - rarity = 3, + items = {'amogus_blocks:dirt'}, + rarity = 1, }, { items = {'amogus_items:rock'}, - rarity = 2, + rarity = 3, }, }, - }, groups = {crumbly=3}, + }, + groups = {crumbly=3}, }) minetest.register_node("amogus_blocks:grass_green", { @@ -185,16 +209,18 @@ minetest.register_node("amogus_blocks:grass_green", { items = { { items = {'amogus_blocks:dirt'}, - rarity = 3, + rarity = 1, }, { items = {'amogus_items:rock'}, - rarity = 2, + rarity = 3, }, }, }, groups = {crumbly=3}, }) +--------------------------------- + minetest.register_node("amogus_blocks:wood", { description = "Wood", @@ -273,29 +299,10 @@ minetest.register_node("amogus_blocks:water_flowing", { groups = {water = 3, liquid = 3, not_in_creative_inventory = 1, cools_lava = 1} }) -minetest.register_node("amogus_blocks:dirt", { - description = "Dirt", - tiles = {"d.png"}, - groups = {crumbly = 3}, - - drop = { - max_items = 2, - items = { - { - items = {'amogus_blocks:dirt'}, - rarity = 3, - }, - { - items = {'amogus_items:rock'}, - rarity = 2, - }, - }, - }, - -})minetest.register_node("amogus_blocks:sand", { +minetest.register_node("amogus_blocks:sand", { description = "Sand", tiles = {"sand.png"}, - groups = {crumbly = 3}, + groups = {crumbly = 3, falling_node = 1}, }) minetest.register_node("amogus_blocks:stone", { diff --git a/mods/amogus_items/init.lua b/mods/amogus_items/init.lua index 59e63b8..ad7adfe 100644 --- a/mods/amogus_items/init.lua +++ b/mods/amogus_items/init.lua @@ -159,13 +159,28 @@ minetest.register_tool("amogus_items:lightsaber_green", { minetest.register_craftitem("amogus_items:gold_ingot", { description = "Gold Ingot", inventory_image = "gold_ingot.png", -})minetest.register_craftitem("amogus_items:rock", { + tool_capabilities = { + damage_groups = {fleshy = 1.0}, + full_punch_interval = 1.5, + }, +}) + +minetest.register_craftitem("amogus_items:rock", { description = "Rock", inventory_image = "rocks.png", + tool_capabilities = { + damage_groups = {fleshy = 1.0}, + full_punch_interval = 1.5, + }, }) + minetest.register_craftitem("amogus_items:sussium_ingot", { description = "Sussium Ingot", inventory_image = "sussium_ingot.png", + tool_capabilities = { + damage_groups = {fleshy = 1.0}, + full_punch_interval = 1.5, + }, }) --add theese items goldenpickaxe, stonepickaxe and allow them slowly break nodes and destroy it after 30 uses @@ -327,7 +342,7 @@ minetest.register_tool("amogus_items:goldenshovel", { groupcaps={ crumbly={times={[1]=1.0, [2]=0.8, [3]=0.6}, uses=30, maxlevel=2}, }, - -- damage_groups = {fleshy=1.0}, + damage_groups = {fleshy=1.0}, }, groups = {flammable = 2} }) @@ -340,7 +355,7 @@ minetest.register_tool("amogus_items:sussiumshovel", { groupcaps={ crumbly={times={[1]=0.8, [2]=0.6, [3]=0.35}, uses=30, maxlevel=2}, }, - --damage_groups = {fleshy=1.0}, + damage_groups = {fleshy=1.0}, }, groups = {flammable = 2} }) @@ -366,27 +381,47 @@ minetest.register_tool("amogus_items:obsussian_hammer", { minetest.register_craftitem("amogus_items:pcb", { description = "PCB", inventory_image = "PCB.png", + tool_capabilities = { + damage_groups = {fleshy = 1.0}, + full_punch_interval = 2.0, + }, }) minetest.register_craftitem("amogus_items:capacitor", { description = "Capacitor", inventory_image = "capacitor.png", + tool_capabilities = { + damage_groups = {fleshy = 1.0}, + full_punch_interval = 2.0, + }, }) minetest.register_craftitem("amogus_items:sugar", { description = "Sugar", inventory_image = "sugar.png", on_use = minetest.item_eat(20), + tool_capabilities = { + damage_groups = {fleshy = 1.0}, + full_punch_interval = 2.0, + }, }) minetest.register_craftitem("amogus_items:iron_ingot", { description = "Iron Ingot", inventory_image = "iron_ingot.png", + tool_capabilities = { + damage_groups = {fleshy = 1.0}, + full_punch_interval = 1.5, + }, }) minetest.register_tool("amogus_items:dynamite", { description = "dynamite", inventory_image = "dynamite.png", + tool_capabilities = { + damage_groups = {fleshy = 1.0}, + full_punch_interval = 1.5, + }, on_place = function(itemstack, placer, pointed_thing) if pointed_thing.type == "node" then @@ -590,6 +625,10 @@ minetest.register_craftitem("amogus_items:empty_bucket", { description = (bucket_names_prefixes[math.random(1, #bucket_names_prefixes)] .. " " .. empty_bucket_names[math.random(1, #empty_bucket_names)]), inventory_image = "empty_bucket.png", groups = {tool = 1}, + tool_capabilities = { + damage_groups = {fleshy = 1.0}, + full_punch_interval = 1.0, + }, liquids_pointable = true, on_use = function(itemstack, user, pointed_thing) if pointed_thing.type == "object" then diff --git a/mods/i3/src/gui.lua b/mods/i3/src/gui.lua index 83056f0..761d283 100644 --- a/mods/i3/src/gui.lua +++ b/mods/i3/src/gui.lua @@ -467,8 +467,8 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa fs("list[current_player;craft;%f,%f;3,3;]", 0, yoffset + 1.45) image(3.47, yoffset + 2.69, 0.85, 0.85, PNG.arrow) fs("list[current_player;craftpreview;%f,%f;1,1;]", 4.45, yoffset + 2.6) - fs("list[detached:i3_trash;main;%f,%f;1,1;]", 4.45, yoffset + 3.75) - image(4.45, yoffset + 3.75, 1, 1, PNG.trash) + --fs("list[detached:i3_trash;main;%f,%f;1,1;]", 4.45, yoffset + 3.75) + --image(4.45, yoffset + 3.75, 1, 1, PNG.trash) local yextra = damage_enabled and 5.5 or 5 diff --git a/mods/item_drop/init.lua b/mods/item_drop/init.lua index 76604f6..703f8d2 100644 --- a/mods/item_drop/init.lua +++ b/mods/item_drop/init.lua @@ -53,7 +53,7 @@ if legacy_setting_getbool("item_drop.enable_item_pickup", local magnet_time = tonumber( minetest.settings:get("item_drop.magnet_time")) or 5.0 local pickup_age = tonumber( - minetest.settings:get("item_drop.pickup_age")) or 0.5 + minetest.settings:get("item_drop.pickup_age")) or 1.0 local key_triggered = legacy_setting_getbool("item_drop.enable_pickup_key", "enable_item_pickup_key", true) local key_invert = minetest.settings:get_bool(