From c1da66a8939f3d445e0b6b63b7178a13379f2737 Mon Sep 17 00:00:00 2001 From: sys4 Date: Sun, 7 Apr 2019 13:14:04 +0200 Subject: [PATCH] Corrige les seaux d'acide et de sable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit La récolte de d'une source d'acide ou de sable mouvant avec un seau vide donnait un "unknown item". --- nalc_bucket/init.lua | 23 ++++++---- nalc_default/crafting.lua | 14 +++--- nalc_default/fences.lua | 16 +++---- nalc_default/mapgen.lua | 14 +++--- nalc_default/nodes.lua | 90 +++++++++++++++++++-------------------- nalc_default/tools.lua | 4 ++ 6 files changed, 84 insertions(+), 77 deletions(-) diff --git a/nalc_bucket/init.lua b/nalc_bucket/init.lua index a6d0e2e..91cc8ec 100644 --- a/nalc_bucket/init.lua +++ b/nalc_bucket/init.lua @@ -1,6 +1,6 @@ bucket.register_liquid( - "nalc_default:acid_source", - "nalc_default:acid_flowing", + "nalc:acid_source", + "nalc:acid_flowing", "nalc_bucket:bucket_acid", "bucket_acid.png", "Acid Bucket", @@ -8,8 +8,8 @@ bucket.register_liquid( ) bucket.register_liquid( - "nalc_default:sand_source", - "nalc_default:sand_flowing", + "nalc:sand_source", + "nalc:sand_flowing", "nalc_bucket:bucket_sand", "bucket_sand.png", "Sand Bucket", @@ -17,7 +17,7 @@ bucket.register_liquid( ) minetest.register_craft( - { output = "nalc_bucket:bucket_sand", + { output = "nalc:bucket_sand", recipe = { {"group:sand"}, {"group:sand"}, @@ -25,13 +25,18 @@ minetest.register_craft( }, }) -minetest.register_alias("bucket:acid_source", "nalc_default:acid_source") -minetest.register_alias("bucket:acid_flowing", "nalc_default:acid_flowing") +minetest.register_alias("bucket:acid_source", "nalc:acid_source") +minetest.register_alias("bucket:acid_flowing", "nalc:acid_flowing") + +minetest.register_alias("nalc:bucket_acid", "nalc_bucket:bucket_acid") minetest.register_alias("bucket:bucket_acid", "nalc_bucket:bucket_acid") minetest.register_alias("bucket_acid", "nalc_bucket:bucket_acid") -minetest.register_alias("bucket:sand_source", "nalc_default:sand_source") -minetest.register_alias("bucket:sand_flowing", "nalc_default:sand_flowing") +minetest.register_alias("bucket:sand_source", "nalc:sand_source") +minetest.register_alias("bucket:sand_flowing", "nalc:sand_flowing") + +minetest.register_alias("nalc:bucket_sand", "nalc_bucket:bucket_sand") minetest.register_alias("bucket:bucket_sand", "nalc_bucket:bucket_sand") +minetest.register_alias("bucket_sand", "nalc_bucket:bucket_sand") minetest.log("action", "[nalc_bucket] loaded.") diff --git a/nalc_default/crafting.lua b/nalc_default/crafting.lua index 134d281..c4cfc6f 100644 --- a/nalc_default/crafting.lua +++ b/nalc_default/crafting.lua @@ -11,7 +11,7 @@ minetest.register_craft( -- Tools minetest.register_craft( - { output = 'nalc_default:pick_gold', + { output = 'nalc:pick_gold', recipe = { {'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'}, {'', 'group:stick', ''}, @@ -20,7 +20,7 @@ minetest.register_craft( }) minetest.register_craft( - { output = 'nalc_default:shovel_gold', + { output = 'nalc:shovel_gold', recipe = { {'default:gold_ingot'}, {'group:stick'}, @@ -29,7 +29,7 @@ minetest.register_craft( }) minetest.register_craft( - { output = "nalc_default:axe_gold", + { output = "nalc:axe_gold", recipe = { {"default:gold_ingot", "default:gold_ingot"}, {"default:gold_ingot", "group:stick"}, @@ -38,7 +38,7 @@ minetest.register_craft( }) minetest.register_craft( - { output = "nalc_default:sword_gold", + { output = "nalc:sword_gold", recipe = { {"default:gold_ingot"}, {"default:gold_ingot"}, @@ -49,19 +49,19 @@ minetest.register_craft( minetest.register_craft( { output = "default:cactus 2", recipe = { - {"nalc_default:cactus_spiky", "nalc_default:cactus_spiky"}, + {"nalc:cactus_spiky", "nalc:cactus_spiky"}, }, }) minetest.register_craft( - { output = "nalc_default:cactus_spiky 2", + { output = "nalc:cactus_spiky 2", recipe = { {"default:cactus", "default:cactus"}, }, }) minetest.register_craft( - { output = "nalc_default:ladder_obsidian 4", + { output = "nalc:ladder_obsidian 4", recipe = { {"default:obsidianbrick", "", "default:obsidianbrick"}, {"default:obsidianbrick", "default:obsidianbrick", "default:obsidianbrick"}, diff --git a/nalc_default/fences.lua b/nalc_default/fences.lua index 0f31833..e8b370b 100644 --- a/nalc_default/fences.lua +++ b/nalc_default/fences.lua @@ -1,5 +1,5 @@ default.register_fence( - "nalc_default:fence_cobble", + ":nalc:fence_cobble", { description = "Cobble Fence", texture = "default_fence_cobble.png", @@ -9,7 +9,7 @@ default.register_fence( }) default.register_fence( - "nalc_default:fence_desert_cobble", + ":nalc:fence_desert_cobble", { description = "Desert Cobble Fence", texture = "default_fence_desert_cobble.png", @@ -19,7 +19,7 @@ default.register_fence( }) default.register_fence( - "nalc_default:fence_steelblock", + ":nalc:fence_steelblock", { description = "Steel Block Fence", texture = "default_fence_steelblock.png", @@ -29,7 +29,7 @@ default.register_fence( }) default.register_fence( - "nalc_default:fence_brick", + ":nalc:fence_brick", { description = "Brick Fence", texture = "default_fence_brick.png", @@ -39,7 +39,7 @@ default.register_fence( }) -- Aliases -minetest.register_alias("nalc:fence_cobble", "nalc_default:fence_cobble") -minetest.register_alias("nalc:fence_desert_cobble", "nalc_default:fence_desert_cobble") -minetest.register_alias("nalc:fence_steelblock", "nalc_default:fence_steelblock") -minetest.register_alias("nalc:fence_brick", "nalc_default:fence_brick") +minetest.register_alias("nalc_default:fence_cobble", "nalc:fence_cobble") +minetest.register_alias("nalc_default:fence_desert_cobble", "nalc:fence_desert_cobble") +minetest.register_alias("nalc_default:fence_steelblock", "nalc:fence_steelblock") +minetest.register_alias("nalc_default:fence_brick", "nalc:fence_brick") diff --git a/nalc_default/mapgen.lua b/nalc_default/mapgen.lua index 3875245..9c215df 100644 --- a/nalc_default/mapgen.lua +++ b/nalc_default/mapgen.lua @@ -1,7 +1,7 @@ minetest.register_ore( { ore_type = "scatter", - ore = "nalc_default:desert_stone_with_coal", + ore = "nalc:desert_stone_with_coal", wherein = "default:desert_stone", clust_scarcity = 9 * 9 * 9, clust_num_ores = 10, @@ -13,7 +13,7 @@ minetest.register_ore( minetest.register_ore( { ore_type = "scatter", - ore = "nalc_default:desert_stone_with_iron", + ore = "nalc:desert_stone_with_iron", wherein = "default:desert_stone", clust_scarcity = 9 * 9 * 9, clust_num_ores = 10, @@ -25,7 +25,7 @@ minetest.register_ore( minetest.register_ore( { ore_type = "scatter", - ore = "nalc_default:desert_stone_with_copper", + ore = "nalc:desert_stone_with_copper", wherein = "default:desert_stone", clust_scarcity = 11 * 11 * 11, clust_num_ores = 6, @@ -37,7 +37,7 @@ minetest.register_ore( minetest.register_ore( { ore_type = "scatter", - ore = "nalc_default:desert_stone_with_tin", + ore = "nalc:desert_stone_with_tin", wherein = "default:desert_stone", clust_scarcity = 7 * 7 * 7, clust_num_ores = 3, @@ -50,7 +50,7 @@ minetest.register_ore( minetest.register_ore( { ore_type = "scatter", - ore = "nalc_default:meze", + ore = "nalc:meze", wherein = "default:stone", clust_scarcity = 40 * 40 * 40, clust_num_ores = 3, @@ -63,7 +63,7 @@ minetest.register_ore( minetest.register_ore( { ore_type = "scatter", - ore = "nalc_default:meze", + ore = "nalc:meze", wherein = "default:desert_stone", clust_scarcity = 40 * 40 * 40, clust_num_ores = 3, @@ -78,7 +78,7 @@ minetest.register_ore( minetest.register_ore( { ore_type = "scatter", - ore = "nalc_default:acid_source", + ore = "nalc:acid_source", wherein = "default:gravel", clust_scarcity = 26 * 26 * 26, clust_num_ores = 64, diff --git a/nalc_default/nodes.lua b/nalc_default/nodes.lua index c9f45fb..5e6e17a 100644 --- a/nalc_default/nodes.lua +++ b/nalc_default/nodes.lua @@ -3,7 +3,7 @@ local function die_later(digger) end minetest.register_node( - "nalc_default:desert_stone_with_coal", + ":nalc:desert_stone_with_coal", { description = "Coal Ore", tiles = {"default_desert_stone.png^default_mineral_coal.png"}, @@ -18,7 +18,7 @@ minetest.register_node( }) minetest.register_node( - "nalc_default:desert_stone_with_iron", + ":nalc:desert_stone_with_iron", { description = "Iron Ore", tiles = {"default_desert_stone.png^default_mineral_iron.png"}, @@ -33,7 +33,7 @@ minetest.register_node( }) minetest.register_node( - "nalc_default:desert_stone_with_copper", + ":nalc:desert_stone_with_copper", { description = "Copper Ore", tiles = {"default_desert_stone.png^default_mineral_copper.png"}, @@ -48,7 +48,7 @@ minetest.register_node( }) minetest.register_node( - "nalc_default:desert_stone_with_tin", + ":nalc:desert_stone_with_tin", { description = "Tin Ore", tiles = {"default_desert_stone.png^default_mineral_tin.png"}, @@ -63,7 +63,7 @@ minetest.register_node( }) minetest.register_node( - "nalc_default:meze", + ":nalc:meze", { description = "Meze Block", tiles = {"default_meze_block.png"}, @@ -96,7 +96,7 @@ minetest.override_item( }) minetest.register_node( - "nalc_default:cactus_spiky", + ":nalc:cactus_spiky", { description = "Spiky Cactus", tiles = {"default_cactus_top.png", "default_cactus_top.png", @@ -105,7 +105,7 @@ minetest.register_node( groups = {snappy = 1, choppy = 3, flammable = 2}, drop = { items = { - {items = {"nalc_default:cactus_spiky"}}, + {items = {"nalc:cactus_spiky"}}, }, }, sounds = default.node_sound_wood_defaults(), @@ -117,7 +117,7 @@ minetest.register_node( }) minetest.register_node( - "nalc_default:acid_source", + ":nalc:acid_source", { description = "Acid Source", inventory_image = minetest.inventorycube("default_acid.png"), @@ -142,8 +142,8 @@ minetest.register_node( drop = "", drowning = 2, liquidtype = "source", - liquid_alternative_flowing = "nalc_default:acid_flowing", - liquid_alternative_source = "nalc_default:acid_source", + liquid_alternative_flowing = "nalc:acid_flowing", + liquid_alternative_source = "nalc:acid_source", liquid_viscosity = 1, liquid_range = 4, damage_per_second = 3, @@ -152,7 +152,7 @@ minetest.register_node( }) minetest.register_node( - "nalc_default:acid_flowing", + ":nalc:acid_flowing", { description = "Flowing Acid", inventory_image = minetest.inventorycube("default_acid.png"), @@ -180,8 +180,8 @@ minetest.register_node( drop = "", drowning = 2, liquidtype = "flowing", - liquid_alternative_flowing = "nalc_default:acid_flowing", - liquid_alternative_source = "nalc_default:acid_source", + liquid_alternative_flowing = "nalc:acid_flowing", + liquid_alternative_source = "nalc:acid_source", liquid_viscosity = 1, liquid_range = 4, damage_per_second = 3, @@ -190,7 +190,7 @@ minetest.register_node( }) minetest.register_node( - "nalc_default:sand_source", + ":nalc:sand_source", { description = "Sand Source", inventory_image = minetest.inventorycube("default_sand.png"), @@ -205,8 +205,8 @@ minetest.register_node( drop = "", drowning = 4, liquidtype = "source", - liquid_alternative_flowing = "nalc_default:sand_flowing", - liquid_alternative_source = "nalc_default:sand_source", + liquid_alternative_flowing = "nalc:sand_flowing", + liquid_alternative_source = "nalc:sand_source", liquid_viscosity = 20, liquid_renewable = false, post_effect_color = {a = 250, r = 0, g = 0, b = 0}, @@ -214,7 +214,7 @@ minetest.register_node( }) minetest.register_node( - "nalc_default:sand_flowing", + ":nalc:sand_flowing", { description = "Flowing Sand", inventory_image = minetest.inventorycube("default_sand.png"), @@ -242,8 +242,8 @@ minetest.register_node( drop = "", drowning = 4, liquidtype = "flowing", - liquid_alternative_flowing = "nalc_default:sand_flowing", - liquid_alternative_source = "nalc_default:sand_source", + liquid_alternative_flowing = "nalc:sand_flowing", + liquid_alternative_source = "nalc:sand_source", liquid_viscosity = 20, post_effect_color = {a = 250, r = 0, g = 0, b = 0}, groups = {liquid = 3, not_in_creative_inventory = 1}, @@ -254,7 +254,7 @@ minetest.register_node( -- minetest.register_node( - "nalc_default:ladder_obsidian", + ":nalc:ladder_obsidian", { description = "Obsidian Ladder", drawtype = "signlike", @@ -278,30 +278,28 @@ minetest.register_node( }) -- Aliases -minetest.register_alias("default:desert_stone_with_coal", "nalc_default:desert_stone_with_coal") -minetest.register_alias("default:desert_stone_with_iron", "nalc_default:desert_stone_with_iron") -minetest.register_alias("default:desert_stone_with_copper", "nalc_default:desert_stone_with_copper") -minetest.register_alias("default:desert_stone_with_tin", "nalc_default:desert_stone_with_tin") -minetest.register_alias("default:meze_block", "nalc_default:meze") -minetest.register_alias("default:meze", "nalc_default:meze") -minetest.register_alias("default:cactus_spiky", "nalc_default:cactus_spiky") -minetest.register_alias("default:acid_source", "nalc_default:acid_source") -minetest.register_alias("default:acid_flowing", "nalc_default:acid_flowing") -minetest.register_alias("default:sand_source", "nalc_default:sand_source") -minetest.register_alias("default:sand_flowing", "nalc_default:sand_flowing") -minetest.register_alias("default:ladder_obsidian", "nalc_default:ladder_obsidian") +minetest.register_alias("nalc_default:desert_stone_with_coal", "nalc:desert_stone_with_coal") +minetest.register_alias("default:desert_stone_with_coal", "nalc:desert_stone_with_coal") +minetest.register_alias("nalc_default:desert_stone_with_iron", "nalc:desert_stone_with_iron") +minetest.register_alias("default:desert_stone_with_iron", "nalc:desert_stone_with_iron") +minetest.register_alias("nalc_default:desert_stone_with_copper", "nalc:desert_stone_with_copper") +minetest.register_alias("default:desert_stone_with_copper", "nalc:desert_stone_with_copper") +minetest.register_alias("nalc_default:desert_stone_with_tin", "nalc:desert_stone_with_tin") +minetest.register_alias("default:desert_stone_with_tin", "nalc:desert_stone_with_tin") +minetest.register_alias("nalc_default:meze", "nalc:meze") +minetest.register_alias("default:meze_block", "nalc:meze") +minetest.register_alias("default:meze", "nalc:meze") +minetest.register_alias("nalc_default:cactus_spiky", "nalc:cactus_spiky") +minetest.register_alias("default:cactus_spiky", "nalc:cactus_spiky") +minetest.register_alias("nalc_default:acid_source", "nalc:acid_source") +minetest.register_alias("default:acid_source", "nalc:acid_source") +minetest.register_alias("nalc_default:acid_flowing", "nalc:acid_flowing") +minetest.register_alias("default:acid_flowing", "nalc:acid_flowing") +minetest.register_alias("nalc_default:sand_source", "nalc:sand_source") +minetest.register_alias("default:sand_source", "nalc:sand_source") +minetest.register_alias("nalc_default:sand_flowing", "nalc:sand_flowing") +minetest.register_alias("default:sand_flowing", "nalc:sand_flowing") +minetest.register_alias("nalc_default:ladder_obsidian", "nalc:ladder_obsidian") +minetest.register_alias("default:ladder_obsidian", "nalc:ladder_obsidian") -minetest.register_alias("nalc:desert_stone_with_coal", "nalc_default:desert_stone_with_coal") -minetest.register_alias("nalc:desert_stone_with_iron", "nalc_default:desert_stone_with_iron") -minetest.register_alias("nalc:desert_stone_with_copper", "nalc_default:desert_stone_with_copper") -minetest.register_alias("nalc:desert_stone_with_tin", "nalc_default:desert_stone_with_tin") -minetest.register_alias("nalc:meze_block", "nalc_default:meze") -minetest.register_alias("nalc:meze", "nalc_default:meze") -minetest.register_alias("nalc:cactus_spiky", "nalc_default:cactus_spiky") -minetest.register_alias("nalc:acid_source", "nalc_default:acid_source") -minetest.register_alias("nalc:acid_flowing", "nalc_default:acid_flowing") -minetest.register_alias("nalc:sand_source", "nalc_default:sand_source") -minetest.register_alias("nalc:sand_flowing", "nalc_default:sand_flowing") -minetest.register_alias("nalc:ladder_obsidian", "nalc_default:ladder_obsidian") - -minetest.register_alias("darkage:desert_stone_with_iron", "nalc_default:desert_stone_with_iron") +minetest.register_alias("darkage:desert_stone_with_iron", "nalc:desert_stone_with_iron") diff --git a/nalc_default/tools.lua b/nalc_default/tools.lua index 25ea900..ba6b1c0 100644 --- a/nalc_default/tools.lua +++ b/nalc_default/tools.lua @@ -135,3 +135,7 @@ minetest.register_alias("default:pick_gold", "nalc:pick_gold") minetest.register_alias("default:shovel_gold", "nalc:shovel_gold") minetest.register_alias("default:axe_gold", "nalc:axe_gold") minetest.register_alias("default:sword_gold", "nalc:sword_gold") +minetest.register_alias("nalc_default:pick_gold", "nalc:pick_gold") +minetest.register_alias("nalc_default:shovel_gold", "nalc:shovel_gold") +minetest.register_alias("nalc_default:axe_gold", "nalc:axe_gold") +minetest.register_alias("nalc_default:sword_gold", "nalc:sword_gold")