From 15f2960e34e4395287ab783b560883ad45a4b866 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 3 Jun 2020 19:57:04 +0200 Subject: [PATCH] Remove legacy village schematic --- mods/MAPGEN/mcl_structures/init.lua | 19 +++--------------- .../locale/mcl_structures.de.tr | 1 - .../locale/mcl_structures.es.tr | 1 - .../locale/mcl_structures.fr.tr | 1 - .../schematics/mcl_structures_village.mts | Bin 3473 -> 0 bytes 5 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 mods/MAPGEN/mcl_structures/schematics/mcl_structures_village.mts diff --git a/mods/MAPGEN/mcl_structures/init.lua b/mods/MAPGEN/mcl_structures/init.lua index 083f9539e..f59fc6dd9 100644 --- a/mods/MAPGEN/mcl_structures/init.lua +++ b/mods/MAPGEN/mcl_structures/init.lua @@ -36,9 +36,7 @@ mcl_structures.call_struct = function(pos, struct_style, rotation) if not rotation then rotation = "random" end - if struct_style == "village" then - return mcl_structures.generate_village(pos, rotation) - elseif struct_style == "desert_temple" then + if struct_style == "desert_temple" then return mcl_structures.generate_desert_temple(pos, rotation) elseif struct_style == "desert_well" then return mcl_structures.generate_desert_well(pos, rotation) @@ -61,14 +59,6 @@ mcl_structures.call_struct = function(pos, struct_style, rotation) end end -mcl_structures.generate_village = function(pos) - -- No generating for the moment, only place it :D - -- TODO: Do complete overhaul of the algorithm - local newpos = {x=pos.x,y=pos.y-1,z=pos.z} - local path = minetest.get_modpath("mcl_structures").."/schematics/mcl_structures_village.mts" - return minetest.place_schematic(newpos, path, "random", nil, true) -end - mcl_structures.generate_desert_well = function(pos) local newpos = {x=pos.x,y=pos.y-2,z=pos.z} local path = minetest.get_modpath("mcl_structures").."/schematics/mcl_structures_desert_well.mts" @@ -482,7 +472,7 @@ end -- Debug command minetest.register_chatcommand("spawnstruct", { - params = "desert_temple | desert_well | igloo | village | witch_hut | boulder | ice_spike_small | ice_spike_large | fossil | end_exit_portal | end_portal_shrine", + params = "desert_temple | desert_well | igloo | witch_hut | boulder | ice_spike_small | ice_spike_large | fossil | end_exit_portal | end_portal_shrine", description = S("Generate a pre-defined structure near your position."), privs = {debug = true}, func = function(name, param) @@ -493,10 +483,7 @@ minetest.register_chatcommand("spawnstruct", { pos = vector.round(pos) local errord = false local message = S("Structure placed.") - if param == "village" then - mcl_structures.generate_village(pos) - message = S("Village built. WARNING: Villages are experimental and might have bugs.") - elseif param == "desert_temple" then + if param == "desert_temple" then mcl_structures.generate_desert_temple(pos) elseif param == "desert_well" then mcl_structures.generate_desert_well(pos) diff --git a/mods/MAPGEN/mcl_structures/locale/mcl_structures.de.tr b/mods/MAPGEN/mcl_structures/locale/mcl_structures.de.tr index e701b7879..3245b934c 100644 --- a/mods/MAPGEN/mcl_structures/locale/mcl_structures.de.tr +++ b/mods/MAPGEN/mcl_structures/locale/mcl_structures.de.tr @@ -1,7 +1,6 @@ # textdomain: mcl_structures Generate a pre-defined structure near your position.=Erzeugt ein vordefiniertes Gebäude in Ihrer Nähe. Structure placed.=Gebäude platziert. -Village built. WARNING: Villages are experimental and might have bugs.=Dorf gebaut. ACHTUNG: Dörfer sind experimentell und können fehlerhaft sein. Error: No structure type given. Please use “/spawnstruct ”.=Fehler: Kein Gebäudetyp angegeben. Bitte benutzen Sie „/spawnstruct “. Error: Unknown structure type. Please use “/spawnstruct ”.=Fehler: Unbekannter Gebäudetyp. Bitte benutzen Sie „/spawnstruct “. Use /help spawnstruct to see a list of avaiable types.=Benutzen Sie „/help spawnstruct“, um eine Liste der vorhandenen Typen zu sehen. diff --git a/mods/MAPGEN/mcl_structures/locale/mcl_structures.es.tr b/mods/MAPGEN/mcl_structures/locale/mcl_structures.es.tr index ae909b9c4..d73d81466 100644 --- a/mods/MAPGEN/mcl_structures/locale/mcl_structures.es.tr +++ b/mods/MAPGEN/mcl_structures/locale/mcl_structures.es.tr @@ -1,7 +1,6 @@ # textdomain: mcl_structures Generate a pre-defined structure near your position.=Genere una estructura predefinida cerca de su posición. Structure placed.=Estructura colocada. -Village built. WARNING: Villages are experimental and might have bugs.=Pueblo construido. ADVERTENCIA: los pueblos son experimentales y pueden tener errores. Error: No structure type given. Please use “/spawnstruct ”.=Error: no se especifica ningún tipo de estructura. Utilice "/spawnstruct ". Error: Unknown structure type. Please use “/spawnstruct ”.=Error: tipo de estructura desconocido. Utilice "/spawnstruct ". Use /help spawnstruct to see a list of avaiable types.=Utiliza "/help spawnstruct" para ver una lista de los tipos disponibles. diff --git a/mods/MAPGEN/mcl_structures/locale/mcl_structures.fr.tr b/mods/MAPGEN/mcl_structures/locale/mcl_structures.fr.tr index 7c1ba2723..74f5282ef 100644 --- a/mods/MAPGEN/mcl_structures/locale/mcl_structures.fr.tr +++ b/mods/MAPGEN/mcl_structures/locale/mcl_structures.fr.tr @@ -1,7 +1,6 @@ # textdomain: mcl_structures Generate a pre-defined structure near your position.=Générez une structure prédéfinie près de votre position. Structure placed.=Structure placée. -Village built. WARNING: Villages are experimental and might have bugs.=Village construit. AVERTISSEMENT: les villages sont expérimentaux et peuvent avoir des bugs. Error: No structure type given. Please use “/spawnstruct ”.=Erreur: Aucun type de structure indiqué. Veuillez utiliser "/spawnstruct ". Error: Unknown structure type. Please use “/spawnstruct ”.=Erreur: Type de structure inconnu. Veuillez utiliser "/spawnstruct ". Use /help spawnstruct to see a list of avaiable types.=Utilisez /help spawnstruct pour voir une liste des types disponibles. diff --git a/mods/MAPGEN/mcl_structures/schematics/mcl_structures_village.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_village.mts deleted file mode 100644 index cda9bbba994a4c133cd90374a428b22d8db27fa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3473 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