diff --git a/init.lua b/init.lua index 17d16c6..dafddcf 100644 --- a/init.lua +++ b/init.lua @@ -27,20 +27,14 @@ end -- Single tanks setting("int", "steel_uses", 20, "Number of uses for a steel air tank") -setting("int", "copper_uses", 10, "Number of uses for a copper air tank") -setting("int", "bronze_uses", config.steel_uses + config.copper_uses, "Number of uses for a bronze air tank") -- Double tanks setting("bool", "enable_double", true, "Enable double tanks") setting("int", "steel_2_uses", config.steel_uses * 2, "Number of uses for a pair of steel air tanks") -setting("int", "copper_2_uses", config.copper_uses * 2, "Number of uses for a pair of copper air tanks") -setting("int", "bronze_2_uses", config.bronze_uses * 2, "Number of uses for a pair of bronze air tanks") -- Triple tanks setting("bool", "enable_triple", true, "Enable triple tanks") setting("int", "steel_3_uses", config.steel_uses * 3, "Number of uses for three steel air tanks") -setting("int", "copper_3_uses", config.copper_uses * 3, "Number of uses for threee copper air tanks") -setting("int", "bronze_3_uses", config.bronze_uses * 3, "Number of uses for three bronze air tanks") setting("bool", "wear_in_creative", true, "Air tanks wear out in creative mode") @@ -48,8 +42,6 @@ setting("bool", "compressor_needs_fuel", true, "Compressor needs fuel") -- these may come from default or from mineclone mods local steel_ingot -local copper_ingot -local bronze_ingot local mese_crystal_fragment local get_itemslot_bg = function(x, y, w, h) return "" end local get_hotbar_bg = function(x, y) return "" end @@ -57,8 +49,6 @@ local sounds if minetest.get_modpath("default") then steel_ingot = "default:steel_ingot" - copper_ingot = "default:copper_ingot" - bronze_ingot = "default:bronze_ingot" mese_crystal_fragment = "default:mese_crystal_fragment" get_hotbar_bg = default.get_hotbar_bg sounds = default.node_sound_metal_defaults() @@ -75,9 +65,6 @@ end if minetest.get_modpath("mcl_sounds") then sounds = mcl_sounds.node_sound_metal_defaults() end -if minetest.get_modpath("mcl_copper") then - copper_ingot = "mcl_copper:copper_ingot" -end local compressor_desc = S("A machine for filling air tanks with compressed air.") local compressor_help @@ -96,7 +83,7 @@ end local cardinal_dirs = {{x=1,y=0,z=0},{x=-1,y=0,z=0},{x=0,y=1,z=0},{x=0,y=-1,z=0},{x=0,y=0,z=1},{x=0,y=0,z=-1},} -- For compressor code use later on -local max_uses = math.max(config.steel_uses, config.copper_uses, config.bronze_uses) +local max_uses = math.max(config.steel_uses) if config.enable_triple then max_uses = max_uses * 3 elseif config.enable_double then @@ -316,19 +303,13 @@ local function register_air_tank_3(name, desc, color, uses, material) end register_air_tank("steel", S("Steel Air Tank"), "#d6d6d6", config.steel_uses, steel_ingot) -register_air_tank("copper", S("Copper Air Tank"), "#cd8e54", config.copper_uses, copper_ingot) -register_air_tank("bronze", S("Bronze Air Tank"), "#c87010", config.bronze_uses, bronze_ingot) if config.enable_double then register_air_tank_2("steel", S("Double Steel Air Tanks"), "#d6d6d6", config.steel_2_uses, steel_ingot) - register_air_tank_2("copper", S("Double Copper Air Tanks"), "#cd8e54", config.copper_2_uses, copper_ingot) - register_air_tank_2("bronze", S("Double Bronze Air Tanks"), "#c87010", config.bronze_2_uses, bronze_ingot) end if config.enable_triple then register_air_tank_3("steel", S("Triple Steel Air Tanks"), "#d6d6d6", config.steel_3_uses, steel_ingot) - register_air_tank_3("copper", S("Triple Copper Air Tanks"), "#cd8e54", config.copper_3_uses, copper_ingot) - register_air_tank_3("bronze", S("Triple Bronze Air Tanks"), "#c87010", config.bronze_3_uses, bronze_ingot) end --------------------------------------------------------------------------------------------------------- diff --git a/locale/template.txt b/locale/template.txt index 8795c13..e176567 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -20,12 +20,6 @@ A tank containing compressed air.= Air Compressor= #item name, a snorkel mouthpiece for breathing underwater Breathing Tube= -#compressed air tank made of bronze -Bronze Air Tank= -#compressed air tank made of copper -Copper Air Tank= -Double Bronze Air Tanks= -Double Copper Air Tanks= Double Steel Air Tanks= #for indicating that a particular type of air tank is empty Empty @1= @@ -55,6 +49,4 @@ This tank can be recharged with compressed air by using it on a compressor block #documentation text This tank can be recharged with compressed air by using it on a compressor block. When fully charged this tank has @1 uses before it becomes empty.= -Triple Bronze Air Tanks= -Triple Copper Air Tanks= Triple Steel Air Tanks= diff --git a/locale/translate.ru.tr b/locale/translate.ru.tr index 1a45e9f..a92742c 100644 --- a/locale/translate.ru.tr +++ b/locale/translate.ru.tr @@ -21,11 +21,6 @@ Air Compressor=Воздушный компрессор #item name, a snorkel mouthpiece for breathing underwater Breathing Tube=Дыхательная трубка #compressed air tank made of bronze -Bronze Air Tank=Бронзовый воздушный баллон -#compressed air tank made of copper -Copper Air Tank=Медный воздушный баллон -Double Bronze Air Tanks=Двойной бронзовый воздушный баллон -Double Copper Air Tanks=Двойной медный воздушный баллон Double Steel Air Tanks=Двойной стальной воздушный баллон #for indicating that a particular type of air tank is empty Empty @1=Пустой @1 @@ -55,6 +50,4 @@ This tank can be recharged with compressed air by using it on a compressor block #documentation text This tank can be recharged with compressed air by using it on a compressor block. When fully charged this tank has @1 uses before it becomes empty.=Этот баллон может быть заполнен с помощью компрессора. Полностью заполненный баллон может быть использован @1 раз. -Triple Bronze Air Tanks=Тройной бронзовый баллон -Triple Copper Air Tanks=Тройной медный баллон Triple Steel Air Tanks=Тройной стальной баллон diff --git a/settingtypes.txt b/settingtypes.txt index d973ad4..4163d5c 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -1,7 +1,5 @@ airtanks_steel_uses (Number of uses for a steel air tank) int 30 2 1000 -airtanks_copper_uses (Number of uses for a copper air tank) int 10 2 1000 -airtanks_bronze_uses (Number of uses for a bronze air tank) int 20 2 1000 airtanks_wear_in_creative (Air tanks wear out in creative mode) bool true airtanks_enable_double (Enable double tanks) bool true airtanks_enable_triple (Enable triple tanks) bool true -airtanks_compressor_needs_fuel (Compressor requires fuel) bool true \ No newline at end of file +airtanks_compressor_needs_fuel (Compressor requires fuel) bool true