diff --git a/guide.lua b/guide.lua index ab9959a..4fb5ce7 100644 --- a/guide.lua +++ b/guide.lua @@ -368,18 +368,18 @@ end) minetest.register_chatcommand("hell_help", { params = "", - description = "Shows a hell guide", + description = S("Shows a hell guide"), func = function(name) local player = minetest.get_player_by_name(name) if not player then minetest.chat_send_player(name, "Something went wrong.") return false end - if player:getpos().y > hell.start then - minetest.chat_send_player(name, "Usually you don't neet this guide here. You can view it in the hell.") + if player:get_pos().y > hell.start then + minetest.chat_send_player(name, S("Usually you don't need this guide here. You can view it in the hell.")) return false end - minetest.chat_send_player(name, "Showing guide...") + minetest.chat_send_player(name, S("Showing guide...")) show_guide(name) return true end diff --git a/hell.lua b/hell.lua index 2b13e6a..1ae63d7 100644 --- a/hell.lua +++ b/hell.lua @@ -11,11 +11,12 @@ -- godkiller447 (ideas) -- If I didn't list you, please let me know! + +local S = hell.get_translator + + local load_time_start = minetest.get_us_time() -if not rawget(_G, "hell") then - hell = {} -end --== EDITABLE OPTIONS ==-- @@ -118,14 +119,13 @@ else end -local path = minetest.get_modpath("hell") -dofile(path.."/weird_mapgen_noise.lua") -dofile(path.."/items.lua") +dofile(hell.path.."/weird_mapgen_noise.lua") +dofile(hell.path.."/items.lua") minetest.register_privilege("hell", - "Allows sending players to hell and extracting them") -dofile(path.."/portal.lua") ---dofile(path.."/furnace.lua") -dofile(path.."/pearl.lua") + S("Allows sending players to hell and extracting them")) +dofile(hell.path.."/portal.lua") +--dofile(hell.path.."/furnace.lua") +dofile(hell.path.."/pearl.lua") -- Weierstrass function stuff from https://github.com/slemonide/gen local SIZE = 1000 @@ -664,18 +664,18 @@ minetest.register_on_generated(function(minp, maxp, seed) map_lengths_xyz), } end - pelin_maps.a:get2dMap_flat({x=minp.x, y=minp.z}, pmap1) - pelin_maps.b:get2dMap_flat({x=minp.x, y=minp.z}, pmap2) - pelin_maps.c:get2dMap_flat({x=minp.x, y=minp.z}, pmap3) + pelin_maps.a:get_2d_map_flat({x=minp.x, y=minp.z}, pmap1) + pelin_maps.b:get_2d_map_flat({x=minp.x, y=minp.z}, pmap2) + pelin_maps.c:get_2d_map_flat({x=minp.x, y=minp.z}, pmap3) local forest_possible = maxp.y > f_h_min and minp.y < f_h_max --local pmap_f_bottom = minetest.get_perlin_map(perlins.forest_bottom, - -- map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z}) + -- map_lengths_xyz):get_2d_map_flat({x=minp.x, y=minp.z}) local perlin_f_bottom, strassx, strassz if forest_possible then perlin_f_bottom = minetest.get_perlin(11, 3, 0.8, tmp2) - pelin_maps.forest_top:get2dMap_flat({x=minp.x, y=minp.z}, pmap_f_top) + pelin_maps.forest_top:get_2d_map_flat({x=minp.x, y=minp.z}, pmap_f_top) strassx = get_ws_list(2, minp.x) strassz = get_ws_list(2, minp.z) end @@ -758,7 +758,7 @@ minetest.register_on_generated(function(minp, maxp, seed) local pstr = p.x.." "..p.z if not f_perlins[pstr] then f_perlins[pstr] = math.floor(f_h_min + (math.abs( - perlin_f_bottom:get2d{x=p.x, y=p.z} + 1)) + perlin_f_bottom:get_2d{x=p.x, y=p.z} + 1)) * f_yscale_bottom + 0.5) end local top_noise = pmap_f_top[count]+1 @@ -1029,8 +1029,8 @@ minetest.register_abm({ end }) -dofile(path.."/crafting.lua") -dofile(path.."/guide.lua") +dofile(hell.path.."/crafting.lua") +dofile(hell.path.."/guide.lua") local time = (minetest.get_us_time() - load_time_start) / 1000000 diff --git a/items.lua b/items.lua index 5462c28..ad890f1 100644 --- a/items.lua +++ b/items.lua @@ -1,3 +1,6 @@ + +local S = hell.get_translator + local hell_sound = default.node_sound_stone_defaults({ dig = {name="hell_dig", gain=0.7}, dug = {name="hell_dug", gain=1}, @@ -97,7 +100,7 @@ add_more_nodes("hellrack") add_aliases("netherrack", "hellrack") minetest.register_node("hell:hellrack_tiled", { - description = "Tiled Hellrack", + description = S("Tiled Hellrack"), tiles = {"hell_hellrack_tiled.png"}, groups = {hell=2}, sounds = hell_sound, @@ -109,7 +112,7 @@ add_more_nodes("hellrack_tiled") add_aliases("netherrack_tiled", "hellrack_tiled") minetest.register_node("hell:hellrack_soil", { - description = "Dirty Hellrack", + description = S("Dirty Hellrack"), tiles = {"hell_hellrack.png^hell_hellrack_soil.png"}, groups = {hell=2}, sounds = hell_sound, @@ -120,7 +123,7 @@ minetest.register_node("hell:hellrack_soil", { add_aliases("netherrack_soil", "hellrack_soil") minetest.register_node("hell:hellrack_black", { - description = "Black Hellrack", + description = S("Black Hellrack"), tiles = {"hell_hellrack_black.png"}, groups = {hell=2}, sounds = hell_sound, @@ -132,7 +135,7 @@ add_more_nodes("hellrack_black") add_aliases("netherrack_black", "hellrack_black") minetest.register_node("hell:hellrack_blue", { - description = "Blue Hellrack", + description = S("Blue Hellrack"), tiles = {"hell_hellrack_blue.png"}, groups = {hell=1}, sounds = hell_sound, @@ -145,7 +148,7 @@ add_aliases("netherrack_blue", "hellrack_blue") -- Hellbrick minetest.register_node("hell:hellrack_brick", { - description = "Hellrack Brick", + description = S("Hellrack Brick"), tiles = {"hell_hellrack_brick.png"}, groups = {hell=3}, sounds = hell_sound, @@ -157,7 +160,7 @@ add_more_nodes("hellrack_brick") add_aliases("netherrack_brick", "hellrack_brick") minetest.register_node("hell:hellrack_brick_blue", { - description = "Blue Hellrack Brick", + description = S("Blue Hellrack Brick"), tiles = {"hell_hellrack_brick_blue.png"}, groups = {hell=3}, sounds = hell_sound, @@ -169,7 +172,7 @@ add_more_nodes("hellrack_brick_blue") add_aliases("netherrack_brick_blue", "hellrack_brick_blue") minetest.register_node("hell:hellrack_brick_black", { - description = "Black Hellrack Brick", + description = S("Black Hellrack Brick"), tiles = {"hell_hellrack_brick_black.png"}, groups = {hell=3}, sounds = hell_sound, @@ -181,7 +184,7 @@ add_more_nodes("hellrack_brick_black") add_aliases("netherrack_brick_black", "hellrack_brick_black") minetest.register_node("hell:white", { - description = "Siwtonic block", + description = S("Siwtonic block"), tiles = {"hell_white.png"}, groups = {hell=1}, sounds = hell_sound, @@ -194,7 +197,7 @@ minetest.register_alias("nether:white", "hell:white") -- Hell blood minetest.register_node("hell:sapling", { - description = "Hell Blood Child", + description = S("Hell Blood Child"), drawtype = "plantlike", tiles = {"hell_sapling.png"}, inventory_image = "hell_sapling.png", @@ -211,7 +214,7 @@ minetest.register_node("hell:sapling", { minetest.register_alias("nether:sapling", "hell:sapling") minetest.register_node("hell:blood", { - description = "Hell Blood", + description = S("Hell Blood"), tiles = {"hell_blood.png"}, groups = {snappy=2, choppy=2, oddly_breakable_by_hand=1}, sounds = default.node_sound_wood_defaults(), @@ -220,7 +223,7 @@ add_more_nodes("blood") minetest.register_alias("nether:blood", "hell:blood") minetest.register_node("hell:blood_cooked", { - description = "Cooked Hell Blood", + description = S("Cooked Hell Blood"), tiles = {"hell_blood_cooked.png"}, groups = {hell=3}, sounds = hell_sound, @@ -233,7 +236,7 @@ add_more_nodes("blood_cooked") minetest.register_alias("nether:blood_cooked", "hell:blood_cooked") minetest.register_node("hell:blood_empty", { - description = "Hell Blood Extracted", + description = S("Hell Blood Extracted"), tiles = {"hell_blood_empty.png"}, groups = {snappy=2, choppy=2, oddly_breakable_by_hand=1}, sounds = default.node_sound_wood_defaults(), @@ -242,7 +245,7 @@ add_more_nodes("blood_empty") minetest.register_alias("nether:blood_empty", "hell:blood_empty") minetest.register_node("hell:blood_top", { - description = "Hell Blood Head", + description = S("Hell Blood Head"), tiles = {"hell_blood_top.png", "hell_blood.png", "hell_blood.png^hell_blood_side.png"}, groups = {snappy=2, choppy=2, oddly_breakable_by_hand=1}, sounds = default.node_sound_wood_defaults(), @@ -251,7 +254,7 @@ add_more_nodes("blood_top") minetest.register_alias("nether:blood_top", "hell:blood_top") minetest.register_node("hell:blood_top_cooked", { - description = "Cooked Hell Blood Head", + description = S("Cooked Hell Blood Head"), tiles = {"hell_blood_top_cooked.png", "hell_blood_cooked.png", "hell_blood_cooked.png^hell_blood_side_cooked.png"}, groups = {hell=3}, sounds = hell_sound, @@ -264,7 +267,7 @@ add_more_nodes("blood_top_cooked") minetest.register_alias("nether:blood_top_cooked", "hell:blood_top_cooked") minetest.register_node("hell:blood_top_empty", { - description = "Hell Blood Head Extracted", + description = S("Hell Blood Head Extracted"), tiles = {"hell_blood_top_empty.png", "hell_blood_empty.png", "hell_blood_empty.png^hell_blood_side_empty.png"}, groups = {snappy=2, choppy=2, oddly_breakable_by_hand=1}, sounds = default.node_sound_wood_defaults(), @@ -273,7 +276,7 @@ add_more_nodes("blood_top_empty") minetest.register_alias("nether:blood_top_empty", "hell:blood_top_empty") minetest.register_node("hell:blood_stem", { - description = "Hell Blood Stem", + description = S("Hell Blood Stem"), tiles = {"hell_blood_stem_top.png", "hell_blood_stem_top.png", "hell_blood_stem.png"}, groups = {snappy=2, choppy=2, oddly_breakable_by_hand=1}, sounds = default.node_sound_wood_defaults(), @@ -282,7 +285,7 @@ add_more_nodes("blood_stem") minetest.register_alias("nether:blood_stem", "hell:blood_stem") minetest.register_node("hell:blood_stem_cooked", { - description = "Cooked Hell Blood Stem", + description = S("Cooked Hell Blood Stem"), tiles = {"hell_blood_stem_top_cooked.png", "hell_blood_stem_top_cooked.png", "hell_blood_stem_cooked.png"}, groups = {hell=3}, sounds = hell_sound, @@ -295,7 +298,7 @@ add_more_nodes("blood_stem_cooked") minetest.register_alias("nether:blood_stem_cooked", "hell:blood_stem_cooked") minetest.register_node("hell:blood_stem_empty", { - description = "Hell Blood Stem Extracted", + description = S("Hell Blood Stem Extracted"), tiles = {"hell_blood_stem_top_empty.png", "hell_blood_stem_top_empty.png", "hell_blood_stem_empty.png"}, groups = {tree=1, choppy=2, oddly_breakable_by_hand=1}, sounds = default.node_sound_wood_defaults(), @@ -304,7 +307,7 @@ add_more_nodes("blood_stem_empty") minetest.register_alias("nether:blood_stem_empty", "hell:blood_stem_empty") minetest.register_node("hell:wood", { - description = "Hell Blood Wood", + description = S("Hell Blood Wood"), tiles = {"hell_wood.png"}, groups = {choppy=2, oddly_breakable_by_hand=2}, sounds = default.node_sound_wood_defaults(), @@ -313,7 +316,7 @@ add_more_nodes("wood") minetest.register_alias("nether:wood", "hell:wood") minetest.register_node("hell:wood_cooked", { - description = "Cooked Hell Blood Wood", + description = S("Cooked Hell Blood Wood"), tiles = {"hell_wood_cooked.png"}, groups = {hell=3}, sounds = hell_sound, @@ -326,7 +329,7 @@ add_more_nodes("wood_cooked") minetest.register_alias("nether:wood_cooked", "hell:wood_cooked") minetest.register_node("hell:wood_empty", { - description = "Hell Wood", + description = S("Hell Wood"), tiles = {"hell_wood_empty.png"}, groups = {choppy=2, oddly_breakable_by_hand=2, wood=1}, sounds = default.node_sound_wood_defaults(), @@ -335,7 +338,7 @@ add_more_nodes("wood_empty") minetest.register_alias("nether:wood_empty", "hell:wood_empty") minetest.register_node("hell:extractor", { - description = "Hell Blood Extractor", + description = S("Hell Blood Extractor"), tiles = {"hell_blood_extractor.png"}, groups = {hell=3}, sounds = hell_sound, @@ -347,7 +350,7 @@ minetest.register_alias("nether:extractor", "hell:extractor") -- Hell fruit minetest.register_node("hell:fruit_leaves", { - description = "Hell Fruit Leaves", + description = S("Hell Fruit Leaves"), tiles = {"hell_fruit_leaves.png"}, groups = {fleshy=3, dig_immediate=2}, sounds = default.node_sound_defaults(), @@ -391,7 +394,7 @@ minetest.override_item("riesenpilz:nether_shroom", { }) minetest.register_node("hell:apple", { - description = "Hell Fruit", + description = S("Hell Fruit"), drawtype = "nodebox", tiles = {"hell_fruit_top.png", "hell_fruit_bottom.png", "hell_fruit.png", "hell_fruit.png^[transformFX", "hell_fruit.png^[transformFX", "hell_fruit.png"}, node_box = { @@ -443,7 +446,7 @@ minetest.override_item("hell:apple", { -- Hell vine minetest.register_node("hell:vine", { - description = "Hell vine", + description = S("Hell vine"), walkable = false, drop = "hell:sapling", sunlight_propagates = true, @@ -469,7 +472,7 @@ minetest.register_alias("nether:vine", "hell:vine") for n,i in pairs({"small", "middle", "big"}) do minetest.register_node("hell:grass_"..i, { - description = "Hell Grass", + description = S("Hell Grass"), drawtype = "plantlike", waving = 1, tiles = {"hell_grass_"..i..".png"}, @@ -490,7 +493,7 @@ for n,i in pairs({"small", "middle", "big"}) do end minetest.register_node("hell:glowflower", { - description = "Glowing Flower", + description = S("Glowing Flower"), drawtype = "plantlike", tiles = {"hell_glowflower.png"}, inventory_image = "hell_glowflower.png", @@ -510,7 +513,7 @@ minetest.register_node("hell:glowflower", { minetest.register_alias("nether:glowflower", "hell:glowflower") minetest.register_node("hell:tree_sapling", { - description = "Hell Tree Sapling", + description = S("Hell Tree Sapling"), drawtype = "plantlike", tiles = {"hell_tree_sapling.png"}, inventory_image = "hell_tree_sapling.png", @@ -527,7 +530,7 @@ minetest.register_node("hell:tree_sapling", { minetest.register_alias("nether:tree_sapling", "hell:tree_sapling") minetest.register_node("hell:tree", { - description = "Hell Trunk", + description = S("Hell Trunk"), tiles = {"hell_tree_top.png", "hell_tree_top.png", "hell_tree.png"}, paramtype2 = "facedir", is_ground_content = false, @@ -538,7 +541,7 @@ minetest.register_node("hell:tree", { minetest.register_alias("nether:tree", "hell:tree") minetest.register_node("hell:tree_corner", { - description = "Hell Trunk Corner", + description = S("Hell Trunk Corner"), tiles = {"hell_tree.png^[transformR180", "hell_tree_top.png", "hell_tree_corner.png^[transformFY", "hell_tree_corner.png^[transformR180", "hell_tree.png", "hell_tree_top.png"}, paramtype2 = "facedir", @@ -551,7 +554,7 @@ minetest.register_node("hell:tree_corner", { minetest.register_alias("nether:tree_corner", "hell:tree_corner") minetest.register_node("hell:forest_wood", { - description = "Hell Wood Block", + description = S("Hell Wood Block"), tiles = {"hell_forest_wood.png"}, groups = {choppy=2,oddly_breakable_by_hand=2,wood=1}, sounds = default.node_sound_wood_defaults(), @@ -560,7 +563,7 @@ add_more_nodes("forest_wood") minetest.register_alias("nether:forest_wood", "hell:forest_wood") minetest.register_node("hell:leaves", { - description = "Hell Leaves", + description = S("Hell Leaves"), drawtype = "plantlike", waving = 1, visual_scale = math.sqrt(2) + 0.01, @@ -588,7 +591,7 @@ minetest.register_node("hell:leaves", { minetest.register_alias("nether:leaves", "hell:leaves") minetest.register_node("hell:dirt", { - description = "Hell Dirt", + description = S("Hell Dirt"), tiles = {"hell_dirt.png"}, groups = {crumbly=3,soil=1,hell_dirt=1}, sounds = default.node_sound_dirt_defaults(), @@ -596,7 +599,7 @@ minetest.register_node("hell:dirt", { minetest.register_alias("nether:dirt", "hell:dirt") minetest.register_node("hell:dirt_top", { - description = "Hell Dirt Top", + description = S("Hell Dirt Top"), tiles = {"hell_dirt_top.png", "hell_dirt.png", {name="hell_dirt.png^hell_dirt_top_side.png", tileable_vertical = false} }, @@ -609,7 +612,7 @@ minetest.register_node("hell:dirt_top", { minetest.register_alias("nether:dirt_top", "hell:dirt_top") minetest.register_node("hell:dirt_bottom", { - description = "Hellrack Dirt Transition", + description = S("Hellrack Dirt Transition"), tiles = {"hell_dirt.png", "hell_hellrack.png", {name="hell_hellrack.png^hell_dirt_transition.png", tileable_vertical = false} }, @@ -627,7 +630,7 @@ minetest.register_alias("nether:dirt_bottom", "hell:dirt_bottom") -- Hell torch minetest.register_node("hell:torch", { - description = "Hell Torch", + description = S("Hell Torch"), drawtype = "torchlike", tiles = {"hell_torch_on_floor.png", "hell_torch_on_ceiling.png", { @@ -660,27 +663,27 @@ minetest.register_node("hell:torch", { minetest.register_alias("nether:torch", "hell:torch") minetest.register_craftitem("hell:grass", { - description = "Hell Grass", + description = S("Hell Grass"), inventory_image = "hell_grass.png", }) minetest.register_alias("nether:grass", "hell:grass") minetest.register_craftitem("hell:grass_dried", { - description = "Dried Hell Grass", + description = S("Dried Hell Grass"), inventory_image = "hell_grass_dried.png", furnace_burntime = 1, }) minetest.register_alias("nether:grass_dried", "hell:grass_dried") minetest.register_craftitem("hell:forest_planks", { - description = "Hell Wooden Planks", + description = S("Hell Wooden Planks"), inventory_image = "hell_forest_planks.png", stack_max = 990, }) minetest.register_alias("nether:forest_planks", "hell:forest_planks") minetest.register_craftitem("hell:bark", { - description = "Hell Trunk Bark", + description = S("Hell Trunk Bark"), inventory_image = "hell_bark.png", furnace_burntime = 5, }) @@ -688,13 +691,13 @@ minetest.register_alias("nether:bark", "hell:bark") -- Hell Pearl minetest.register_craftitem("hell:pearl", { - description = "Hell Pearl", + description = S("Hell Pearl"), inventory_image = "hell_pearl.png", }) minetest.register_alias("nether:pearl", "hell:pearl") minetest.register_craftitem("hell:stick", { - description = "Hell Stick", + description = S("Hell Stick"), inventory_image = "hell_stick.png", groups = {stick=1}, }) @@ -702,7 +705,7 @@ minetest.register_alias("nether:stick", "hell:stick") local tmp = {} minetest.register_craftitem("hell:shroom_head", { - description = "Hell Mushroom Head", + description = S("Hell Mushroom Head"), inventory_image = "hell_shroom_top.png", furnace_burntime = 3, on_place = function(itemstack, _, pointed_thing) @@ -730,28 +733,28 @@ minetest.register_craftitem("hell:shroom_head", { minetest.register_alias("nether:shroom_head", "hell:shroom_head") minetest.register_craftitem("hell:shroom_stem", { - description = "Hell Mushroom Stem", + description = S("Hell Mushroom Stem"), inventory_image = "hell_shroom_stem.png", furnace_burntime = 3, }) minetest.register_alias("nether:shroom_stem", "hell:shroom_stem") minetest.register_craftitem("hell:fruit_leaf", { - description = "Hell Fruit Leaf", + description = S("Hell Fruit Leaf"), inventory_image = "hell_fruit_leaf.png", furnace_burntime = 2, }) minetest.register_alias("nether:fruit_leaf", "hell:fruit_leaf") minetest.register_craftitem("hell:fruit_no_leaf", { - description = "Hell Fruit Without Leaf", + description = S("Hell Fruit Without Leaf"), inventory_image = "hell_fruit_no_leaf.png", furnace_burntime = 4, }) minetest.register_alias("nether:fruit_no_leaf", "hell:fruit_no_leaf") minetest.register_craftitem("hell:fim", { - description = "Hell FIM", --fruit in mushroom + description = S("Hell FIM"), --fruit in mushroom inventory_image = "hell_fim.png", furnace_burntime = 10, }) @@ -763,7 +766,7 @@ for _,i in ipairs({"hell:blood", "hell:blood_top", "hell:blood_stem"}) do end minetest.register_craftitem("hell:blood_extracted", { - description = "Blood", + description = S("Blood"), inventory_image = "hell_blood_extracted.png", on_place = function(itemstack, _, pointed_thing) if not pointed_thing then @@ -817,7 +820,7 @@ minetest.register_craftitem("hell:blood_extracted", { minetest.register_alias("nether:blood_extracted", "hell:blood_extracted") minetest.register_craftitem("hell:hotbed", { - description = "Cooked Blood", + description = S("Cooked Blood"), inventory_image = "hell_hotbed.png", on_place = function(itemstack, _, pointed_thing) if not pointed_thing then @@ -844,7 +847,7 @@ minetest.register_craftitem("hell:hotbed", { minetest.register_alias("nether:hotbed", "hell:hotbed") minetest.register_tool("hell:pick_mushroom", { - description = "Hell Mushroom Pickaxe", + description = S("Hell Mushroom Pickaxe"), inventory_image = "hell_pick_mushroom.png", tool_capabilities = { max_drop_level=0, @@ -857,7 +860,7 @@ minetest.register_tool("hell:pick_mushroom", { minetest.register_alias("nether:pick_musroom", "hell:pick_mushroom") minetest.register_tool("hell:pick_wood", { - description = "Hell Wood Pickaxe", + description = S("Hell Wood Pickaxe"), inventory_image = "hell_pick_wood.png", tool_capabilities = { full_punch_interval = 1.2, @@ -872,7 +875,7 @@ minetest.register_tool("hell:pick_wood", { minetest.register_alias("nether:pick_wood", "hell:pick_wood") minetest.register_tool("hell:pick_hellrack", { - description = "Hellrack Pickaxe", + description = S("Hellrack Pickaxe"), inventory_image = "hell_pick_hellrack.png", tool_capabilities = { full_punch_interval = 1.3, @@ -887,7 +890,7 @@ minetest.register_tool("hell:pick_hellrack", { minetest.register_alias("nether:pick_netherrack", "hell:pick_hellrack") minetest.register_tool("hell:pick_hellrack_blue", { - description = "Blue Hellrack Pickaxe", + description = S("Blue Hellrack Pickaxe"), inventory_image = "hell_pick_hellrack_blue.png", tool_capabilities = { full_punch_interval = 1.0, @@ -902,7 +905,7 @@ minetest.register_tool("hell:pick_hellrack_blue", { minetest.register_alias("nether:pick_netherrack_blue", "hell:pick_hellrack_blue") minetest.register_tool("hell:pick_white", { - description = "Siwtonic Pickaxe", + description = S("Siwtonic Pickaxe"), inventory_image = "hell_pick_white.png", tool_capabilities = { full_punch_interval = 0.9, @@ -917,7 +920,7 @@ minetest.register_tool("hell:pick_white", { minetest.register_alias("nether:pick_white", "hell:pick_white") minetest.register_tool("hell:axe_hellrack", { - description = "Hellrack Axe", + description = S("Hellrack Axe"), inventory_image = "hell_axe_hellrack.png", tool_capabilities = { full_punch_interval = 1.3, @@ -931,7 +934,7 @@ minetest.register_tool("hell:axe_hellrack", { minetest.register_alias("nether:axe_netherrack", "hell:axe_hellrack") minetest.register_tool("hell:axe_hellrack_blue", { - description = "Blue Hellrack Axe", + description = S("Blue Hellrack Axe"), inventory_image = "hell_axe_hellrack_blue.png", tool_capabilities = { full_punch_interval = 0.9, @@ -945,7 +948,7 @@ minetest.register_tool("hell:axe_hellrack_blue", { minetest.register_alias("nether:axe_netherrack_blue", "hell:axe_hellrack_blue") minetest.register_tool("hell:axe_white", { - description = "Siwtonic Axe", + description = S("Siwtonic Axe"), inventory_image = "hell_axe_white.png", tool_capabilities = { full_punch_interval = 0.9, @@ -959,7 +962,7 @@ minetest.register_tool("hell:axe_white", { minetest.register_alias("nether:axe_white", "hell:axe_white") minetest.register_tool("hell:shovel_hellrack", { - description = "Hellrack Shovel", + description = S("Hellrack Shovel"), inventory_image = "hell_shovel_hellrack.png", wield_image = "hell_shovel_hellrack.png^[transformR90", tool_capabilities = { @@ -974,7 +977,7 @@ minetest.register_tool("hell:shovel_hellrack", { minetest.register_alias("nether:shovel_netherrack", "hell:shovel_hellrack") minetest.register_tool("hell:shovel_hellrack_blue", { - description = "Blue Hellrack Shovel", + description = S("Blue Hellrack Shovel"), inventory_image = "hell_shovel_hellrack_blue.png", wield_image = "hell_shovel_hellrack_blue.png^[transformR90", tool_capabilities = { @@ -989,7 +992,7 @@ minetest.register_tool("hell:shovel_hellrack_blue", { minetest.register_alias("nether:shovel_netherrack_blue", "hell:shovel_hellrack_blue") minetest.register_tool("hell:shovel_white", { - description = "Siwtonic Shovel", + description = S("Siwtonic Shovel"), inventory_image = "hell_shovel_white.png", wield_image = "hell_shovel_white.png^[transformR90", tool_capabilities = { @@ -1004,7 +1007,7 @@ minetest.register_tool("hell:shovel_white", { minetest.register_alias("nether:shovel_white", "hell:shovel_white") minetest.register_tool("hell:sword_hellrack", { - description = "Hellrack Sword", + description = S("Hellrack Sword"), inventory_image = "hell_sword_hellrack.png", tool_capabilities = { full_punch_interval = 1, @@ -1018,7 +1021,7 @@ minetest.register_tool("hell:sword_hellrack", { minetest.register_alias("nether:sword_netherrack", "hell:sword_hellrack") minetest.register_tool("hell:sword_hellrack_blue", { - description = "Blue Hellrack Sword", + description = S("Blue Hellrack Sword"), inventory_image = "hell_sword_hellrack_blue.png", tool_capabilities = { full_punch_interval = 0.8, @@ -1032,7 +1035,7 @@ minetest.register_tool("hell:sword_hellrack_blue", { minetest.register_alias("nether:sword_netherrack_blue", "hell:sword_hellrack_blue") minetest.register_tool("hell:sword_white", { - description = "Siwtonic Sword", + description = S("Siwtonic Sword"), inventory_image = "hell_sword_white.png", wield_image = "hell_sword_white.png^[transformR90", tool_capabilities = { diff --git a/locale/hell.fr.tr b/locale/hell.fr.tr index e23affe..3fd447b 100644 --- a/locale/hell.fr.tr +++ b/locale/hell.fr.tr @@ -1,11 +1,24 @@ # textdomain: hell + +#portal.lua For any reason you arrived here. Type /hell_help to find out things like craft recipes.=Peu importe la raison, vous vous retrouvez ici. Entrez /hell_help pour trouver quoi faire comme des recettes de craft. +Send someone to hell=Envoyer quelqu'un en enfer +You need the hell priv to execute this chatcommand.=Vous avez besoin du privilège hell pour exécuter cette commande. +Something went wrong.=Quelque chose s'est mal passé. +Go to hell !!!=Allez en enfer !!! +@1 is now in the hell.=@1 est maintenant en enfer. +Extract someone from hell=Extraire quelqu'un de l'enfer +You are free now=Vous êtes libre maintenant +@1 is now out of the hell.=@1 est maintenant sorti(e) de l'enfer. +You can not simply teleport to or from the hell!=Vous ne pouvez pas simplement vous téléporter vers ou depuis l'enfer! Hell Gate=Porte de l'Enfer Construction requires 16 blocks of ??. The finished frame must be in the shape of a circle and laid vertically, like a door.=La construction requiert 16 blocks de ??. Le cadre fini doit être en forme de cercle et posé verticalement, comme une porte. However, I never knew what material to use for building this door despite my many attempts.=Par contre je n'ai jamais su quels matériaux utiliser pour construire cette porte malgré mes multiples essaies. One day, however, I met an old lady who frankly looked like a witch. In the course of our discussion we came to talk about the Hell Gate. This old lady confessed to me that in her family there was a legend that one of her ancestors had managed to activate the portal. But that the poor man was instantly killed as he passed through it. The gate was destroyed and several years passed. But since a certain night, the poor widow of the deceased began to rave that her Husband had come back from the dead to take her also to hell because he said that he had made this world a wonderful place and that after several years, he would have found a way to come back and return to it as he wished without causing death. A few days later, the widow disappeared without a trace. Since then the house was destroyed in a fire with all the secrets it could hold. Only an old cauldron remained amidst the ashes.=Un jour cependant, je fis la rencontre d'une vielle dame qui franchement avait l'allure d'une sorcière. Au cours de notre discussion nous en vîmes à parler de la Porte de l'Enfer. Cette vieille dame me confessa que dans sa famille se perpétuait une légende selon laquelle un de ses ancêtres serait parvenu à activer le portail. Mais que le pauvre homme fût instantanément tué en le traversant. Le portail fût détruit et plusieurs années ont passées. Mais depuis une certaine nuit, la pauvre veuve du défunt se mit à délirer en affirmant que son Mari était revenue d'entre les morts pour l'emmener elle aussi en enfer car il disait qu'il avait fait de ce monde un endroit merveilleux et qu'après plusieurs années, il aurait découvert un moyen d'en revenir et d'y retourner à sa guise sans provoquer la mort. Quelques jours après, la veuve disparu sans laisser de traces. Depuis la maison fût détruite dans un incendie avec tous les secrets qu'elle pouvait renfermer. Il ne resta qu'un vieux chaudron au milieux des cendres. When I wanted to ask the old lady with what material the gate was made, she stared at me with eyes so black that I had the impression that the Nether wanted to take over me, and I did not insist any further.=En voulant questionner la vielle dame de quelle matière le portail était fait, elle me fixa du regard avec des yeux si noirs que j'avais l'impression que les Bas-Fonds voulaient s'emparer de moi et je n'insista pas plus. You shall not pass!=Vous ne passerez pas ! + +#guide.lua Mushrooms=Champignons Hell mushrooms can be found on the hell's ground and on hellrack soil,=Le champignon maléfique se trouve sur le sol de l'enfer et le terreau maléfique, it can be dug by hand.=on peut le récolter à la main. @@ -113,3 +126,73 @@ There you can find some plants:=Voici des plantes que vous pouvez trouver : Use the hell forest grass to get paper. Craft paper out of the dried grass.=On utilise l'herbe de la fôret maléfique pour obtenir du papier. On crafte le papier à partir d'herbe sèche. Hell trunks can be found at hell trees. Craft hell wood out of hell trunk.=Les troncs maléfiques se trouvent dans les arbres maléfiques. On crafte les planches de bois maléfiques à partir de troncs maléfiques. Use it for lighting and decoration.=On l'utilise pour l'éclairage et comme décoration. +Shows a hell guide=Montre un guide de l'enfer +Usually you don't need this guide here. You can view it in the hell.=Habituellement, vous n'avez pas besoin de ce guide ici. Vous pouvez le voir en enfer. +Showing guide...=Affichage du guide... + +#hell.lua +Allows sending players to hell and extracting them=Permet d'envoyer des joueurs en enfer et de les y extraire + +#items.lua +Tiled Hellrack=Hellrack carrelé +Dirty Hellrack=Hellrack fertile +Black Hellrack=Hellrack noire +Blue Hellrack=Hellrack bleue +Hellrack Brick=Brique en Hellrack +Blue Hellrack Brick=Brique en Hellrack bleue +Black Hellrack Brick=Brique en Hellrack noire +Siwtonic block=Bloc de Siwtonic +Hell Blood Child=Pousse de sang de l'enfer +Hell Blood=Sang de l'enfer +Cooked Hell Blood=Sang de l'enfer cuit +Hell Blood Extracted=Sang de l'enfer extrait +Hell Blood Head=Tête de sang de l'enfer +Cooked Hell Blood Head=Tête de sang de l'enfer cuite +Hell Blood Head Extracted=Tête de sang de l'enfer extraite +Hell Blood Stem=Tige de sang de l'enfer +Cooked Hell Blood Stem=Tige de sang de l'enfer cuite +Hell Blood Stem Extracted=Tige de sang de l'enfer extraite +Hell Blood Wood=Bois de sang de l'enfer +Cooked Hell Blood Wood=Bois de sang de l'enfer cuit +Hell Wood=Bois de l'enfer +Hell Blood Extractor=Extracteur de sang de l'enfer +Hell Fruit Leaves=Feuilles de fruit de l'enfer +Hell Fruit=Fruit de l'enfer +Hell vine=Vigne de l'enfer +Hell Grass=Herbe de l'enfer +Glowing Flower=Fleur luminescente +Hell Tree Sapling=Arbre de l'enfer +Hell Trunk=Tronc d'arbre de l'enfer +Hell Trunk Corner=Coin de tronc de l'enfer +Hell Wood Block=Bloc de bois de l'enfer +Hell Leaves=Feuilles de l'enfer +Hell Dirt=Terre de la forêt de l'enfer +Hell Dirt Top=Terre haute de l'enfer +Hellrack Dirt Transition=Terre basse de la forêt de l'enfer +Hell Torch=Torche de l'enfer +Dried Hell Grass=Herbe de l'enfer séchée +Hell Wooden Planks=Planches de bois de l'enfer +Hell Trunk Bark=Écorce de tronc de l'enfer +Hell Pearl=Perle maléfique +Hell Stick=Bâton de l'enfer +Hell Mushroom Head=Tête de champignon de l'enfer +Hell Mushroom Stem=Tige de champignon de l'enfer +Hell Fruit Leaf=Feuille de fruit de l'enfer +Hell Fruit Without Leaf=Fruit de l'enfer sans feuilles +Hell FIM=Fruit dans champignon de l'enfer +Blood=Sang +Cooked Blood=Sang cuit +Hell Mushroom Pickaxe=Pioche en champignons de l'enfer +Hell Wood Pickaxe=Pioche en bois de l'enfer +Hellrack Pickaxe=Pioche en Hellrack +Blue Hellrack Pickaxe=Pioche en Hellrack bleue +Siwtonic Pickaxe=Pioche en Siwtonic +Hellrack Axe=Hache en Hellrack +Blue Hellrack Axe=Hache en Hellrack bleue +Siwtonic Axe=Hache en Siwtonic +Hellrack Shovel=Pelle en Hellrack +Blue Hellrack Shovel=Pelle en Hellrack bleue +Siwtonic Shovel=Pelle en Siwtonic +Hellrack Sword=Épée en Hellrack +Blue Hellrack Sword=Épée en Hellrack bleue +Siwtonic Sword=Épée en Siwtonic diff --git a/locale/template.txt b/locale/template.txt index 9f2d2d2..0587d6e 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -1,11 +1,24 @@ # textdomain: hell + +#portal.lua For any reason you arrived here. Type /hell_help to find out things like craft recipes.= +Send someone to hell= +You need the hell priv to execute this chatcommand.= +Something went wrong.= +Go to hell !!!= +@1 is now in the hell.= +Extract someone from hell= +You are free now= +@1 is now out of the hell.= +You can not simply teleport to or from the hell!= Hell Gate= Construction requires 16 blocks of ??. The finished frame must be in the shape of a circle and laid vertically, like a door.= However, I never knew what material to use for building this door despite my many attempts.= One day, however, I met an old lady who frankly looked like a witch. In the course of our discussion we came to talk about the Hell Gate. This old lady confessed to me that in her family there was a legend that one of her ancestors had managed to activate the portal. But that the poor man was instantly killed as he passed through it. The gate was destroyed and several years passed. But since a certain night, the poor widow of the deceased began to rave that her Husband had come back from the dead to take her also to hell because he said that he had made this world a wonderful place and that after several years, he would have found a way to come back and return to it as he wished without causing death. A few days later, the widow disappeared without a trace. Since then the house was destroyed in a fire with all the secrets it could hold. Only an old cauldron remained amidst the ashes.= When I wanted to ask the old lady with what material the gate was made, she stared at me with eyes so black that I had the impression that the Nether wanted to take over me, and I did not insist any further.= You shall not pass!= + +#guide.lua Mushrooms= Hell mushrooms can be found on the hell's ground and on hellrack soil,= it can be dug by hand.= @@ -113,3 +126,73 @@ There you can find some plants:= Use the hell forest grass to get paper. Craft paper out of the dried grass.= Hell trunks can be found at hell trees. Craft hell wood out of hell trunk.= Use it for lighting and decoration.= +Shows a hell guide= +Usually you don't need this guide here. You can view it in the hell.= +Showing guide...= + +#hell.lua +Allows sending players to hell and extracting them= + +#items.lua +Tiled Hellrack= +Dirty Hellrack= +Black Hellrack= +Blue Hellrack= +Hellrack Brick= +Blue Hellrack Brick= +Black Hellrack Brick= +Siwtonic block= +Hell Blood Child= +Hell Blood= +Cooked Hell Blood= +Hell Blood Extracted= +Hell Blood Head= +Cooked Hell Blood Head= +Hell Blood Head Extracted= +Hell Blood Stem= +Cooked Hell Blood Stem= +Hell Blood Stem Extracted= +Hell Blood Wood= +Cooked Hell Blood Wood= +Hell Wood= +Hell Blood Extractor= +Hell Fruit Leaves= +Hell Fruit= +Hell vine= +Hell Grass= +Glowing Flower= +Hell Tree Sapling= +Hell Trunk= +Hell Trunk Corner= +Hell Wood Block= +Hell Leaves= +Hell Dirt= +Hell Dirt Top= +Hellrack Dirt Transition= +Hell Torch= +Dried Hell Grass= +Hell Wooden Planks= +Hell Trunk Bark= +Hell Pearl= +Hell Stick= +Hell Mushroom Head= +Hell Mushroom Stem= +Hell Fruit Leaf= +Hell Fruit Without Leaf= +Hell FIM= +Blood= +Cooked Blood= +Hell Mushroom Pickaxe= +Hell Wood Pickaxe= +Hellrack Pickaxe= +Blue Hellrack Pickaxe= +Siwtonic Pickaxe= +Hellrack Axe= +Blue Hellrack Axe= +Siwtonic Axe= +Hellrack Shovel= +Blue Hellrack Shovel= +Siwtonic Shovel= +Hellrack Sword= +Blue Hellrack Sword= +Siwtonic Sword= diff --git a/portal.lua b/portal.lua index 36d5cb0..663f86c 100644 --- a/portal.lua +++ b/portal.lua @@ -38,9 +38,9 @@ local update_background if hell_prisons then function update_background(player, down) if down then - player:set_sky({r=15, g=0, b=0}, "plain") + player:set_sky({base_color={r=15, g=0, b=0}, type="plain"}) else - player:set_sky(nil, "regular") + player:set_sky({type="regular"}) end end else @@ -109,44 +109,44 @@ end -- Chatcommands (edited) written by sss minetest.register_chatcommand("to_hell", { params = "[player_name]", - description = "Send someone to hell", + description = S("Send someone to hell"), func = function(name, pname) if not minetest.check_player_privs(name, {hell=true}) then return false, - "You need the hell privilege to execute this chatcommand." + S("You need the hell privilege to execute this chatcommand.") end if not is_player_connected(pname) then pname = name end local player = minetest.get_player_by_name(pname) if not player then - return false, "Something went wrong." + return false, S("Something went wrong.") end - minetest.chat_send_player(pname, "Go to hell !!!") + minetest.chat_send_player(pname, S("Go to hell !!!")) player_to_hell(player) - return true, pname.." is now in the hell." + return true, S("@1 is now in the hell.", pname) end }) minetest.register_chatcommand("from_hell", { params = "[player_name]", - description = "Extract from hell", + description = S("Extract someone from hell"), func = function(name, pname) if not minetest.check_player_privs(name, {hell=true}) then return false, - "You need the hell priv to execute this chatcommand." + S("You need the hell priv to execute this chatcommand.") end if not is_player_connected(pname) then pname = name end local player = minetest.get_player_by_name(pname) if not player then - return false, "Something went wrong." + return false, S("Something went wrong.") end - minetest.chat_send_player(pname, "You are free now") - local pos = player:getpos() + minetest.chat_send_player(pname, S("You are free now")) + local pos = player:get_pos() player_from_hell(player, {x=pos.x, y=100, z=pos.z}) - return true, pname.." is now out of the hell." + return true, S("@1 is now out of the hell.", pname) end }) @@ -163,7 +163,7 @@ if hell_prisons then -- fixes respawn bug local player = minetest.get_player_by_name(pname) if player then - player:moveto(target) + player:move_to(target) end end, pname, target) return true @@ -208,7 +208,7 @@ if hell_prisons then end minetest.chat_send_player(pname, - "You can not simply teleport to or from the hell!") + S("You can not simply teleport to or from the hell!")) minetest.log("action", "Player \"" .. pname .. "\" attempted to teleport from or to the hell, ignoring.") return false @@ -506,7 +506,7 @@ if nether.NETHER_REALM_ENABLED then 0,function(player, target) -- fixes respawn bug if player then - player:moveto(target) + player:move_to(target) end end, player, playerPos) minetest.chat_send_player(player:get_player_name(),