diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfe0770 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/LICENSE.txt b/LICENSE.txt index 87b4f8d..ba9b4b5 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright for mods bucket, default 2010-2012 celeron55, Perttu Ahola (screw this prick) +Copyright for mods bucket, default, flowers 2010-2012 celeron55, Perttu Ahola Copyright 2021 MadKamel @@ -145,4 +145,4 @@ NO WARRANTY 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -END OF TERMS AND CONDITIONS +END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/crafting/adze_crafting.png b/crafting/adze_crafting.png deleted file mode 100644 index 4a36b07..0000000 Binary files a/crafting/adze_crafting.png and /dev/null differ diff --git a/crafting/basalt_gravel.png b/crafting/basalt_gravel.png deleted file mode 100644 index d7e64d5..0000000 Binary files a/crafting/basalt_gravel.png and /dev/null differ diff --git a/crafting/basalt_rock_crafting.png b/crafting/basalt_rock_crafting.png deleted file mode 100644 index fe819f3..0000000 Binary files a/crafting/basalt_rock_crafting.png and /dev/null differ diff --git a/crafting/basalt_sharpened_rock.png b/crafting/basalt_sharpened_rock.png deleted file mode 100644 index 1678ac6..0000000 Binary files a/crafting/basalt_sharpened_rock.png and /dev/null differ diff --git a/crafting/crafting_menu.png b/crafting/crafting_menu.png deleted file mode 100644 index b50749c..0000000 Binary files a/crafting/crafting_menu.png and /dev/null differ diff --git a/crafting/leaves_crafting.png b/crafting/leaves_crafting.png deleted file mode 100644 index 10e3442..0000000 Binary files a/crafting/leaves_crafting.png and /dev/null differ diff --git a/crafting/rock_crafting.png b/crafting/rock_crafting.png deleted file mode 100644 index 8349aa3..0000000 Binary files a/crafting/rock_crafting.png and /dev/null differ diff --git a/crafting/sharpened_rock_crafting.png b/crafting/sharpened_rock_crafting.png deleted file mode 100644 index 419d742..0000000 Binary files a/crafting/sharpened_rock_crafting.png and /dev/null differ diff --git a/crafting/stone_adze_crafting.png b/crafting/stone_adze_crafting.png deleted file mode 100644 index d721fd8..0000000 Binary files a/crafting/stone_adze_crafting.png and /dev/null differ diff --git a/crafting/tool_stone_pick_crafting.png b/crafting/tool_stone_pick_crafting.png deleted file mode 100644 index 18fd35e..0000000 Binary files a/crafting/tool_stone_pick_crafting.png and /dev/null differ diff --git a/crafting/toolhead_basalt_pick_crafting.png b/crafting/toolhead_basalt_pick_crafting.png deleted file mode 100644 index 66058f0..0000000 Binary files a/crafting/toolhead_basalt_pick_crafting.png and /dev/null differ diff --git a/crafting/toolhead_pick_stone_crafting.png b/crafting/toolhead_pick_stone_crafting.png deleted file mode 100644 index 0a7ae90..0000000 Binary files a/crafting/toolhead_pick_stone_crafting.png and /dev/null differ diff --git a/game.conf b/game.conf index 466a471..1976db8 100644 --- a/game.conf +++ b/game.conf @@ -1,3 +1,3 @@ -name = Easytest +name = KSurvive author = MadKamel -description = A mod based off of Minetest Game that was built around the whims of a single amateur programmer. +description = An MTG fork that seeks to drastically change gameplay. \ No newline at end of file diff --git a/menu/header.png b/menu/header.png index 3e2b344..6cb08a7 100644 Binary files a/menu/header.png and b/menu/header.png differ diff --git a/menu/overlay.png b/menu/overlay.png index 4d9cf84..3d54cd4 100644 Binary files a/menu/overlay.png and b/menu/overlay.png differ diff --git a/menu/overlay1.png b/menu/overlay1.png new file mode 100644 index 0000000..4d9cf84 Binary files /dev/null and b/menu/overlay1.png differ diff --git a/menu/overlay2.png b/menu/overlay2.png new file mode 100644 index 0000000..5b41bf5 Binary files /dev/null and b/menu/overlay2.png differ diff --git a/mods/adze/init.lua b/mods/adze/init.lua index e0ff2ce..426c5be 100644 --- a/mods/adze/init.lua +++ b/mods/adze/init.lua @@ -94,102 +94,12 @@ minetest.register_tool("adze:obsidian_adze", { full_punch_interval = 1.2, max_drop_level=0, groupcaps={ - crumbly = {times={[1]=2.75, [2]=1.30, [3]=0.50}, uses=25, maxlevel=1}, - choppy = {times={[2]=1.50, [3]=0.80}, uses=25, maxlevel=1}, - snappy = {times={[2]=0.80, [3]=0.20}, uses=25, maxlevel=1}, + crumbly = {times={[1]=2.75, [2]=1.30, [3]=0.50}, uses=45, maxlevel=1}, + choppy = {times={[2]=1.50, [3]=0.80}, uses=45, maxlevel=1}, + snappy = {times={[2]=0.80, [3]=0.20}, uses=45, maxlevel=1}, cracky = {times={[3]=1.75}, uses=45, maxlevel=1}, }, - damage_groups = {fleshy=3}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("adze:iron_adze", { - description = "Iron-Tipped Adze", - inventory_image = "iron_adze.png", - tool_capabilities = { - full_punch_interval = 1.2, - max_drop_level=0, - groupcaps={ - crumbly = {times={[1]=2.75, [2]=1.30, [3]=0.50}, uses=50, maxlevel=1}, - choppy = {times={[2]=1.50, [3]=0.80}, uses=50, maxlevel=1}, - snappy = {times={[2]=0.80, [3]=0.20}, uses=50, maxlevel=1}, - cracky = {times={[3]=1.75}, uses=50, maxlevel=1}, - }, - damage_groups = {fleshy=3}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("adze:copper_adze", { - description = "Copper-Tipped Adze", - inventory_image = "copper_adze.png", - tool_capabilities = { - full_punch_interval = 1.2, - max_drop_level=0, - groupcaps={ - crumbly = {times={[1]=2.75, [2]=1.30, [3]=0.50}, uses=50, maxlevel=1}, - choppy = {times={[2]=1.50, [3]=0.80}, uses=50, maxlevel=1}, - snappy = {times={[2]=0.80, [3]=0.20}, uses=50, maxlevel=1}, - cracky = {times={[3]=1.75}, uses=50, maxlevel=1}, - }, - damage_groups = {fleshy=3}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("adze:tin_adze", { - description = "Tin-Tipped Adze", - inventory_image = "tin_adze.png", - tool_capabilities = { - full_punch_interval = 1.2, - max_drop_level=0, - groupcaps={ - crumbly = {times={[1]=2.75, [2]=1.30, [3]=0.50}, uses=50, maxlevel=1}, - choppy = {times={[2]=1.50, [3]=0.80}, uses=50, maxlevel=1}, - snappy = {times={[2]=0.80, [3]=0.20}, uses=50, maxlevel=1}, - cracky = {times={[3]=1.75}, uses=50, maxlevel=1}, - }, - damage_groups = {fleshy=3}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("adze:gold_adze", { - description = "Gold-Tipped Adze", - inventory_image = "gold_adze.png", - tool_capabilities = { - full_punch_interval = 1.2, - max_drop_level=0, - groupcaps={ - crumbly = {times={[1]=2.75, [2]=1.30, [3]=0.50}, uses=50, maxlevel=1}, - choppy = {times={[2]=1.50, [3]=0.80}, uses=50, maxlevel=1}, - snappy = {times={[2]=0.80, [3]=0.20}, uses=50, maxlevel=1}, - cracky = {times={[3]=1.75}, uses=50, maxlevel=1}, - }, - damage_groups = {fleshy=3}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("adze:bronze_adze", { - description = "Bronze-Tipped Adze", - inventory_image = "bronze_adze.png", - tool_capabilities = { - full_punch_interval = 1.2, - max_drop_level=0, - groupcaps={ - crumbly = {times={[1]=2.75, [2]=1.30, [3]=0.50}, uses=50, maxlevel=1}, - choppy = {times={[2]=1.50, [3]=0.80}, uses=50, maxlevel=1}, - snappy = {times={[2]=0.80, [3]=0.20}, uses=50, maxlevel=1}, - cracky = {times={[3]=1.75}, uses=50, maxlevel=1}, - }, - damage_groups = {fleshy=3}, + damage_groups = {fleshy=4}, }, sound = {breaks = "default_tool_breaks"}, groups = {} diff --git a/mods/adze/textures/bronze_adze.png b/mods/adze/textures/bronze_adze.png deleted file mode 100644 index f226e96..0000000 Binary files a/mods/adze/textures/bronze_adze.png and /dev/null differ diff --git a/mods/adze/textures/copper_adze.png b/mods/adze/textures/copper_adze.png deleted file mode 100644 index 97d8b73..0000000 Binary files a/mods/adze/textures/copper_adze.png and /dev/null differ diff --git a/mods/adze/textures/gold_adze.png b/mods/adze/textures/gold_adze.png deleted file mode 100644 index f888079..0000000 Binary files a/mods/adze/textures/gold_adze.png and /dev/null differ diff --git a/mods/adze/textures/iron_adze.png b/mods/adze/textures/iron_adze.png deleted file mode 100644 index dab05e1..0000000 Binary files a/mods/adze/textures/iron_adze.png and /dev/null differ diff --git a/mods/adze/textures/tin_adze.png b/mods/adze/textures/tin_adze.png deleted file mode 100644 index 155e90e..0000000 Binary files a/mods/adze/textures/tin_adze.png and /dev/null differ diff --git a/mods/concrete/textures/concrete_block.png b/mods/concrete/textures/concrete_block.png index 26ac832..96402f6 100644 Binary files a/mods/concrete/textures/concrete_block.png and b/mods/concrete/textures/concrete_block.png differ diff --git a/mods/crafting/init.lua b/mods/crafting/init.lua index 4ef5e25..c0ee716 100644 --- a/mods/crafting/init.lua +++ b/mods/crafting/init.lua @@ -3,38 +3,9 @@ -- This is the crafting recipe listing for EVERY ksurvive subgame mod. Trying to disable one of them won't work, as there are no checks to see if the mods are actually installed. minetest.register_craft({ - output = "foodstuff:empty_teabag", - recipe = { - {"", "default:paper", ""}, - {"default:paper", "", "default:paper"}, - {"default:paper", "default:paper", "default:paper"}, - } -}) - -minetest.register_craft({ - type = "shapeless, - output = "foodstuff:green_teabag", - recipe = { - {"foodstuff:empty_teabag", "foodstuff:green_tea_dust"} - } -}) - -minetest.register_craft({ - type = "shapeless, + type = "shapeless", output = "metals:glowing_bronze_block 4", - recipe = { - {"metals:glowing_tin_block", "metals:glowing_tin_block", "metals:glowing_tin_block", "metals:glowing_copper_block"} - } -}) - -minetest.register_craft({ - output = "foodstuff:ground_bush_leaf", - recipe = { - {"foodstuff:marble_pestle"}, - {"nature:bush_leaf"}, - {"foodstuff:marble_mortar"}, - }, - replacements = {{"foodstuff:marble_mortar", "foodstuff:marble_mortar"}, {"foodstuff:marble_pestle", "foodstuff:marble_pestle"}} + recipe = {"metals:glowing_tin_block", "metals:glowing_tin_block", "metals:glowing_tin_block", "metals:glowing_copper_block"} }) minetest.register_craft({ @@ -359,51 +330,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "metals:tongs_gold", - recipe = { - {"metals:gold_stick", "", "metals:gold_stick"}, - {"", "metals:gold_stick", ""}, - {"metals:gold_stick", "", "metals:gold_stick"}, - } -}) - -minetest.register_craft({ - output = "metals:tongs_bronze", - recipe = { - {"metals:bronze_stick", "", "metals:bronze_stick"}, - {"", "metals:bronze_stick", ""}, - {"metals:bronze_stick", "", "metals:bronze_stick"}, - } -}) - -minetest.register_craft({ - output = "metals:tongs_tin", - recipe = { - {"metals:tin_stick", "", "metals:tin_stick"}, - {"", "metals:tin_stick", ""}, - {"metals:tin_stick", "", "metals:tin_stick"}, - } -}) - -minetest.register_craft({ - output = "metals:tongs_copper", - recipe = { - {"metals:copper_stick", "", "metals:copper_stick"}, - {"", "metals:copper_stick", ""}, - {"metals:copper_stick", "", "metals:copper_stick"}, - } -}) - -minetest.register_craft({ - output = "metals:tongs_iron", - recipe = { - {"metals:iron_stick", "", "metals:iron_stick"}, - {"", "metals:iron_stick", ""}, - {"metals:iron_stick", "", "metals:iron_stick"}, - } -}) - minetest.register_craft({ output = "metals:scythe_tin", recipe = { @@ -458,22 +384,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "metals:gold_stick 8", - recipe = { - {"metals:gold_block"}, - {"metals:gold_block"} - } -}) - -minetest.register_craft({ - output = "metals:bronze_stick 8", - recipe = { - {"metals:bronze_block"}, - {"metals:bronze_block"} - } -}) - minetest.register_craft({ output = "metals:tin_stick 8", recipe = { @@ -743,15 +653,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "metals:raw_gold_block", - recipe = { - {"default:gold_lump","default:gold_lump","default:gold_lump"}, - {"default:gold_lump","default:gold_lump","default:gold_lump"}, - {"default:gold_lump","default:gold_lump","default:gold_lump"} - } -}) - minetest.register_craft({ output = "metals:raw_tin_block", recipe = { @@ -945,51 +846,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "adze:iron_adze", - recipe = { - {"metals:iron_stick", "default:stick"}, - {"", "default:stick"}, - {"", "default:stick"} - } -}) - -minetest.register_craft({ - output = "adze:copper_adze", - recipe = { - {"metals:copper_stick", "default:stick"}, - {"", "default:stick"}, - {"", "default:stick"} - } -}) - -minetest.register_craft({ - output = "adze:tin_adze", - recipe = { - {"metals:tin_stick", "default:stick"}, - {"", "default:stick"}, - {"", "default:stick"} - } -}) - -minetest.register_craft({ - output = "adze:gold_adze", - recipe = { - {"metals:gold_stick", "default:stick"}, - {"", "default:stick"}, - {"", "default:stick"} - } -}) - -minetest.register_craft({ - output = "adze:bronze_adze", - recipe = { - {"metals:bronze_stick", "default:stick"}, - {"", "default:stick"}, - {"", "default:stick"} - } -}) - --minetest.register_craft({ -- output = "foodstuff:stewed_mushroom_brown", -- recipe = { @@ -1153,7 +1009,7 @@ minetest.register_craft({ minetest.register_craft({ output = "default:stick", recipe = { - {"default:leaves","default:leaves"} + {"group:leaves","group:leaves"} } }) diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index ce31c3a..6a9b62b 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -995,42 +995,6 @@ function default.register_mgv6_decorations() y_min = 1, decoration = "nature:black_tulip_4", }) - - minetest.register_decoration({ - name = "default:rudbeckia_hirta", - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = 0.007, - spread = {x = 100, y = 100, z = 100}, - seed = 329, - octaves = 3, - persist = 0.6 - }, - y_max = 28, - y_min = 1, - decoration = "nature:rudbeckia_hirta_4", - }) - - minetest.register_decoration({ - name = "default:chuparosa", - deco_type = "simple", - place_on = {"default:desert_sand"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = 0.007, - spread = {x = 100, y = 100, z = 100}, - seed = 329, - octaves = 3, - persist = 0.6 - }, - y_max = 28, - y_min = 1, - decoration = "nature:chuparosa_4", - }) minetest.register_decoration({ name = "default:bouteloua", @@ -1173,29 +1137,7 @@ function default.register_decorations() y_min = 1, decoration = "nature:black_tulip_4", }) - - minetest.register_decoration({ - name = "default:rudbeckia_hirta", - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 80, - fill_ratio = 0.01, - y_max = 60, - y_min = 1, - decoration = "nature:rudbeckia_hirta_4", - }) - minetest.register_decoration({ - name = "default:chuparosa", - deco_type = "simple", - place_on = {"default:desert_sand"}, - sidelen = 80, - fill_ratio = 0.02, - y_max = 60, - y_min = 1, - decoration = "nature:chuparosa_4", - }) - minetest.register_decoration({ name = "default:bahiagrass", deco_type = "simple", diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index f34484f..31bbe64 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -522,26 +522,17 @@ minetest.register_node("default:leaves", { is_ground_content = false, groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1}, drop = { - max_items = 3, + max_items = 1, items = { { + -- player will get sapling with 1/20 chance items = {"default:sapling"}, rarity = 20, }, { - items = {"nature:leaf 4"}, - }, - { - items = {"nature:leaf"}, - rarity = 2, - }, - { - items = {"nature:leaf"}, - rarity = 4, - }, - { - items = {"default:stick"}, - rarity = 2, + -- player will get leaves only if he get no saplings, + -- this is because max_items is 1 + items = {"default:leaves"}, } } }, @@ -563,9 +554,8 @@ minetest.register_node("default:apple", { type = "fixed", fixed = {-3 / 16, -7 / 16, -3 / 16, 3 / 16, 4 / 16, 3 / 16} }, - groups = {snappy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 3, leafdecay_drop = 1, food_apple = 1, falling_node = 1}, - drop = "foodstuff:apple", + groups = {fleshy = 3, dig_immediate = 3, flammable = 2, + leafdecay = 3, leafdecay_drop = 1, food_apple = 1, falling_node = 1}, on_use = minetest.item_eat(2), sounds = default.node_sound_leaves_defaults(), @@ -785,7 +775,7 @@ minetest.register_node("default:bush_stem", { wield_image = "default_bush_stem.png", paramtype = "light", sunlight_propagates = true, - groups = {choppy = 2, flammable = 2, falling_node = 1}, + groups = {choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, falling_node = 1}, sounds = default.node_sound_wood_defaults(), selection_box = { type = "fixed", @@ -800,27 +790,10 @@ minetest.register_node("default:bush_leaves", { paramtype = "light", groups = {snappy = 3, flammable = 2, leaves = 1}, drop = { - max_items = 3, + max_items = 1, items = { - { - items = {"default:bush_sapling"}, - rarity = 20, - }, - { - items = {"nature:bush_leaf 4"}, - }, - { - items = {"nature:bush_leaf"}, - rarity = 2, - }, - { - items = {"nature:bush_leaf"}, - rarity = 4, - }, - { - items = {"default:stick"}, - rarity = 2, - } + {items = {"default:bush_sapling"}, rarity = 5}, + {items = {"default:bush_leaves"}} } }, sounds = default.node_sound_leaves_defaults(), @@ -886,27 +859,10 @@ minetest.register_node("default:blueberry_bush_leaves", { paramtype = "light", groups = {snappy = 3, flammable = 2, leaves = 1}, drop = { - max_items = 3, + max_items = 1, items = { - { - items = {"default:blueberry_bush_sapling"}, - rarity = 20, - }, - { - items = {"nature:blueberry_bush_leaf 4"}, - }, - { - items = {"nature:blueberry_bush_leaf"}, - rarity = 2, - }, - { - items = {"nature:blueberry_bush_leaf"}, - rarity = 4, - }, - { - items = {"default:stick"}, - rarity = 2, - } + {items = {"default:blueberry_bush_sapling"}, rarity = 5}, + {items = {"default:blueberry_bush_leaves"}} } }, sounds = default.node_sound_leaves_defaults(), diff --git a/mods/default/tools.lua b/mods/default/tools.lua index 4c33a17..c992bf9 100644 --- a/mods/default/tools.lua +++ b/mods/default/tools.lua @@ -58,4 +58,4 @@ minetest.register_tool("default:key", { return nil end -}) +}) \ No newline at end of file diff --git a/mods/foodstuff/apple.lua b/mods/foodstuff/apple.lua deleted file mode 100644 index 1f15233..0000000 --- a/mods/foodstuff/apple.lua +++ /dev/null @@ -1,31 +0,0 @@ --- TODO: add apple craftitems that replace with each stage of eating. -minetest.register_craftitem("foodstuff:apple", { - description = "Apple", - inventory_image = "apple.png", - on_use = minetest.item_eat(1, "foodstuff:apple_eaten_1"), - groups = {food_apple = 1} -}) - -minetest.register_craftitem("foodstuff:apple_eaten_1", { - description = "Eaten Apple", - inventory_image = "apple_1.png", - on_use = minetest.item_eat(1, "foodstuff:apple_eaten_2"), -}) - -minetest.register_craftitem("foodstuff:apple_eaten_2", { - description = "Eaten Apple", - inventory_image = "apple_2.png", - on_use = minetest.item_eat(1, "foodstuff:apple_eaten_3"), -}) - -minetest.register_craftitem("foodstuff:apple_eaten_3", { - description = "Eaten Apple", - inventory_image = "apple_3.png", - on_use = minetest.item_eat(1, "foodstuff:apple_core"), -}) - -minetest.register_craftitem("foodstuff:apple_core", { - description = "Apple Core", - inventory_image = "apple_core.png", - groups = {apple_core = 1} -}) diff --git a/mods/foodstuff/init.lua b/mods/foodstuff/init.lua index 2658bd1..8a4da18 100644 --- a/mods/foodstuff/init.lua +++ b/mods/foodstuff/init.lua @@ -2,3 +2,4 @@ local default_path = minetest.get_modpath("foodstuff") dofile(default_path.."/applesauce.lua") dofile(default_path.."/salt.lua") +dofile(default_path.."/sugar.lua") diff --git a/mods/foodstuff/sugar.lua b/mods/foodstuff/sugar.lua new file mode 100644 index 0000000..7c66ab8 --- /dev/null +++ b/mods/foodstuff/sugar.lua @@ -0,0 +1,13 @@ +minetest.register_craftitem("foodstuff:apple_sugar", { + description = "Apple Sugar", + inventory_image = "apple_sugar.png", + groups = {sugar = 1}, + on_use = minetest.item_eat(1), +}) + +minetest.register_node("foodstuff:apple_sugar_block", { + description = "Apple Sugar Block", + tiles = {"apple_sugar_block.png"}, + paramtype = "light", + groups = {falling_node = 1, dig_immediate = 3, sugar_block = 1}, +}) diff --git a/mods/foodstuff/tea.lua b/mods/foodstuff/tea.lua deleted file mode 100644 index 14f046a..0000000 --- a/mods/foodstuff/tea.lua +++ /dev/null @@ -1,19 +0,0 @@ -minetest.register_craftitem("foodstuff:ground_bush_leaf", { - description = "Ground Bush Leaf", - inventory_image = "bush_leaf_dust.png", -}) - -minetest.register_craftitem("foodstuff:green_tea_dust", { - description = "Green Tea Powder", - inventory_image = "greentea.png", -}) - -minetest.register_craftitem("foodstuff:empty_teabag", { - description = "Empty Teabag", - inventory_image = "teabag.png", -}) - -minetest.register_craftitem("foodstuff:green_teabag", { - description = "Teabag with Green Tea", - inventory_image = "green_teabag.png", -}) diff --git a/mods/foodstuff/textures/apple.png b/mods/foodstuff/textures/apple.png deleted file mode 100644 index 7549bfd..0000000 Binary files a/mods/foodstuff/textures/apple.png and /dev/null differ diff --git a/mods/foodstuff/textures/apple_1.png b/mods/foodstuff/textures/apple_1.png deleted file mode 100644 index ec9051f..0000000 Binary files a/mods/foodstuff/textures/apple_1.png and /dev/null differ diff --git a/mods/foodstuff/textures/apple_2.png b/mods/foodstuff/textures/apple_2.png deleted file mode 100644 index efa1ce5..0000000 Binary files a/mods/foodstuff/textures/apple_2.png and /dev/null differ diff --git a/mods/foodstuff/textures/apple_3.png b/mods/foodstuff/textures/apple_3.png deleted file mode 100644 index 54c29c0..0000000 Binary files a/mods/foodstuff/textures/apple_3.png and /dev/null differ diff --git a/mods/foodstuff/textures/apple_core.png b/mods/foodstuff/textures/apple_core.png deleted file mode 100644 index 31fd784..0000000 Binary files a/mods/foodstuff/textures/apple_core.png and /dev/null differ diff --git a/mods/foodstuff/textures/green_teabag.png b/mods/foodstuff/textures/green_teabag.png deleted file mode 100644 index 0f98029..0000000 Binary files a/mods/foodstuff/textures/green_teabag.png and /dev/null differ diff --git a/mods/foodstuff/textures/greentea.png b/mods/foodstuff/textures/greentea.png deleted file mode 100644 index 21ff596..0000000 Binary files a/mods/foodstuff/textures/greentea.png and /dev/null differ diff --git a/mods/foodstuff/textures/ground_bush_leaves.png b/mods/foodstuff/textures/ground_bush_leaves.png deleted file mode 100644 index 1b6b06c..0000000 Binary files a/mods/foodstuff/textures/ground_bush_leaves.png and /dev/null differ diff --git a/mods/foodstuff/textures/marble_mortar.png b/mods/foodstuff/textures/marble_mortar.png deleted file mode 100644 index c494598..0000000 Binary files a/mods/foodstuff/textures/marble_mortar.png and /dev/null differ diff --git a/mods/foodstuff/textures/marble_pestle.png b/mods/foodstuff/textures/marble_pestle.png deleted file mode 100644 index 2dfeb0f..0000000 Binary files a/mods/foodstuff/textures/marble_pestle.png and /dev/null differ diff --git a/mods/foodstuff/textures/teabag.png b/mods/foodstuff/textures/teabag.png deleted file mode 100644 index 74eb12d..0000000 Binary files a/mods/foodstuff/textures/teabag.png and /dev/null differ diff --git a/mods/foodstuff/tools.lua b/mods/foodstuff/tools.lua deleted file mode 100644 index 9c2148d..0000000 --- a/mods/foodstuff/tools.lua +++ /dev/null @@ -1,11 +0,0 @@ -minetest.register_craftitem("foodstuff:marble_mortar", { - description = "Marble Mortar", - inventory_image = "marble_mortar.png", - groups = {mortar = 1} -}) - -minetest.register_craftitem("foodstuff:marble_pestle", { - description = "Marble Pestle", - inventory_image = "marble_pestle.png", - groups = {pestle = 1} -}) diff --git a/mods/furniture/chair.lua b/mods/furniture/chair.lua index e43d9ce..7f8494f 100644 --- a/mods/furniture/chair.lua +++ b/mods/furniture/chair.lua @@ -143,75 +143,3 @@ minetest.register_node("furniture:tin_chair", { }, groups = {falling_node = 1, cracky = 3}, }) - -minetest.register_node("furniture:bronze_chair", { - description = "Wrought Bronze Chair", - tiles = {"bronze_block.png"}, - drawtype = "nodebox", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - {-0.3125, -0.5, 0.1875, -0.1875, 0.5, 0.3125}, - {0.1875, -0.5, 0.1875, 0.3125, 0.5, 0.3125}, - {0.1875, -0.5, -0.3125, 0.3125, -0.0625, -0.1875}, - {-0.3125, -0.5, -0.3125, -0.1875, -0.0625, -0.1875}, - {-0.3125, -0.125, -0.3125, 0.3125, 0, 0.3125}, - {-0.1875, 0.3125, 0.1875, 0.1875, 0.4375, 0.3125}, - {-0.3125, 0.125, 0.1875, 0.3125, 0.1875, 0.3125}, - {0.23, -0.4375, -0.3125, 0.29, -0.375, 0.3125}, - {-0.29, -0.4375, -0.3125, -0.23, -0.375, 0.3125}, - {-0.29, -0.4375, -0.0315, 0.29, -0.375, 0.031}, - }, - }, - selection_box = { - type = "fixed", - fixed = {-0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125}, - }, - collision_box={ - type="fixed", - fixed={ - {-0.3125, -0.5, -0.3125, 0.3125, -0.0625, 0.3125}, - {-0.3125, -0.5, 0.1875, -0.1875, 0.5, 0.3125}, - }, - }, - groups = {falling_node = 1, cracky = 3}, -}) - -minetest.register_node("furniture:gold_chair", { - description = "Wrought Gold Chair", - tiles = {"gold_block.png"}, - drawtype = "nodebox", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - {-0.3125, -0.5, 0.1875, -0.1875, 0.5, 0.3125}, - {0.1875, -0.5, 0.1875, 0.3125, 0.5, 0.3125}, - {0.1875, -0.5, -0.3125, 0.3125, -0.0625, -0.1875}, - {-0.3125, -0.5, -0.3125, -0.1875, -0.0625, -0.1875}, - {-0.3125, -0.125, -0.3125, 0.3125, 0, 0.3125}, - {-0.1875, 0.3125, 0.1875, 0.1875, 0.4375, 0.3125}, - {-0.3125, 0.125, 0.1875, 0.3125, 0.1875, 0.3125}, - {0.23, -0.4375, -0.3125, 0.29, -0.375, 0.3125}, - {-0.29, -0.4375, -0.3125, -0.23, -0.375, 0.3125}, - {-0.29, -0.4375, -0.0315, 0.29, -0.375, 0.031}, - }, - }, - selection_box = { - type = "fixed", - fixed = {-0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125}, - }, - collision_box={ - type="fixed", - fixed={ - {-0.3125, -0.5, -0.3125, 0.3125, -0.0625, 0.3125}, - {-0.3125, -0.5, 0.1875, -0.1875, 0.5, 0.3125}, - }, - }, - groups = {falling_node = 1, cracky = 3}, -}) diff --git a/mods/furniture/table.lua b/mods/furniture/table.lua index a226af0..46e66ca 100644 --- a/mods/furniture/table.lua +++ b/mods/furniture/table.lua @@ -92,52 +92,4 @@ minetest.register_node("furniture:tin_table", { }, }, groups = {falling_node = 1, cracky = 3} -}) - -minetest.register_node("furniture:bronze_table", { - description = "Wrought Bronze Table", - tiles = {"bronze_block.png"}, - drawtype = "nodebox", - sunlight_propagates = true, - paramtype = 'light', - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - {-0.4,-0.5,-0.4, -0.3,0.4,-0.3}, - {0.3,-0.5,-0.4, 0.4,0.4,-0.3}, - {-0.4,-0.5,0.3, -0.3,0.4,0.4}, - {0.3,-0.5,0.3, 0.4,0.4,0.4}, - {-0.5,0.4,-0.5, 0.5,0.5,0.5}, - {-0.4,-0.2,-0.3, -0.3,-0.1,0.3}, - {0.3,-0.2,-0.4, 0.4,-0.1,0.3}, - {-0.3,-0.2,-0.4, 0.4,-0.1,-0.3}, - {-0.3,-0.2,0.3, 0.3,-0.1,0.4}, - }, - }, - groups = {falling_node = 1, cracky = 3} -}) - -minetest.register_node("furniture:gold_table", { - description = "Wrought Gold Table", - tiles = {"gold_block.png"}, - drawtype = "nodebox", - sunlight_propagates = true, - paramtype = 'light', - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - {-0.4,-0.5,-0.4, -0.3,0.4,-0.3}, - {0.3,-0.5,-0.4, 0.4,0.4,-0.3}, - {-0.4,-0.5,0.3, -0.3,0.4,0.4}, - {0.3,-0.5,0.3, 0.4,0.4,0.4}, - {-0.5,0.4,-0.5, 0.5,0.5,0.5}, - {-0.4,-0.2,-0.3, -0.3,-0.1,0.3}, - {0.3,-0.2,-0.4, 0.4,-0.1,0.3}, - {-0.3,-0.2,-0.4, 0.4,-0.1,-0.3}, - {-0.3,-0.2,0.3, 0.3,-0.1,0.4}, - }, - }, - groups = {falling_node = 1, cracky = 3} -}) +}) \ No newline at end of file diff --git a/mods/glue/glue.lua b/mods/glue/glue.lua index d095252..e69de29 100644 --- a/mods/glue/glue.lua +++ b/mods/glue/glue.lua @@ -1,60 +0,0 @@ -bucket.register_liquid( - "glue:glue_source", - "glue:glue_flowing", - "glue:glue_bucket", - "bucket_glue.png", - "Wooden Bucket with Glue", - {tool = 1} -) - -minetest.register_node("glue_source", { - description = "Glue Source Node", - drawtype = "liquid", - tiles = {"glue.png"}, - paramtype = "light", - walkable = false, - pointable = false, - diggable = false, - buildable_to = false, - is_ground_content = true, - drop = "", - drowning = 1, - liquidtype = "source", - liquid_alternative_flowing = "glue:glue_flowing", - liquid_alternative_source = "glue:glue_source", - liquid_viscosity = 30, - -- Not renewable to avoid horizontal spread of water sources in sloping - -- rivers that can cause water to overflow riverbanks and cause floods. - -- River water source is instead made renewable by the 'force renew' - -- option used in the 'bucket' mod by the river water bucket. - liquid_renewable = false, - liquid_range = 0, - damage_per_second = 8, - post_effect_color = {a = 103, r = 30, g = 76, b = 90}, - groups = {liquid = 2}, -}) - -minetest.register_node("glue:glue_flowing", { - description = "Flowing Glue Node", - drawtype = "flowingliquid", - tiles = {"glue.png"}, - use_texture_alpha = "blend", - paramtype = "light", - paramtype2 = "flowingliquid", - walkable = false, - pointable = false, - diggable = false, - buildable_to = true, - is_ground_content = true, - drop = "", - drowning = 1, - liquidtype = "flowing", - liquid_alternative_flowing = "glue:glue_flowing", - liquid_alternative_source = "glue:glue_source", - liquid_viscosity = 30, - liquid_renewable = false, - liquid_range = 1, - damage_per_second = 8, - post_effect_color = {a = 103, r = 30, g = 76, b = 90}, - groups = {liquid = 2, not_in_creative_inventory = 1}, -}) diff --git a/mods/glue/textures/glue.png b/mods/glue/textures/glue.png deleted file mode 100644 index 56e3af3..0000000 Binary files a/mods/glue/textures/glue.png and /dev/null differ diff --git a/mods/letters/letters.lua b/mods/letters/letters.lua index 8fc64b0..2b3e8fe 100644 --- a/mods/letters/letters.lua +++ b/mods/letters/letters.lua @@ -1,157 +1,40 @@ -local lpp = 14 -- Lines per letter's page -local function letter_on_use(itemstack, user) - local player_name = user:get_player_name() - local meta = itemstack:get_meta() - local title, text, owner = "", "", player_name - local page, page_max, lines, string = 1, 1, {}, "" - - -- Backwards compatibility - local old_data = minetest.deserialize(itemstack:get_metadata()) - if old_data then - meta:from_table({ fields = old_data }) - end - - local data = meta:to_table().fields - - if data.owner then - title = data.title - text = data.text - owner = data.owner - - for str in (text .. "\n"):gmatch("([^\n]*)[\n]") do - lines[#lines+1] = str - end - - if data.page then - page = data.page - page_max = data.page_max - - for i = ((lpp * page) - lpp) + 1, lpp * page do - if not lines[i] then break end - string = string .. lines[i] .. "\n" - end - end - end - - local formspec - local esc = minetest.formspec_escape - if owner == player_name then - formspec = "size[8,8]" .. - "field[0.5,1;7.5,0;title;" .. esc(S("Title:")) .. ";" .. - esc(title) .. "]" .. - "textarea[0.5,1.5;7.5,7;text;" .. esc(S("Contents:")) .. ";" .. - esc(text) .. "]" .. - "button_exit[2.5,7.5;3,1;save;" .. esc(S("Save")) .. "]" - else - formspec = "size[8,8]" .. - "label[0.5,0.5;" .. esc(S("by @1", owner)) .. "]" .. - "tablecolumns[color;text]" .. - "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. - "table[0.4,0;7,0.5;title;#FFFF00," .. esc(title) .. "]" .. - "textarea[0.5,1.5;7.5,7;;" .. - minetest.formspec_escape(string ~= "" and string or text) .. ";]" .. - "button[2.4,7.6;0.8,0.8;letter_prev;<]" .. - "label[3.2,7.7;" .. esc(S("Page @1 of @2", page, page_max)) .. "]" .. - "button[4.9,7.6;0.8,0.8;letter_next;>]" - end - - minetest.show_formspec(player_name, "letters:letter_empty", formspec) - return itemstack -end - -local max_text_size = 10000 -local max_title_size = 80 -local short_title_size = 35 -minetest.register_on_player_receive_fields(function(player, formname, fields) - if formname ~= "letters:letter_written" then return end - local inv = player:get_inventory() - local stack = player:get_wielded_item() - - if fields.save and fields.title and fields.text - and fields.title ~= "" and fields.text ~= "" then - local new_stack, data - if stack:get_name() ~= "letters:letter" then - local count = stack:get_count() - if count == 1 then - stack:set_name("letters:letter") - else - stack:set_count(count - 1) - new_stack = ItemStack("letters:letter") - end - else - data = stack:get_meta():to_table().fields - end - - if data and data.owner and data.owner ~= player:get_player_name() then - return - end - - if not data then data = {} end - data.title = fields.title:sub(1, max_title_size) - data.owner = player:get_player_name() - local short_title = data.title - -- Don't bother triming the title if the trailing dots would make it longer - if #short_title > short_title_size + 3 then - short_title = short_title:sub(1, short_title_size) .. "..." - end - data.description = S("\"@1\" by @2", short_title, data.owner) - data.text = fields.text:sub(1, max_text_size) - data.text = data.text:gsub("\r\n", "\n"):gsub("\r", "\n") - data.page = 1 - data.page_max = math.ceil((#data.text:gsub("[^\n]", "") + 1) / lpp) - - if new_stack then - new_stack:get_meta():from_table({ fields = data }) - if inv:room_for_item("main", new_stack) then - inv:add_item("main", new_stack) - else - minetest.add_item(player:get_pos(), new_stack) - end - else - stack:get_meta():from_table({ fields = data }) - end - - elseif fields.letter_next or fields.letter_prev then - local data = stack:get_meta():to_table().fields - if not data or not data.page then - return - end - - data.page = tonumber(data.page) - data.page_max = tonumber(data.page_max) - - if fields.letter_next then - data.page = data.page + 1 - if data.page > data.page_max then - data.page = 1 - end - else - data.page = data.page - 1 - if data.page == 0 then - data.page = data.page_max - end - end - - stack:get_meta():from_table({fields = data}) - stack = letter_on_use(stack, player) - end - - -- Update stack - player:set_wielded_item(stack) -end) - minetest.register_craftitem("letters:letter", { description = "Written Letter", inventory_image = "letter.png", stack_max = 1, - groups = {flammable = 1, letter = 1, paper = 1}, - on_use = letter_on_use, + groups = {flammable = 1, book = 1}, + -- on_use = book_on_use, }) minetest.register_craftitem("letters:letter_empty", { description = "Empty Letter", inventory_image = "letter_empty.png", stack_max = 1, - groups = {flammable = 1, letter = 1, paper = 1}, - on_us = letter_on_use, -}) + groups = {flammable = 1, book = 1}, + on_use = function(pos, node, clicker, itemstack, pointed_thing) + local meta = minetest.get_meta(pos) + local player_name = clicker:get_player_name() + local title = meta:get_string("title") or "" + local text = meta:get_string("text") or "" + local owner = meta:get_string("owner") or "" + local formspec + if owner == "" or owner == player_name then + formspec = "size[8,8]"..default.gui_bg..default.gui_bg_img.. + "field[0.5,1;7.5,0;title;Book title :;".. + minetest.formspec_escape(title).."]".. + "textarea[0.5,1.5;7.5,7;text;Book content :;".. + minetest.formspec_escape(text).."]".. + "button_exit[2.5,7.5;3,1;save;Save]" + else + formspec = "size[8,8]"..default.gui_bg.. + "button_exit[7,0.25;1,0.5;close;X]".. + default.gui_bg_img.. + "label[0.5,0.5;by "..owner.."]".. + "label[0.5,0;"..minetest.formspec_escape(title).."]".. + "textarea[0.5,1.5;7.5,7;;"..minetest.formspec_escape(text)..";]" + end + player_current_book[player_name] = pos + minetest.show_formspec(player_name, BOOK_FORMNAME, formspec) + return itemstack + end, +}) \ No newline at end of file diff --git a/mods/metals/metal_raw.lua b/mods/metals/metal_raw.lua index 2cc33a0..beb63f5 100644 --- a/mods/metals/metal_raw.lua +++ b/mods/metals/metal_raw.lua @@ -14,10 +14,4 @@ minetest.register_node("metals:raw_tin_block", { description = "Raw Tin Block", tiles = {"tin_raw.png"}, groups = {cracky = 3}, -}) - -minetest.register_node("metals:raw_gold_block", { - description = "Raw Gold Block", - tiles = {"gold_raw.png"}, - groups = {cracky = 3}, -}) +}) \ No newline at end of file diff --git a/mods/metals/metals.lua b/mods/metals/metals.lua index 8530c41..032afa8 100644 --- a/mods/metals/metals.lua +++ b/mods/metals/metals.lua @@ -1,25 +1,19 @@ minetest.register_node("metals:iron_block", { description = "Block of Refined Iron", tiles = {"iron_block.png"}, - groups = {cracky = 2, iron_block = 1}, + groups = {cracky = 2}, }) minetest.register_node("metals:glowing_iron_block", { description = "Block of Hot Iron", tiles = {"glowing_iron.png"}, - groups = {glowing_metal = 3}, -}) - -minetest.register_node("metals:rusted_iron_block", { - description = "Block of Refined Iron with Oxidization", - tiles = {"iron_block.png^iron_rust_overlay.png"}, - groups = {cracky = 2, iron_block = 1}, + groups = {cracky = 2}, }) minetest.register_node("metals:copper_block", { description = "Block of Refined Copper", tiles = {"copper_block.png"}, - groups = {cracky = 2, copper_block = 1}, + groups = {cracky = 2}, }) minetest.register_node("metals:glowing_copper_block", { @@ -28,44 +22,14 @@ minetest.register_node("metals:glowing_copper_block", { groups = {cracky = 2}, }) -minetest.register_node("metals:rusted_copper_block", { - description = "Block of Refined Copper with OXidization", - tiles = {"copper_block.png^copper_rust_overlay.png"}, - groups = {cracky = 2, copper_block = 1}, -}) - minetest.register_node("metals:tin_block", { description = "Block of Refined Tin", tiles = {"tin_block.png"}, - groups = {cracky = 2, tin_block = 1}, + groups = {cracky = 2}, }) minetest.register_node("metals:glowing_tin_block", { description = "Block of Hot Tin", tiles = {"glowing_tin.png"}, - groups = {glowing_metal = 3}, -}) - -minetest.register_node("metals:gold_block", { - description = "Block of Refined Gold", - tiles = {"gold_block.png"}, - groups = {cracky = 2, gold_block = 1}, -}) - -minetest.register_node("metals:glowing_gold_block", { - description = "Block of Hot Gold", - tiles = {"glowing_gold.png"}, - groups = {glowing_metal = 3}, -}) - -minetest.register_node("metals:bronze_block", { - description = "Block of Bronze", - tiles = {"bronze_block.png"}, - groups = {cracky = 2, bronze_block = 1}, -}) - -minetest.register_node("metals:glowing_bronze_block", { - description = "Block of Hot Bronze", - tiles = {"glowing_bronze.png"}, - groups = {glowing_metal = 3}, -}) + groups = {cracky = 2}, +}) \ No newline at end of file diff --git a/mods/metals/molten.lua b/mods/metals/molten.lua index 7aee247..30cf242 100644 --- a/mods/metals/molten.lua +++ b/mods/metals/molten.lua @@ -1,7 +1,3 @@ -local abm_interval = 0.5 -local cooling_chance = 20 -local melting_chance = 5 - -- IRON / HEMATITE minetest.register_node("metals:hematite_molten_source", { @@ -54,6 +50,7 @@ minetest.register_node("metals:hematite_molten_flowing", { description = "Molten Iron Flowing Node", drawtype = "flowingliquid", light_source = default.LIGHT_MAX - 5, + tiles = {"moltenglass.png"}, special_tiles = { { name = "hematite_flowing_animated.png", @@ -100,8 +97,8 @@ minetest.register_node("metals:hematite_molten_flowing", { minetest.register_abm({ neighbors = {"group:igniter"}, nodenames = {"metals:hematite_block"}, - interval = abm_interval, - chance = melting_chance, + interval = 0.5, + chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) local pos = {x = pos.x, y = pos.y, z = pos.z} minetest.set_node(pos, {name = "metals:hematite_molten_source"}) @@ -110,9 +107,9 @@ minetest.register_abm({ minetest.register_abm({ neighbors = {"group:igniter"}, - nodenames = {"group:iron_block"}, - interval = abm_interval, - chance = melting_chance, + nodenames = {"metals:iron_block"}, + interval = 0.5, + chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) local pos = {x = pos.x, y = pos.y, z = pos.z} minetest.set_node(pos, {name = "metals:glowing_iron_block"}) @@ -122,8 +119,8 @@ minetest.register_abm({ minetest.register_abm({ neighbors = {"group:water"}, nodenames = {"metals:hematite_molten_source"}, - interval = abm_interval, - chance = cooling_chance, + interval = 0.5, + chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) local pos = {x = pos.x, y = pos.y, z = pos.z} minetest.set_node(pos, {name = "metals:glowing_iron_block"}) @@ -132,8 +129,8 @@ minetest.register_abm({ minetest.register_abm({ nodenames = {"metals:glowing_iron_block"}, - interval = abm_interval, - chance = cooling_chance, + interval = 0.5, + chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) local pos = {x = pos.x, y = pos.y, z = pos.z} minetest.set_node(pos, {name = "metals:iron_block"}) @@ -193,6 +190,7 @@ minetest.register_node("metals:copper_molten_flowing", { description = "Molten Copper Flowing Node", drawtype = "flowingliquid", light_source = default.LIGHT_MAX - 5, + tiles = {"moltenglass.png"}, special_tiles = { { name = "copper_flowing_animated.png", @@ -239,8 +237,8 @@ minetest.register_node("metals:copper_molten_flowing", { minetest.register_abm({ neighbors = {"group:igniter"}, nodenames = {"metals:raw_copper_block"}, - interval = abm_interval, - chance = melting_chance, + interval = 0.5, + chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) local pos = {x = pos.x, y = pos.y, z = pos.z} minetest.set_node(pos, {name = "metals:copper_molten_source"}) @@ -249,9 +247,9 @@ minetest.register_abm({ minetest.register_abm({ neighbors = {"group:igniter"}, - nodenames = {"group:copper_block"}, - interval = abm_interval, - chance = melting_chance, + nodenames = {"metals:copper_block"}, + interval = 0.5, + chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) local pos = {x = pos.x, y = pos.y, z = pos.z} minetest.set_node(pos, {name = "metals:glowing_copper_block"}) @@ -261,8 +259,8 @@ minetest.register_abm({ minetest.register_abm({ neighbors = {"group:water"}, nodenames = {"metals:copper_molten_source"}, - interval = abm_interval, - chance = cooling_chance, + interval = 0.5, + chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) local pos = {x = pos.x, y = pos.y, z = pos.z} minetest.set_node(pos, {name = "metals:glowing_copper_block"}) @@ -271,8 +269,8 @@ minetest.register_abm({ minetest.register_abm({ nodenames = {"metals:glowing_copper_block"}, - interval = abm_interval, - chance = cooling_chance, + interval = 0.5, + chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) local pos = {x = pos.x, y = pos.y, z = pos.z} minetest.set_node(pos, {name = "metals:copper_block"}) @@ -333,6 +331,7 @@ minetest.register_node("metals:tin_molten_flowing", { description = "Molten Tin Flowing Node", drawtype = "flowingliquid", light_source = default.LIGHT_MAX - 5, + tiles = {"moltenglass.png"}, special_tiles = { { name = "tin_flowing_animated.png", @@ -378,31 +377,31 @@ minetest.register_node("metals:tin_molten_flowing", { minetest.register_abm({ neighbors = {"group:igniter"}, - nodenames = {"metals:raw_tin_block"}, - interval = abm_interval, - chance = melting_chance, - action = function(pos, node, active_object_count, active_object_count_wider) - local pos = {x = pos.x, y = pos.y, z = pos.z} - minetest.set_node(pos, {name = "metals:tin_molten_source"}) - end -}) - -minetest.register_abm({ - neighbors = {"group:igniter"}, - nodenames = {"group:tin_block"}, - interval = abm_interval, - chance = melting_chance, + nodenames = {"metals:tin_block"}, + interval = 0.5, + chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) local pos = {x = pos.x, y = pos.y, z = pos.z} minetest.set_node(pos, {name = "metals:glowing_tin_block"}) end }) +minetest.register_abm({ + neighbors = {"group:igniter"}, + nodenames = {"metals:raw_tin_block"}, + interval = 0.5, + chance = 5, + action = function(pos, node, active_object_count, active_object_count_wider) + local pos = {x = pos.x, y = pos.y, z = pos.z} + minetest.set_node(pos, {name = "metals:tin_molten_source"}) + end +}) + minetest.register_abm({ neighbors = {"group:water"}, nodenames = {"metals:tin_molten_source"}, - interval = abm_interval, - chance = cooling_chance, + interval = 0.5, + chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) local pos = {x = pos.x, y = pos.y, z = pos.z} minetest.set_node(pos, {name = "metals:glowing_tin_block"}) @@ -411,174 +410,11 @@ minetest.register_abm({ minetest.register_abm({ nodenames = {"metals:glowing_tin_block"}, - interval = abm_interval, - chance = cooling_chance, + interval = 0.5, + chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) local pos = {x = pos.x, y = pos.y, z = pos.z} minetest.set_node(pos, {name = "metals:tin_block"}) end }) - - --- GOLD - -minetest.register_node("metals:gold_molten_source", { - description = "Molten Gold Source Node", - drawtype = "liquid", - light_source = default.LIGHT_MAX - 5, - tiles = { - { - name = "gold_source_animated.png", - backface_culling = false, - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 8, - }, - }, - { - name = "gold_source_animated.png", - backface_culling = true, - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 8, - }, - }, - }, - use_texture_alpha = "blend", - paramtype = "light", - walkable = false, - pointable = false, - diggable = false, - buildable_to = false, - is_ground_content = true, - drop = "", - drowning = 1, - liquidtype = "source", - liquid_alternative_flowing = "metals:gold_molten_flowing", - liquid_alternative_source = "metals:gold_molten_source", - liquid_viscosity = 10, - liquid_renewable = false, - liquid_range = 2, - damage_per_second = 9, - post_effect_color = {a = 103, r = 30, g = 76, b = 90}, - groups = {liquid = 3}, -}) - -minetest.register_node("metals:gold_molten_flowing", { - description = "Molten Gold Flowing Node", - drawtype = "flowingliquid", - light_source = default.LIGHT_MAX - 5, - special_tiles = { - { - name = "gold_flowing_animated.png", - backface_culling = false, - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 8, - }, - }, - { - name = "gold_flowing_animated.png", - backface_culling = true, - animation = { - type = "vertical_frames", - aspect_w = 16, - aspect_h = 16, - length = 8, - }, - }, - }, - use_texture_alpha = "blend", - paramtype = "light", - paramtype2 = "flowingliquid", - walkable = false, - pointable = false, - diggable = false, - buildable_to = true, - is_ground_content = true, - drop = "", - drowning = 1, - liquidtype = "flowing", - liquid_alternative_flowing = "metals:gold_molten_flowing", - liquid_alternative_source = "metals:gold_molten_source", - liquid_viscosity = 10, - liquid_renewable = false, - liquid_range = 2, - damage_per_second = 9, - post_effect_color = {a = 103, r = 30, g = 76, b = 90}, - groups = {liquid = 3, not_in_creative_inventory = 1}, -}) - -minetest.register_abm({ - neighbors = {"group:igniter"}, - nodenames = {"metals:raw_gold_block"}, - interval = abm_interval, - chance = melting_chance, - action = function(pos, node, active_object_count, active_object_count_wider) - local pos = {x = pos.x, y = pos.y, z = pos.z} - minetest.set_node(pos, {name = "metals:gold_molten_source"}) - end -}) - -minetest.register_abm({ - neighbors = {"group:igniter"}, - nodenames = {"group:gold_block"}, - interval = abm_interval, - chance = melting_chance, - action = function(pos, node, active_object_count, active_object_count_wider) - local pos = {x = pos.x, y = pos.y, z = pos.z} - minetest.set_node(pos, {name = "metals:glowing_gold_block"}) - end -}) - -minetest.register_abm({ - neighbors = {"group:water"}, - nodenames = {"metals:gold_molten_source"}, - interval = abm_interval, - chance = cooling_chance, - action = function(pos, node, active_object_count, active_object_count_wider) - local pos = {x = pos.x, y = pos.y, z = pos.z} - minetest.set_node(pos, {name = "metals:glowing_gold_block"}) - end -}) - -minetest.register_abm({ - nodenames = {"metals:glowing_gold_block"}, - interval = abm_interval, - chance = cooling_chance, - action = function(pos, node, active_object_count, active_object_count_wider) - local pos = {x = pos.x, y = pos.y, z = pos.z} - minetest.set_node(pos, {name = "metals:gold_block"}) - end -}) - - - --- BRONZE - -minetest.register_abm({ - neighbors = {"group:igniter"}, - nodenames = {"group:bronze_Block"}, - interval = abm_interval, - chance = melting_chance, - action = function(pos, node, active_object_count, active_object_count_wider) - local pos = {x = pos.x, y = pos.y, z = pos.z} - minetest.set_node(pos, {name = "metals:glowing_bronze_block"}) - end -}) - -minetest.register_abm({ - nodenames = {"metals:glowing_bronze_block"}, - interval = abm_interval, - chance = cooling_chance, - action = function(pos, node, active_object_count, active_object_count_wider) - local pos = {x = pos.x, y = pos.y, z = pos.z} - minetest.set_node(pos, {name = "metals:bronze_block"}) - end -}) +-- haha 420 funny number diff --git a/mods/metals/textures/bronze_block.png b/mods/metals/textures/bronze_block.png deleted file mode 100644 index ccac41f..0000000 Binary files a/mods/metals/textures/bronze_block.png and /dev/null differ diff --git a/mods/metals/textures/bronze_stick.png b/mods/metals/textures/bronze_stick.png deleted file mode 100644 index c24b1f9..0000000 Binary files a/mods/metals/textures/bronze_stick.png and /dev/null differ diff --git a/mods/metals/textures/bronze_tongs.png b/mods/metals/textures/bronze_tongs.png deleted file mode 100644 index 61b0248..0000000 Binary files a/mods/metals/textures/bronze_tongs.png and /dev/null differ diff --git a/mods/metals/textures/copper_rust_overlay.png b/mods/metals/textures/copper_rust_overlay.png deleted file mode 100644 index 1d0d5ec..0000000 Binary files a/mods/metals/textures/copper_rust_overlay.png and /dev/null differ diff --git a/mods/metals/textures/copper_tongs.png b/mods/metals/textures/copper_tongs.png deleted file mode 100644 index 52c8d07..0000000 Binary files a/mods/metals/textures/copper_tongs.png and /dev/null differ diff --git a/mods/metals/textures/glowing_bronze.png b/mods/metals/textures/glowing_bronze.png deleted file mode 100644 index 4589741..0000000 Binary files a/mods/metals/textures/glowing_bronze.png and /dev/null differ diff --git a/mods/metals/textures/glowing_gold.png b/mods/metals/textures/glowing_gold.png deleted file mode 100644 index 1d06a7b..0000000 Binary files a/mods/metals/textures/glowing_gold.png and /dev/null differ diff --git a/mods/metals/textures/gold_block.png b/mods/metals/textures/gold_block.png deleted file mode 100644 index cb2b81e..0000000 Binary files a/mods/metals/textures/gold_block.png and /dev/null differ diff --git a/mods/metals/textures/gold_flowing_animated.png b/mods/metals/textures/gold_flowing_animated.png deleted file mode 100644 index 343acdc..0000000 Binary files a/mods/metals/textures/gold_flowing_animated.png and /dev/null differ diff --git a/mods/metals/textures/gold_raw.png b/mods/metals/textures/gold_raw.png deleted file mode 100644 index cd5552b..0000000 Binary files a/mods/metals/textures/gold_raw.png and /dev/null differ diff --git a/mods/metals/textures/gold_source_animated.png b/mods/metals/textures/gold_source_animated.png deleted file mode 100644 index 343acdc..0000000 Binary files a/mods/metals/textures/gold_source_animated.png and /dev/null differ diff --git a/mods/metals/textures/gold_stick.png b/mods/metals/textures/gold_stick.png deleted file mode 100644 index 6e316d9..0000000 Binary files a/mods/metals/textures/gold_stick.png and /dev/null differ diff --git a/mods/metals/textures/gold_tongs.png b/mods/metals/textures/gold_tongs.png deleted file mode 100644 index a28efe1..0000000 Binary files a/mods/metals/textures/gold_tongs.png and /dev/null differ diff --git a/mods/metals/textures/iron_rust_overlay.png b/mods/metals/textures/iron_rust_overlay.png deleted file mode 100644 index d13eae9..0000000 Binary files a/mods/metals/textures/iron_rust_overlay.png and /dev/null differ diff --git a/mods/metals/textures/iron_tongs.png b/mods/metals/textures/iron_tongs.png deleted file mode 100644 index 6037be9..0000000 Binary files a/mods/metals/textures/iron_tongs.png and /dev/null differ diff --git a/mods/metals/textures/tin_tongs.png b/mods/metals/textures/tin_tongs.png deleted file mode 100644 index 35c2931..0000000 Binary files a/mods/metals/textures/tin_tongs.png and /dev/null differ diff --git a/mods/metals/textures/tool_bronze_axe.png b/mods/metals/textures/tool_bronze_axe.png deleted file mode 100644 index b0e3568..0000000 Binary files a/mods/metals/textures/tool_bronze_axe.png and /dev/null differ diff --git a/mods/metals/textures/tool_bronze_crowbar.png b/mods/metals/textures/tool_bronze_crowbar.png deleted file mode 100644 index 0fa2758..0000000 Binary files a/mods/metals/textures/tool_bronze_crowbar.png and /dev/null differ diff --git a/mods/metals/textures/tool_bronze_hammer.png b/mods/metals/textures/tool_bronze_hammer.png deleted file mode 100644 index 9462d5e..0000000 Binary files a/mods/metals/textures/tool_bronze_hammer.png and /dev/null differ diff --git a/mods/metals/textures/tool_bronze_pick.png b/mods/metals/textures/tool_bronze_pick.png deleted file mode 100644 index be68e42..0000000 Binary files a/mods/metals/textures/tool_bronze_pick.png and /dev/null differ diff --git a/mods/metals/textures/tool_bronze_scythe.png b/mods/metals/textures/tool_bronze_scythe.png deleted file mode 100644 index 995dafa..0000000 Binary files a/mods/metals/textures/tool_bronze_scythe.png and /dev/null differ diff --git a/mods/metals/textures/tool_bronze_shovel.png b/mods/metals/textures/tool_bronze_shovel.png deleted file mode 100644 index f771d48..0000000 Binary files a/mods/metals/textures/tool_bronze_shovel.png and /dev/null differ diff --git a/mods/metals/textures/tool_bronze_sword.png b/mods/metals/textures/tool_bronze_sword.png deleted file mode 100644 index 112b6ca..0000000 Binary files a/mods/metals/textures/tool_bronze_sword.png and /dev/null differ diff --git a/mods/metals/textures/tool_gold_axe.png b/mods/metals/textures/tool_gold_axe.png deleted file mode 100644 index 80c305a..0000000 Binary files a/mods/metals/textures/tool_gold_axe.png and /dev/null differ diff --git a/mods/metals/textures/tool_gold_crowbar.png b/mods/metals/textures/tool_gold_crowbar.png deleted file mode 100644 index 60042dd..0000000 Binary files a/mods/metals/textures/tool_gold_crowbar.png and /dev/null differ diff --git a/mods/metals/textures/tool_gold_hammer.png b/mods/metals/textures/tool_gold_hammer.png deleted file mode 100644 index 40cb7f3..0000000 Binary files a/mods/metals/textures/tool_gold_hammer.png and /dev/null differ diff --git a/mods/metals/textures/tool_gold_pick.png b/mods/metals/textures/tool_gold_pick.png deleted file mode 100644 index d8ff363..0000000 Binary files a/mods/metals/textures/tool_gold_pick.png and /dev/null differ diff --git a/mods/metals/textures/tool_gold_scythe.png b/mods/metals/textures/tool_gold_scythe.png deleted file mode 100644 index b9b568c..0000000 Binary files a/mods/metals/textures/tool_gold_scythe.png and /dev/null differ diff --git a/mods/metals/textures/tool_gold_shovel.png b/mods/metals/textures/tool_gold_shovel.png deleted file mode 100644 index 924b305..0000000 Binary files a/mods/metals/textures/tool_gold_shovel.png and /dev/null differ diff --git a/mods/metals/textures/tool_gold_sword.png b/mods/metals/textures/tool_gold_sword.png deleted file mode 100644 index bb8d157..0000000 Binary files a/mods/metals/textures/tool_gold_sword.png and /dev/null differ diff --git a/mods/metals/textures/toolhead_bronze_axe.png b/mods/metals/textures/toolhead_bronze_axe.png deleted file mode 100644 index 6f2fe53..0000000 Binary files a/mods/metals/textures/toolhead_bronze_axe.png and /dev/null differ diff --git a/mods/metals/textures/toolhead_bronze_hammer.png b/mods/metals/textures/toolhead_bronze_hammer.png deleted file mode 100644 index 4e5e58f..0000000 Binary files a/mods/metals/textures/toolhead_bronze_hammer.png and /dev/null differ diff --git a/mods/metals/textures/toolhead_bronze_pick.png b/mods/metals/textures/toolhead_bronze_pick.png deleted file mode 100644 index 291b456..0000000 Binary files a/mods/metals/textures/toolhead_bronze_pick.png and /dev/null differ diff --git a/mods/metals/textures/toolhead_bronze_shovel.png b/mods/metals/textures/toolhead_bronze_shovel.png deleted file mode 100644 index 711cb55..0000000 Binary files a/mods/metals/textures/toolhead_bronze_shovel.png and /dev/null differ diff --git a/mods/metals/textures/toolhead_bronze_sword.png b/mods/metals/textures/toolhead_bronze_sword.png deleted file mode 100644 index 80ba426..0000000 Binary files a/mods/metals/textures/toolhead_bronze_sword.png and /dev/null differ diff --git a/mods/metals/textures/toolhead_gold_axe.png b/mods/metals/textures/toolhead_gold_axe.png deleted file mode 100644 index e68332f..0000000 Binary files a/mods/metals/textures/toolhead_gold_axe.png and /dev/null differ diff --git a/mods/metals/textures/toolhead_gold_hammer.png b/mods/metals/textures/toolhead_gold_hammer.png deleted file mode 100644 index b3f32f4..0000000 Binary files a/mods/metals/textures/toolhead_gold_hammer.png and /dev/null differ diff --git a/mods/metals/textures/toolhead_gold_pick.png b/mods/metals/textures/toolhead_gold_pick.png deleted file mode 100644 index d42986b..0000000 Binary files a/mods/metals/textures/toolhead_gold_pick.png and /dev/null differ diff --git a/mods/metals/textures/toolhead_gold_shovel.png b/mods/metals/textures/toolhead_gold_shovel.png deleted file mode 100644 index 181af1e..0000000 Binary files a/mods/metals/textures/toolhead_gold_shovel.png and /dev/null differ diff --git a/mods/metals/textures/toolhead_gold_sword.png b/mods/metals/textures/toolhead_gold_sword.png deleted file mode 100644 index 6c4da42..0000000 Binary files a/mods/metals/textures/toolhead_gold_sword.png and /dev/null differ diff --git a/mods/metals/toolheads.lua b/mods/metals/toolheads.lua index a450f15..cae49da 100644 --- a/mods/metals/toolheads.lua +++ b/mods/metals/toolheads.lua @@ -13,16 +13,6 @@ minetest.register_craftitem("metals:pick_head_tin", { inventory_image = "toolhead_tin_pick.png" }) -minetest.register_craftitem("metals:pick_head_bronze", { - description = "Wrought Bronze Pickaxe Head", - inventory_image = "toolhead_bronze_pick.png" -}) - -minetest.register_craftitem("metals:pick_head_gold", { - description = "Wrought Gold Pickaxe Head", - inventory_image = "toolhead_gold_pick.png" -}) - minetest.register_craftitem("metals:shovel_head_copper", { @@ -40,16 +30,6 @@ minetest.register_craftitem("metals:shovel_head_tin", { inventory_image = "toolhead_tin_shovel.png" }) -minetest.register_craftitem("metals:shovel_head_bronze", { - description = "Wrought Bronze Shovel Head", - inventory_image = "toolhead_bronze_shovel.png" -}) - -minetest.register_craftitem("metals:shovel_head_gold", { - description = "Wrought Gold Shovel Head", - inventory_image = "toolhead_gold_shovel.png" -}) - minetest.register_craftitem("metals:axe_head_copper", { @@ -67,16 +47,6 @@ minetest.register_craftitem("metals:axe_head_tin", { inventory_image = "toolhead_tin_axe.png" }) -minetest.register_craftitem("metals:axe_head_bronze", { - description = "Wrought Bronze Axe Head", - inventory_image = "toolhead_bronze_axe.png" -}) - -minetest.register_craftitem("metals:axe_head_gold", { - description = "Wrought Gold Axe Head", - inventory_image = "toolhead_gold_axe.png" -}) - minetest.register_craftitem("metals:hammer_head_copper", { @@ -94,16 +64,6 @@ minetest.register_craftitem("metals:hammer_head_tin", { inventory_image = "toolhead_tin_hammer.png" }) -minetest.register_craftitem("metals:hammer_head_bronze", { - description = "Wrought Bronze Hammer Head", - inventory_image = "toolhead_bronze_hammer.png" -}) - -minetest.register_craftitem("metals:hammer_head_gold", { - description = "Wrought Gold Hammer Head", - inventory_image = "toolhead_gold_hammer.png" -}) - minetest.register_craftitem("metals:sword_head_copper", { @@ -121,16 +81,6 @@ minetest.register_craftitem("metals:sword_head_tin", { inventory_image = "toolhead_tin_sword.png" }) -minetest.register_craftitem("metals:sword_head_bronze", { - description = "Wrought Bronze Sword Blade", - inventory_image = "toolhead_bronze_sword.png" -}) - -minetest.register_craftitem("metals:sword_head_gold", { - description = "Wrought Gold Sword Blade", - inventory_image = "toolhead_gold_sword.png" -}) - minetest.register_craftitem("metals:copper_stick", { @@ -146,14 +96,4 @@ minetest.register_craftitem("metals:iron_stick", { minetest.register_craftitem("metals:tin_stick", { description = "Wrought Tin Stick", inventory_image = "tin_stick.png" -}) - -minetest.register_craftitem("metals:gold_stick", { - description = "Wrought Gold Stick", - inventory_image = "gold_stick.png" -}) - -minetest.register_craftitem("metals:bronze_stick", { - description = "Wrought Bronze Stick", - inventory_image = "bronze_stick.png" -}) +}) \ No newline at end of file diff --git a/mods/metals/tools.lua b/mods/metals/tools.lua index b7afe58..53108a1 100644 --- a/mods/metals/tools.lua +++ b/mods/metals/tools.lua @@ -1,82 +1,6 @@ --- Tongs - -minetest.register_tool("metals:tongs_iron", { - description = "Wrought Iron Tongs", - inventory_image = "iron_tongs.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - glowing_metal = {times={[3]=0.00}, uses=20, maxlevel=2}, - }, - damage_groups = {fleshy=1}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:tongs_copper", { - description = "Wrought Copper Tongs", - inventory_image = "copper_tongs.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - glowing_metal = {times={[3]=0.00}, uses=20, maxlevel=2}, - }, - damage_groups = {fleshy=1}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:tongs_tin", { - description = "Wrought Tin Tongs", - inventory_image = "tin_tongs.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - glowing_metal = {times={[3]=0.00}, uses=20, maxlevel=2}, - }, - damage_groups = {fleshy=1}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:tongs_gold", { - description = "Wrought Gold Tongs", - inventory_image = "gold_tongs.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - glowing_metal = {times={[3]=0.00}, uses=20, maxlevel=2}, - }, - damage_groups = {fleshy=1}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:tongs_bronze", { - description = "Wrought Bronze Tongs", - inventory_image = "bronze_tongs.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - glowing_metal = {times={[3]=0.00}, uses=20, maxlevel=2}, - }, - damage_groups = {fleshy=1}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -- Pickaxes + minetest.register_tool("metals:pick_iron", { description = "Wrought Iron Pickaxe", inventory_image = "tool_iron_pick.png", @@ -84,7 +8,7 @@ minetest.register_tool("metals:pick_iron", { full_punch_interval = 1.0, max_drop_level=1, groupcaps={ - cracky = {times={[1]=3.50, [2]=1.75, [3]=1.25}, uses=50, maxlevel=2}, + cracky = {times={[1]=3.50, [2]=1.75, [3]=1.25}, uses=20, maxlevel=2}, }, damage_groups = {fleshy=3}, }, @@ -114,37 +38,7 @@ minetest.register_tool("metals:pick_tin", { full_punch_interval = 1.0, max_drop_level=1, groupcaps={ - cracky = {times={[1]=3.50, [2]=1.75, [3]=1.25}, uses=50, maxlevel=2}, - }, - damage_groups = {fleshy=3}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:pick_bronze", { - description = "Wrought Bronze Pickaxe", - inventory_image = "tool_bronze_pick.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - cracky = {times={[1]=3.50, [2]=1.75, [3]=1.25}, uses=50, maxlevel=2}, - }, - damage_groups = {fleshy=3}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:pick_gold", { - description = "Wrought Gold Pickaxe", - inventory_image = "tool_gold_pick.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - cracky = {times={[1]=3.50, [2]=1.75, [3]=1.25}, uses=50, maxlevel=2}, + cracky = {times={[1]=3.50, [2]=1.75, [3]=1.25}, uses=80, maxlevel=2}, }, damage_groups = {fleshy=3}, }, @@ -164,7 +58,7 @@ minetest.register_tool("metals:shovel_iron", { full_punch_interval = 1.1, max_drop_level=1, groupcaps={ - crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=50, maxlevel=2}, + crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=30, maxlevel=2}, }, damage_groups = {fleshy=2}, }, @@ -180,7 +74,7 @@ minetest.register_tool("metals:shovel_copper", { full_punch_interval = 1.1, max_drop_level=1, groupcaps={ - crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=50, maxlevel=2}, + crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=60, maxlevel=2}, }, damage_groups = {fleshy=2}, }, @@ -196,39 +90,7 @@ minetest.register_tool("metals:shovel_tin", { full_punch_interval = 1.1, max_drop_level=1, groupcaps={ - crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=50, maxlevel=2}, - }, - damage_groups = {fleshy=2}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:shovel_bronze", { - description = "Wrought Bronze Shovel", - inventory_image = "tool_bronze_shovel.png", - wield_image = "tool_bronze_shovel.png^[transformR90", - tool_capabilities = { - full_punch_interval = 1.1, - max_drop_level=1, - groupcaps={ - crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=50, maxlevel=2}, - }, - damage_groups = {fleshy=2}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:shovel_gold", { - description = "Wrought Gold Shovel", - inventory_image = "tool_gold_shovel.png", - wield_image = "tool_gold_shovel.png^[transformR90", - tool_capabilities = { - full_punch_interval = 1.1, - max_drop_level=1, - groupcaps={ - crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=50, maxlevel=2}, + crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=100, maxlevel=2}, }, damage_groups = {fleshy=2}, }, @@ -249,7 +111,7 @@ minetest.register_tool("metals:hammer_iron", { max_drop_level=1, damage_groups = {fleshy=5}, groupcaps={ - smashy = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=50, maxlevel=2}, + smashy = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=35, maxlevel=2}, }, }, sound = {breaks = "default_tool_breaks"}, @@ -265,7 +127,7 @@ minetest.register_tool("metals:hammer_copper", { max_drop_level=1, damage_groups = {fleshy=5}, groupcaps={ - smashy = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=50, maxlevel=2}, + smashy = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=75, maxlevel=2}, }, }, sound = {breaks = "default_tool_breaks"}, @@ -281,7 +143,7 @@ minetest.register_tool("metals:hammer_copper", { max_drop_level=1, damage_groups = {fleshy=5}, groupcaps={ - smashy = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=50, maxlevel=2}, + smashy = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=75, maxlevel=2}, }, }, sound = {breaks = "default_tool_breaks"}, @@ -297,39 +159,7 @@ minetest.register_tool("metals:hammer_tin", { max_drop_level=1, damage_groups = {fleshy=5}, groupcaps={ - smashy = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=50, maxlevel=2}, - }, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:hammer_bronze", { - description = "Wrought Bronze Hammer", - inventory_image = "tool_bronze_hammer.png", - wield_image = "tool_bronze_hammer.png", - tool_capabilities = { - full_punch_interval = 1.5, - max_drop_level=1, - damage_groups = {fleshy=5}, - groupcaps={ - smashy = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=50, maxlevel=2}, - }, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:hammer_gold", { - description = "Wrought Gold Hammer", - inventory_image = "tool_gold_hammer.png", - wield_image = "tool_gold_hammer.png", - tool_capabilities = { - full_punch_interval = 1.5, - max_drop_level=1, - damage_groups = {fleshy=5}, - groupcaps={ - smashy = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=50, maxlevel=2}, + smashy = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=125, maxlevel=2}, }, }, sound = {breaks = "default_tool_breaks"}, @@ -347,7 +177,7 @@ minetest.register_tool("metals:axe_iron", { full_punch_interval = 1.0, max_drop_level=1, groupcaps={ - choppy={times={[1]=1.50, [2]=0.40, [3]=0.10}, uses=50, maxlevel=2}, + choppy={times={[1]=1.50, [2]=0.40, [3]=0.10}, uses=20, maxlevel=2}, }, damage_groups = {fleshy=3}, }, @@ -377,37 +207,7 @@ minetest.register_tool("metals:axe_tin", { full_punch_interval = 1.0, max_drop_level=1, groupcaps={ - choppy={times={[1]=1.50, [2]=0.40, [3]=0.10}, uses=50, maxlevel=2}, - }, - damage_groups = {fleshy=3}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:axe_bronze", { - description = "Wrought Bronze Axe", - inventory_image = "tool_bronze_axe.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - choppy={times={[1]=1.50, [2]=0.40, [3]=0.10}, uses=50, maxlevel=2}, - }, - damage_groups = {fleshy=3}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:axe_gold", { - description = "Wrought Gold Axe", - inventory_image = "tool_gold_axe.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - choppy={times={[1]=1.50, [2]=0.40, [3]=0.10}, uses=50, maxlevel=2}, + choppy={times={[1]=1.50, [2]=0.40, [3]=0.10}, uses=80, maxlevel=2}, }, damage_groups = {fleshy=3}, }, @@ -446,10 +246,10 @@ minetest.register_tool("metals:crowbar_copper", { full_punch_interval = 1.0, max_drop_level=1, groupcaps={ - crumbly = {times={[1]=2.20, [2]=0.80, [3]=0.30}, uses=50, maxlevel=1}, - choppy = {times={[2]=1.05, [3]=0.50}, uses=50, maxlevel=1}, - snappy = {times={[2]=0.75, [3]=0.15}, uses=50, maxlevel=1}, - cracky = {times={[2]=2.25, [3]=1.10}, uses=50, maxlevel=1} + crumbly = {times={[1]=2.20, [2]=0.80, [3]=0.30}, uses=100, maxlevel=1}, + choppy = {times={[2]=1.05, [3]=0.50}, uses=100, maxlevel=1}, + snappy = {times={[2]=0.75, [3]=0.15}, uses=100, maxlevel=1}, + cracky = {times={[2]=2.25, [3]=1.10}, uses=100, maxlevel=1} }, damage_groups = {fleshy=4}, }, @@ -464,46 +264,10 @@ minetest.register_tool("metals:crowbar_tin", { full_punch_interval = 1.0, max_drop_level=1, groupcaps={ - crumbly = {times={[1]=2.20, [2]=0.80, [3]=0.30}, uses=50, maxlevel=1}, - choppy = {times={[2]=1.05, [3]=0.50}, uses=50, maxlevel=1}, - snappy = {times={[2]=0.75, [3]=0.15}, uses=50, maxlevel=1}, - cracky = {times={[2]=2.25, [3]=1.10}, uses=50, maxlevel=1} - }, - damage_groups = {fleshy=4}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:crowbar_bronze", { - description = "Wrought Bronze Crowbar", - inventory_image = "tool_bronze_crowbar.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - crumbly = {times={[1]=2.20, [2]=0.80, [3]=0.30}, uses=50, maxlevel=1}, - choppy = {times={[2]=1.05, [3]=0.50}, uses=50, maxlevel=1}, - snappy = {times={[2]=0.75, [3]=0.15}, uses=50, maxlevel=1}, - cracky = {times={[2]=2.25, [3]=1.10}, uses=50, maxlevel=1} - }, - damage_groups = {fleshy=4}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:crowbar_gold", { - description = "Wrought Gold Crowbar", - inventory_image = "tool_gold_crowbar.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - crumbly = {times={[1]=2.20, [2]=0.80, [3]=0.30}, uses=50, maxlevel=1}, - choppy = {times={[2]=1.05, [3]=0.50}, uses=50, maxlevel=1}, - snappy = {times={[2]=0.75, [3]=0.15}, uses=50, maxlevel=1}, - cracky = {times={[2]=2.25, [3]=1.10}, uses=50, maxlevel=1} + crumbly = {times={[1]=2.20, [2]=0.80, [3]=0.30}, uses=125, maxlevel=1}, + choppy = {times={[2]=1.05, [3]=0.50}, uses=125, maxlevel=1}, + snappy = {times={[2]=0.75, [3]=0.15}, uses=125, maxlevel=1}, + cracky = {times={[2]=2.25, [3]=1.10}, uses=125, maxlevel=1} }, damage_groups = {fleshy=4}, }, @@ -525,7 +289,7 @@ minetest.register_tool("metals:sword_iron", { full_punch_interval = 1.2, max_drop_level=1, groupcaps={ - snappy = {times={[2]=0.50, [3]=0.15}, uses=50, maxlevel=1} + snappy = {times={[2]=0.50, [3]=0.15}, uses=75, maxlevel=1} }, damage_groups = {fleshy=5}, }, @@ -540,7 +304,7 @@ minetest.register_tool("metals:sword_copper", { full_punch_interval = 0.8, max_drop_level=1, groupcaps={ - snappy = {times={[2]=0.50, [3]=0.15}, uses=50, maxlevel=1} + snappy = {times={[2]=0.50, [3]=0.15}, uses=125, maxlevel=1} }, damage_groups = {fleshy=5}, }, @@ -555,37 +319,7 @@ minetest.register_tool("metals:sword_tin", { full_punch_interval = 0.4, max_drop_level=1, groupcaps={ - snappy = {times={[2]=0.50, [3]=0.15}, uses=50, maxlevel=1} - }, - damage_groups = {fleshy=5}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:sword_bronze", { - description = "Wrought Bronze Sword", - inventory_image = "tool_bronze_sword.png", - tool_capabilities = { - full_punch_interval = 0.8, - max_drop_level=1, - groupcaps={ - snappy = {times={[2]=0.50, [3]=0.15}, uses=50, maxlevel=1} - }, - damage_groups = {fleshy=5}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:sword_gold", { - description = "Wrought Gold Sword", - inventory_image = "tool_gold_sword.png", - tool_capabilities = { - full_punch_interval = 0.4, - max_drop_level=1, - groupcaps={ - snappy = {times={[2]=0.50, [3]=0.15}, uses=50, maxlevel=1} + snappy = {times={[2]=0.50, [3]=0.15}, uses=175, maxlevel=1} }, damage_groups = {fleshy=5}, }, @@ -619,7 +353,7 @@ minetest.register_tool("metals:scythe_copper", { full_punch_interval = 1, max_drop_level=1, groupcaps={ - snappy = {times={[1]=0.50, [2]=0.25, [3]=0.05}, uses=50, maxlevel=1}, + snappy = {times={[1]=0.50, [2]=0.25, [3]=0.05}, uses=100, maxlevel=1}, grass = {times={[3]=0.25}, uses=100, maxlevel=1} }, damage_groups = {fleshy=4}, @@ -635,43 +369,11 @@ minetest.register_tool("metals:scythe_tin", { full_punch_interval = 0.4, max_drop_level=1, groupcaps={ - snappy = {times={[1]=0.50, [2]=0.25, [3]=0.05}, uses=50, maxlevel=1}, + snappy = {times={[1]=0.50, [2]=0.25, [3]=0.05}, uses=175, maxlevel=1}, grass = {times={[3]=0.25}, uses=175, maxlevel=1} }, damage_groups = {fleshy=5}, }, sound = {breaks = "default_tool_breaks"}, groups = {} -}) - -minetest.register_tool("metals:scythe_bronze", { - description = "Wrought Bronze Scythe", - inventory_image = "tool_bronze_scythe.png", - tool_capabilities = { - full_punch_interval = 1, - max_drop_level=1, - groupcaps={ - snappy = {times={[1]=0.50, [2]=0.25, [3]=0.05}, uses=50, maxlevel=1}, - grass = {times={[3]=0.25}, uses=100, maxlevel=1} - }, - damage_groups = {fleshy=4}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) - -minetest.register_tool("metals:scythe_gold", { - description = "Wrought Gold Scythe", - inventory_image = "tool_gold_scythe.png", - tool_capabilities = { - full_punch_interval = 0.4, - max_drop_level=1, - groupcaps={ - snappy = {times={[1]=0.50, [2]=0.25, [3]=0.05}, uses=50, maxlevel=1}, - grass = {times={[3]=0.25}, uses=175, maxlevel=1} - }, - damage_groups = {fleshy=5}, - }, - sound = {breaks = "default_tool_breaks"}, - groups = {} -}) +}) \ No newline at end of file diff --git a/mods/nature/init.lua b/mods/nature/init.lua index 79216c5..8f807ee 100644 --- a/mods/nature/init.lua +++ b/mods/nature/init.lua @@ -7,4 +7,3 @@ dofile(default_path.."/flowers.lua") dofile(default_path.."/growth.lua") dofile(default_path.."/weaving.lua") dofile(default_path.."/pollination.lua") -dofile(default_path.."/bushes.lua") diff --git a/mods/nature/leaves.lua b/mods/nature/leaves.lua deleted file mode 100644 index 1a3a41f..0000000 --- a/mods/nature/leaves.lua +++ /dev/null @@ -1,14 +0,0 @@ -minetest.register_craftitem("nature:bush_leaf", { - description = "Bush Leaf", - inventory_image = "bush_leaf.png", -}) - -minetest.register_craftitem("nature:leaf", { - description = "Leaf", - inventory_image = "leaf.png", -}) - -minetest.register_craftitem("nature:blueberry_bush_leaf", { - description = "Blueberry Bush Leaf", - inventory_image = "blueberry_bush_leaf.png", -}) diff --git a/mods/rocks/ores.lua b/mods/rocks/ores.lua index ccbf88c..fa9174a 100644 --- a/mods/rocks/ores.lua +++ b/mods/rocks/ores.lua @@ -1,6 +1,6 @@ minetest.register_node("rocks:granite_with_coal", { description = "Granite with Coal", - tiles = {"granite_stone.png^default_mineral_coal.png"}, + tiles = {"granite_with_coal.png"}, groups = {cracky = 3}, drop = "default:coal_lump", legacy_mineral = true, @@ -8,7 +8,7 @@ minetest.register_node("rocks:granite_with_coal", { minetest.register_node("rocks:granite_with_iron", { description = "Granite with Iron", - tiles = {"granite_stone.png^default_mineral_iron.png"}, + tiles = {"granite_with_iron.png"}, groups = {cracky = 3}, drop = "default:iron_lump", legacy_mineral = true, @@ -16,7 +16,7 @@ minetest.register_node("rocks:granite_with_iron", { minetest.register_node("rocks:granite_with_copper", { description = "Granite with Copper", - tiles = {"granite_stone.png^default_mineral_copper.png"}, + tiles = {"granite_with_copper.png"}, groups = {cracky = 3}, drop = "default:copper_lump", legacy_mineral = true, @@ -24,56 +24,16 @@ minetest.register_node("rocks:granite_with_copper", { minetest.register_node("rocks:granite_with_tin", { description = "Granite with Tin", - tiles = {"granite_stone.png^default_mineral_tin.png"}, + tiles = {"granite_with_tin.png"}, groups = {cracky = 3}, drop = "default:tin_lump", legacy_mineral = true, }) -minetest.register_node("rocks:granite_with_gold", { - description = "Granite with Gold", - tiles = {"granite_stone.png^default_mineral_gold.png"}, - groups = {cracky = 3}, - drop = "default:gold_lump", - legacy_mineral = true, -}) - minetest.register_node("rocks:basalt_with_coal", { description = "Basalt with Coal", tiles = {"basalt_stone.png^default_mineral_coal.png"}, groups = {cracky = 3}, drop = "default:coal_lump", legacy_mineral = true, -}) - -minetest.register_node("rocks:basalt_with_iron", { - description = "Basalt with Iron", - tiles = {"basalt_stone.png^default_mineral_iron.png"}, - groups = {cracky = 3}, - drop = "default:iron_lump", - legacy_mineral = true, -}) - -minetest.register_node("rocks:basalt_with_copper", { - description = "Basalt with Copper", - tiles = {"basalt_stone.png^default_mineral_copper.png"}, - groups = {cracky = 3}, - drop = "default:copper_lump", - legacy_mineral = true, -}) - -minetest.register_node("rocks:basalt_with_tin", { - description = "Basalt with Tin", - tiles = {"basalt_stone.png^default_mineral_tin.png"}, - groups = {cracky = 3}, - drop = "default:tin_lump", - legacy_mineral = true, -}) - -minetest.register_node("rocks:basalt_with_gold", { - description = "Basalt with Gold", - tiles = {"basalt_stone.png^default_mineral_gold.png"}, - groups = {cracky = 3}, - drop = "default:iron_lump", - legacy_mineral = true, -}) +}) \ No newline at end of file diff --git a/screenshots/coaldust_crafting.png b/screenshots/coaldust_crafting.png deleted file mode 100644 index a3bc5d7..0000000 Binary files a/screenshots/coaldust_crafting.png and /dev/null differ diff --git a/screenshots/cool_tin.png b/screenshots/cool_tin.png deleted file mode 100644 index 376f77b..0000000 Binary files a/screenshots/cool_tin.png and /dev/null differ diff --git a/screenshots/embers_crafting.png b/screenshots/embers_crafting.png deleted file mode 100644 index 827e31c..0000000 Binary files a/screenshots/embers_crafting.png and /dev/null differ diff --git a/screenshots/extensive_water_pollution.png b/screenshots/extensive_water_pollution.png deleted file mode 100644 index 9c2859f..0000000 Binary files a/screenshots/extensive_water_pollution.png and /dev/null differ diff --git a/screenshots/metal_lineup.png b/screenshots/metal_lineup.png deleted file mode 100644 index a8ad2f3..0000000 Binary files a/screenshots/metal_lineup.png and /dev/null differ diff --git a/screenshots/pitch_infusion_in_desert_stone.png b/screenshots/pitch_infusion_in_desert_stone.png deleted file mode 100644 index f4cdcdc..0000000 Binary files a/screenshots/pitch_infusion_in_desert_stone.png and /dev/null differ diff --git a/screenshots/pitch_infusion_in_stone.png b/screenshots/pitch_infusion_in_stone.png deleted file mode 100644 index cb875f9..0000000 Binary files a/screenshots/pitch_infusion_in_stone.png and /dev/null differ diff --git a/screenshots/polluted_grass.png b/screenshots/polluted_grass.png deleted file mode 100644 index 60d6751..0000000 Binary files a/screenshots/polluted_grass.png and /dev/null differ diff --git a/screenshots/secretmods_chess_pieces.png b/screenshots/secretmods_chess_pieces.png deleted file mode 100644 index bb9f22c..0000000 Binary files a/screenshots/secretmods_chess_pieces.png and /dev/null differ diff --git a/screenshots/tin_glowing_cooling.png b/screenshots/tin_glowing_cooling.png deleted file mode 100644 index dc43be9..0000000 Binary files a/screenshots/tin_glowing_cooling.png and /dev/null differ diff --git a/screenshots/tin_hot_cooling.png b/screenshots/tin_hot_cooling.png deleted file mode 100644 index e659225..0000000 Binary files a/screenshots/tin_hot_cooling.png and /dev/null differ diff --git a/screenshots/tin_hot_furnace.png b/screenshots/tin_hot_furnace.png deleted file mode 100644 index e4525ed..0000000 Binary files a/screenshots/tin_hot_furnace.png and /dev/null differ diff --git a/screenshots/tin_raw_furnace.png b/screenshots/tin_raw_furnace.png deleted file mode 100644 index 4b0aa42..0000000 Binary files a/screenshots/tin_raw_furnace.png and /dev/null differ diff --git a/screenshots/torches_crafting.png b/screenshots/torches_crafting.png deleted file mode 100644 index 5411b1b..0000000 Binary files a/screenshots/torches_crafting.png and /dev/null differ