From aaed0a2ea81a51f36a7eb35cb30c57ddf646fe1b Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Sat, 8 Sep 2018 12:12:15 -0400 Subject: updated castles, coloredwood, digistuff, locks, mesecons, pipeworks, steel, unified dyes, unified mesecons, and worldedit --- castle_masonry/README.md | 34 ++++++++ castle_masonry/README.txt | 43 ---------- castle_masonry/arrow_slits.lua | 2 +- castle_masonry/depends.txt | 3 +- castle_masonry/init.lua | 12 +-- castle_masonry/locale/es.po | 189 ++++++++++++++++++++++++++++++++++++++++ castle_masonry/locale/fr.po | 189 ++++++++++++++++++++++++++++++++++++++++ castle_masonry/locale/it.po | 191 +++++++++++++++++++++++++++++++++++++++++ castle_masonry/pillars.lua | 8 +- 9 files changed, 616 insertions(+), 55 deletions(-) create mode 100644 castle_masonry/README.md delete mode 100644 castle_masonry/README.txt create mode 100644 castle_masonry/locale/es.po create mode 100644 castle_masonry/locale/fr.po create mode 100644 castle_masonry/locale/it.po (limited to 'castle_masonry') diff --git a/castle_masonry/README.md b/castle_masonry/README.md new file mode 100644 index 0000000..f1c0073 --- /dev/null +++ b/castle_masonry/README.md @@ -0,0 +1,34 @@ +## Castle Masonry + +by: Philipbenr, DanDuncombe, FaceDeer + +Licence: MIT + +This is a mod all about creating castles and castle dungeons. Many of the nodes are used for the outer-walls or dungeons. + +Contains: + +* Walls, Corner-walls, +* Castlestone Stairs, Slabs, and Pillars +* Arrowslits and embrasures +* Rubble (to fill the interior of thick castle walls) +* Murder holes and machicolations +* Pillars and crossbraces +* Roof slate +* Paving stone +* Dungeon stone + +Mod settings can allow for the basic castle masonry forms to be made for the following material types (all optional): + +* Cobble +* Desert stone +* Desert stone brick +* Sandstone +* Sandstone brick +* Stone +* Stone brick +* Castle wall +* Wood +* Snow +* Ice +* Obsidian Brick \ No newline at end of file diff --git a/castle_masonry/README.txt b/castle_masonry/README.txt deleted file mode 100644 index 98b129a..0000000 --- a/castle_masonry/README.txt +++ /dev/null @@ -1,43 +0,0 @@ -=-=-=-=-=-=-=-=-=-= - -Castles Mod -by: Philipbenr And DanDuncombe - -=-=-=-=-=-=-=-=-=-= - -Licence: MIT - -see: LICENSE - -=-=-=-=-=-=-=-=-=-= - -This is a mod all about creating castles and castle dungeons. Many of the nodes are used for the outer-walls or dungeons. - -=-=-=-=-=-=-=-=-=-= - -Contains: - ---Walls, Corner-walls, ---Castlestone Stairs, Slabs, and Pillars ---Arrowslits and embrasures ---Rubble (to fill the interior of thick castle walls) ---Murder holes and machicolations ---Pillars and crossbraces ---Roof slate ---Paving stone ---Dungeon stone - -Mod settings can allow for the basic castle masonry forms to be made for the following material types (all optional): - -Cobble -Desert stone -Desert stone brick -Sandstone -Sandstone brick -Stone -Stone brick -Castle wall -Wood -Snow -Ice -Obsidian Brick \ No newline at end of file diff --git a/castle_masonry/arrow_slits.lua b/castle_masonry/arrow_slits.lua index 188d7dd..61d10a9 100644 --- a/castle_masonry/arrow_slits.lua +++ b/castle_masonry/arrow_slits.lua @@ -163,4 +163,4 @@ castle_masonry.register_arrowslit_alias_force = function(old_mod_name, old_mater minetest.register_alias_force(old_mod_name..":arrowslit_"..old_material_name.."_cross", new_mod_name..":arrowslit_"..new_material_name.."_cross") minetest.register_alias_force(old_mod_name..":arrowslit_"..old_material_name.."_hole", new_mod_name..":arrowslit_"..new_material_name.."_hole") minetest.register_alias_force(old_mod_name..":arrowslit_"..old_material_name.."_embrasure", new_mod_name..":arrowslit_"..new_material_name.."_embrasure") -end \ No newline at end of file +end diff --git a/castle_masonry/depends.txt b/castle_masonry/depends.txt index 206a637..7c6d7fb 100644 --- a/castle_masonry/depends.txt +++ b/castle_masonry/depends.txt @@ -3,4 +3,5 @@ moreblocks? stairs? building_blocks? asphalt? -streets? \ No newline at end of file +streets? +intllib? diff --git a/castle_masonry/init.lua b/castle_masonry/init.lua index 0d23922..741d6aa 100644 --- a/castle_masonry/init.lua +++ b/castle_masonry/init.lua @@ -10,7 +10,7 @@ dofile(MP.."/paving.lua") local S, NS = dofile(MP.."/intllib.lua") local read_setting = function(name, default) - local setting = minetest.setting_getbool(name) + local setting = minetest.settings:get_bool(name) if setting == nil then return default end return setting end @@ -26,7 +26,7 @@ end castle_masonry.materials = {} if read_setting("castle_masonry_stonewall", true) then - table.insert(castle_masonry.materials, {name="stonewall", desc=S("Stonewall"), tile="castle_stonewall.png", craft_material="castle:stonewall"}) + table.insert(castle_masonry.materials, {name="stonewall", desc=S("Stonewall"), tile="castle_stonewall.png", craft_material="castle_masonry:stonewall"}) end if read_setting("castle_masonry_cobble", true) then table.insert(castle_masonry.materials, {name="cobble", desc=S("Cobble"), tile="default_cobble.png", craft_material="default:cobble"}) @@ -72,7 +72,7 @@ castle_masonry.get_material_properties = function(material) composition_def = minetest.registered_nodes[material.craft_material] burn_time = minetest.get_craft_result({method="fuel", width=1, items={ItemStack(material.craft_materia)}}).time end - + local tiles = material.tile if tiles == nil then tiles = composition_def.tile @@ -84,7 +84,7 @@ castle_masonry.get_material_properties = function(material) if desc == nil then desc = composition_def.description end - + return composition_def, burn_time, tiles, desc end @@ -117,7 +117,7 @@ minetest.register_alias("castle:arrowslit_cross", "castle_masonry:arrowslit_ston for _, material in pairs(castle_masonry.materials) do castle_masonry.register_murderhole_alias("castle", material.name, "castle_masonry", material.name) castle_masonry.register_pillar_alias("castle", material.name, "castle_masonry", material.name) - + -- Arrowslit upgrade has special handling because the castle mod arrow slit is reversed relative to current build-from-inside standard local lbm_def = { name = "castle_masonry:arrowslit_flip_front_to_back"..material.name, @@ -134,4 +134,4 @@ for _, material in pairs(castle_masonry.materials) do end } minetest.register_lbm(lbm_def) -end \ No newline at end of file +end diff --git a/castle_masonry/locale/es.po b/castle_masonry/locale/es.po new file mode 100644 index 0000000..6c1ebc1 --- /dev/null +++ b/castle_masonry/locale/es.po @@ -0,0 +1,189 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-21 23:41-0700\n" +"PO-Revision-Date: 2017-04-28 15:23-0400\n" +"Last-Translator: Carlos Barraza\n" +"Language-Team: Español\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: arrow_slits.lua:12 +msgid "@1 Arrowslit" +msgstr "Aspillera de @1" + +#: arrow_slits.lua:33 +msgid "@1 Arrowslit with Cross" +msgstr "Aspillera con Crus de @1" + +#: arrow_slits.lua:58 +msgid "@1 Arrowslit with Hole" +msgstr "Aspillera con Agujero de @1" + +#: arrow_slits.lua:81 +msgid "@1 Embrasure" +msgstr "Aféizar de @1 " + +#: init.lua:29 +msgid "Stonewall" +msgstr "Pared de piedra" + +#: init.lua:32 +msgid "Cobble" +msgstr "Adoquín" + +#: init.lua:35 +msgid "Stonebrick" +msgstr "Ladrillo de Piedra" + +#: init.lua:38 +msgid "Sandstone Brick" +msgstr "Ladrillo de Arenisca" + +#: init.lua:41 +msgid "Desert Stone Brick" +msgstr "Ladrillo de Piedra del Desierto" + +#: init.lua:44 +msgid "Stone" +msgstr "Piedra" + +#: init.lua:47 +msgid "Sandstone" +msgstr "Arenisca" + +#: init.lua:50 +msgid "Desert Stone" +msgstr "Piedra del Desierto" + +#: init.lua:53 +msgid "Wood" +msgstr "Madera" + +#: init.lua:56 +msgid "Ice" +msgstr "Hielo" + +#: init.lua:59 +msgid "Snow" +msgstr "Nieve" + +#: init.lua:62 +msgid "Obsidian Brick" +msgstr "Ladrillo de Obsidiana" + +#: murder_holes.lua:14 +msgid "@1 Murder Hole" +msgstr "Agujero de @1" + +#: murder_holes.lua:33 +msgid "@1 Machicolation" +msgstr "Matacán de @1" + +#: paving.lua:11 +msgid "Paving Stone" +msgstr "Piedra Pavimentada" + +#: paving.lua:30 +msgid "Pavement Brick" +msgstr "Ladrillo Pavimentado" + +#: paving.lua:40 +msgid "Castle Pavement Stair" +msgstr "Escalera de Castillo Pavimentada" + +#: paving.lua:41 +msgid "Castle Pavement Slab" +msgstr "Pavimento de Castillo" + +#: paving.lua:49 +msgid "Roof Slates" +msgstr "Pizarras de Techo" + +#: pillars.lua:18 +msgid "@1 Pillar Base" +msgstr "Base de Pilar de @1" + +#: pillars.lua:36 +msgid "@1 Half Pillar Base" +msgstr "Base de Medio Pilar de @1" + +#: pillars.lua:54 +msgid "@1 Pillar Top" +msgstr "Parte Superior de Pilar de @1" + +#: pillars.lua:72 +msgid "@1 Half Pillar Top" +msgstr "Parte Superior de Medio Pilar @1" + +#: pillars.lua:90 +msgid "@1 Pillar Middle" +msgstr "Medio Pilar de @1" + +#: pillars.lua:106 +msgid "@1 Half Pillar Middle" +msgstr "Medio del Medio Pilar de @1" + +#: pillars.lua:123 +msgid "@1 Crossbrace" +msgstr "Viga de @1" + +#: pillars.lua:147 +msgid "@1 Extended Crossbrace" +msgstr "Viga Extendida de @1" + +#: stone_wall.lua:11 +msgid "Castle Wall" +msgstr "Pared de Castillo" + +#: stone_wall.lua:22 +msgid "Castle Rubble" +msgstr "Escombros de Castillo" + +#: stone_wall.lua:57 +msgid "Castle Corner" +msgstr "Esquina de Castillo" + +#: stone_wall.lua:78 +msgid "Stone Wall" +msgstr "Pared de Piedra" + +#: stone_wall.lua:86 +msgid "Rubble" +msgstr "Escombros" + +#: stone_wall.lua:100 +msgid "Castle Stonewall Stair" +msgstr "Escalera de Pared de Castillo" + +#: stone_wall.lua:101 +msgid "Castle Stonewall Slab" +msgstr "Losa de Pared de Castillo" + +#: stone_wall.lua:108 +msgid "Castle Rubble Stair" +msgstr "Escalera de Escombro de Castillo" + +#: stone_wall.lua:109 +msgid "Castle Rubble Slab" +msgstr "Losa de Escombro de Castillo" + +#: stone_wall.lua:117 stone_wall.lua:143 +msgid "Dungeon Stone" +msgstr "Piedra de Mazmorra" + +#: stone_wall.lua:156 +msgid "Dungeon Stone Stair" +msgstr "Escalera de Piedra de Mazmorra" + +#: stone_wall.lua:157 +msgid "Dungeon Stone Slab" +msgstr "Losa de Piedra de Mazmorra" diff --git a/castle_masonry/locale/fr.po b/castle_masonry/locale/fr.po new file mode 100644 index 0000000..5a73d18 --- /dev/null +++ b/castle_masonry/locale/fr.po @@ -0,0 +1,189 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-21 23:41-0700\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: arrow_slits.lua:12 +msgid "@1 Arrowslit" +msgstr "Meurtrière en @1" + +#: arrow_slits.lua:33 +msgid "@1 Arrowslit with Cross" +msgstr "Meurtrière en croix en @1" + +#: arrow_slits.lua:58 +msgid "@1 Arrowslit with Hole" +msgstr "Meurtrière avec trou en @1" + +#: arrow_slits.lua:81 +msgid "@1 Embrasure" +msgstr "Embrasure en @1" + +#: init.lua:29 +msgid "Stonewall" +msgstr "Pierre brune" + +#: init.lua:32 +msgid "Cobble" +msgstr "Pavé" + +#: init.lua:35 +msgid "Stonebrick" +msgstr "Brique de pierre" + +#: init.lua:38 +msgid "Sandstone Brick" +msgstr "Brique de grès" + +#: init.lua:41 +msgid "Desert Stone Brick" +msgstr "Brique de pierre du désert" + +#: init.lua:44 +msgid "Stone" +msgstr "Pierre" + +#: init.lua:47 +msgid "Sandstone" +msgstr "Grès" + +#: init.lua:50 +msgid "Desert Stone" +msgstr "Pierre du désert" + +#: init.lua:53 +msgid "Wood" +msgstr "Bois" + +#: init.lua:56 +msgid "Ice" +msgstr "Glace" + +#: init.lua:59 +msgid "Snow" +msgstr "Neige" + +#: init.lua:62 +msgid "Obsidian Brick" +msgstr "Brique d'obsidienne" + +#: murder_holes.lua:14 +msgid "@1 Murder Hole" +msgstr "Trou en @1" + +#: murder_holes.lua:33 +msgid "@1 Machicolation" +msgstr "Machicoulis en @1" + +#: paving.lua:11 +msgid "Paving Stone" +msgstr "Pierre de pavage" + +#: paving.lua:30 +msgid "Pavement Brick" +msgstr "Brique de pavage" + +#: paving.lua:40 +msgid "Castle Pavement Stair" +msgstr "Escaliers de chateau pavé" + +#: paving.lua:41 +msgid "Castle Pavement Slab" +msgstr "Dalle de chateau pavé" + +#: paving.lua:49 +msgid "Roof Slates" +msgstr "Toiture en ardoise" + +#: pillars.lua:18 +msgid "@1 Pillar Base" +msgstr "Base de pilier en @1" + +#: pillars.lua:36 +msgid "@1 Half Pillar Base" +msgstr "Base de demi pilier en @1" + +#: pillars.lua:54 +msgid "@1 Pillar Top" +msgstr "Haut de pilier en @1" + +#: pillars.lua:72 +msgid "@1 Half Pillar Top" +msgstr "Haut de demi pilier en @1" + +#: pillars.lua:90 +msgid "@1 Pillar Middle" +msgstr "Milieu de pilier en @1" + +#: pillars.lua:106 +msgid "@1 Half Pillar Middle" +msgstr "Milieu de demi pilier en @1" + +#: pillars.lua:123 +msgid "@1 Crossbrace" +msgstr "Travers en @1" + +#: pillars.lua:147 +msgid "@1 Extended Crossbrace" +msgstr "Travers entendu en @1" + +#: stone_wall.lua:11 +msgid "Castle Wall" +msgstr "Pierre brune" + +#: stone_wall.lua:22 +msgid "Castle Rubble" +msgstr "Gravats de chateau" + +#: stone_wall.lua:57 +msgid "Castle Corner" +msgstr "Angle de chateau" + +#: stone_wall.lua:78 +msgid "Stone Wall" +msgstr "Mur de pierre" + +#: stone_wall.lua:86 +msgid "Rubble" +msgstr "Décombre" + +#: stone_wall.lua:100 +msgid "Castle Stonewall Stair" +msgstr "Escalier en pierre brune" + +#: stone_wall.lua:101 +msgid "Castle Stonewall Slab" +msgstr "Dalle en pierre brune" + +#: stone_wall.lua:108 +msgid "Castle Rubble Stair" +msgstr "Escalier en gravats de chateau" + +#: stone_wall.lua:109 +msgid "Castle Rubble Slab" +msgstr "Dalle en gravats de chateau" + +#: stone_wall.lua:117 stone_wall.lua:143 +msgid "Dungeon Stone" +msgstr "Pierre de dongeon" + +#: stone_wall.lua:156 +msgid "Dungeon Stone Stair" +msgstr "Escalier en pierre de dongeon" + +#: stone_wall.lua:157 +msgid "Dungeon Stone Slab" +msgstr "Dalle en pierre de dongeon" diff --git a/castle_masonry/locale/it.po b/castle_masonry/locale/it.po new file mode 100644 index 0000000..3b71932 --- /dev/null +++ b/castle_masonry/locale/it.po @@ -0,0 +1,191 @@ +# ITALIAN LOCALE FILE FOR THE CASTLE MASONRY MODULE +# Copyright (C) 2017 Philipbenr And DanDuncombe +# This file is distributed under the same license as the CASTLE MASONRY package. +# Hamlet , 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: Castle Masonry\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-21 23:41-0700\n" +"PO-Revision-Date: 2017-09-10 22:36+0100\n" +"Last-Translator: H4mlet \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: it\n" +"X-Generator: Poedit 1.6.10\n" + +#: arrow_slits.lua:12 +msgid "@1 Arrowslit" +msgstr "Feritoia per frecce di @1" + +#: arrow_slits.lua:33 +msgid "@1 Arrowslit with Cross" +msgstr "Feritoia a croce per frecce di @1" + +#: arrow_slits.lua:58 +msgid "@1 Arrowslit with Hole" +msgstr "Feritoia a foro per frecce di @1" + +#: arrow_slits.lua:81 +msgid "@1 Embrasure" +msgstr "Feritoia di @1" + +#: init.lua:29 +msgid "Stonewall" +msgstr "muro di pietra" + +#: init.lua:32 +msgid "Cobble" +msgstr "ciottoli" + +#: init.lua:35 +msgid "Stonebrick" +msgstr "mattoni di pietra" + +#: init.lua:38 +msgid "Sandstone Brick" +msgstr "mattoni di arenaria del deserto" + +#: init.lua:41 +msgid "Desert Stone Brick" +msgstr "mattoni di pietra del deserto" + +#: init.lua:44 +msgid "Stone" +msgstr "pietra" + +#: init.lua:47 +msgid "Sandstone" +msgstr "arenaria" + +#: init.lua:50 +msgid "Desert Stone" +msgstr "pietra del deserto" + +#: init.lua:53 +msgid "Wood" +msgstr "legno" + +#: init.lua:56 +msgid "Ice" +msgstr "ghiaccio" + +#: init.lua:59 +msgid "Snow" +msgstr "neve" + +#: init.lua:62 +msgid "Obsidian Brick" +msgstr "mattoni di ossidiana" + +#: murder_holes.lua:14 +msgid "@1 Murder Hole" +msgstr "Buca assassina di @1" + +#: murder_holes.lua:33 +msgid "@1 Machicolation" +msgstr "Caditoia di @1" + +#: paving.lua:11 +msgid "Paving Stone" +msgstr "Pietra pavimentale" + +#: paving.lua:30 +msgid "Pavement Brick" +msgstr "Mattoni pavimentali" + +#: paving.lua:40 +msgid "Castle Pavement Stair" +msgstr "Scala pavimentale del castello" + +#: paving.lua:41 +msgid "Castle Pavement Slab" +msgstr "Lastra pavimentale del castello" + +#: paving.lua:49 +msgid "Roof Slates" +msgstr "Tegole di ardesia" + +#: pillars.lua:18 +msgid "@1 Pillar Base" +msgstr "Base della colonna di @1" + +#: pillars.lua:36 +msgid "@1 Half Pillar Base" +msgstr "Mezza base della colonna di @1" + +#: pillars.lua:54 +msgid "@1 Pillar Top" +msgstr "Capitello di @1" + +#: pillars.lua:72 +msgid "@1 Half Pillar Top" +msgstr "Mezzo capitello di @1" + +#: pillars.lua:90 +msgid "@1 Pillar Middle" +msgstr "Fusto della colonna di @1" + +#: pillars.lua:106 +msgid "@1 Half Pillar Middle" +msgstr "Mezzo fusto della colonna di @1" + +#: pillars.lua:123 +msgid "@1 Crossbrace" +msgstr "Costolone di @1" + +#: pillars.lua:147 +msgid "@1 Extended Crossbrace" +msgstr "Costolone esteso di @1" + +#: stone_wall.lua:11 +msgid "Castle Wall" +msgstr "Muro del castello" + +#: stone_wall.lua:22 +msgid "Castle Rubble" +msgstr "Detriti del castello" + +#: stone_wall.lua:57 +msgid "Castle Corner" +msgstr "Angolo del castello" + +#: stone_wall.lua:78 +msgid "Stone Wall" +msgstr "Muro di pietra" + +#: stone_wall.lua:86 +msgid "Rubble" +msgstr "Detriti" + +#: stone_wall.lua:100 +msgid "Castle Stonewall Stair" +msgstr "Scala del castello in muro di pietra" + +#: stone_wall.lua:101 +msgid "Castle Stonewall Slab" +msgstr "Lastra del castello in muro di pietra" + +#: stone_wall.lua:108 +msgid "Castle Rubble Stair" +msgstr "Scala del castello in detriti" + +#: stone_wall.lua:109 +msgid "Castle Rubble Slab" +msgstr "Lastra del castello in detriti" + +#: stone_wall.lua:117 stone_wall.lua:143 +msgid "Dungeon Stone" +msgstr "Pietra del sotterraneo" + +#: stone_wall.lua:156 +msgid "Dungeon Stone Stair" +msgstr "Scala di pietra del sotterraneo" + +#: stone_wall.lua:157 +msgid "Dungeon Stone Slab" +msgstr "Lastra di pietra del sotterraneo" diff --git a/castle_masonry/pillars.lua b/castle_masonry/pillars.lua index 96d76a3..082f82e 100644 --- a/castle_masonry/pillars.lua +++ b/castle_masonry/pillars.lua @@ -173,11 +173,11 @@ castle_masonry.register_pillar = function(material) }) minetest.register_craft({ - output = mod_name..":pillar_"..material.name.."_middle 4", + output = mod_name..":pillar_"..material.name.."_middle 2", recipe = { - {material.craft_material,material.craft_material}, - {material.craft_material,material.craft_material}, - {material.craft_material,material.craft_material} }, + {material.craft_material}, + {material.craft_material}, + {material.craft_material} }, }) minetest.register_craft({ -- cgit v1.2.3