had to change namegen's name to avoid a collision on ContentDB

master
FaceDeer 2020-11-22 16:28:34 -07:00
parent f591cb5076
commit cc671688c5
12 changed files with 30 additions and 30 deletions

View File

@ -112,8 +112,8 @@ local desert_settlements = {
},
generate_name = function(pos)
if minetest.get_modpath("namegen") then
return namegen.generate("desert_settlement")
if minetest.get_modpath("name_generator") then
return name_generator.generate("desert_settlement")
end
return S("Desert settlement")
end,
@ -121,8 +121,8 @@ local desert_settlements = {
generate_book = generate_book,
}
if minetest.get_modpath("namegen") then
namegen.parse_lines(io.lines(modpath.."/namegen_desert.cfg"))
if minetest.get_modpath("name_generator") then
name_generator.parse_lines(io.lines(modpath.."/namegen_desert.cfg"))
end
settlements.register_settlement("desert", desert_settlements)

View File

@ -1,4 +1,4 @@
name = settlements_desert
description = Adds small settlements to desert regions during map generation.
depends = settlements, default, stairs, doors, beds
optional_depends = namegen, commoditymarket_fantasy
optional_depends = name_generator, commoditymarket_fantasy

View File

@ -4,8 +4,8 @@ local S = minetest.get_translator(modname)
local schem_path = modpath.."/schematics/"
if minetest.get_modpath("namegen") then
namegen.parse_lines(io.lines(modpath.."/namegen_inuit.cfg"))
if minetest.get_modpath("name_generator") then
name_generator.parse_lines(io.lines(modpath.."/namegen_inuit.cfg"))
end
-- Node initialization
@ -59,8 +59,8 @@ local inuit_settlements = {
},
generate_name = function(pos)
if minetest.get_modpath("namegen") then
return namegen.generate("inuit_camps")
if minetest.get_modpath("name_generator") then
return name_generator.generate("inuit_camps")
end
return S("Inuit camp")
end,

View File

@ -1,4 +1,4 @@
name = settlements_igloo
description = Adds small igloo settlements to map generation.
depends = settlements, default, stairs, beds
optional_depends = namegen
optional_depends = name_generator

View File

@ -75,14 +75,14 @@ local jungle_settlements = {
},
generate_name = function(pos)
if minetest.get_modpath("namegen") then
return namegen.generate("jungle_camps")
if minetest.get_modpath("name_generator") then
return name_generator.generate("jungle_camps")
end
return S("Jungle settlement")
end,
}
if minetest.get_modpath("namegen") then
namegen.parse_lines(io.lines(modpath.."/namegen_jungle.cfg"))
if minetest.get_modpath("name_generator") then
name_generator.parse_lines(io.lines(modpath.."/namegen_jungle.cfg"))
end
settlements.register_settlement("jungle", jungle_settlements)

View File

@ -1,4 +1,4 @@
name = settlements_jungle
description = Adds small jungle settlements to map generation.
depends = settlements, default, stairs, doors, beds
optional_depends = namegen
optional_depends = name_generator

View File

@ -4,8 +4,8 @@ local S = minetest.get_translator(modname)
local schem_path = modpath.."/schematics/"
if minetest.get_modpath("namegen") then
namegen.parse_lines(io.lines(modpath.."/namegen_towns.cfg"))
if minetest.get_modpath("name_generator") then
name_generator.parse_lines(io.lines(modpath.."/namegen_towns.cfg"))
end
-------------------------------------
@ -250,8 +250,8 @@ local medieval_settlements = {
altitude_max = 300,
generate_name = function(pos)
if minetest.get_modpath("namegen") then
return namegen.generate("settlement_towns")
if minetest.get_modpath("name_generator") then
return name_generator.generate("settlement_towns")
end
return S("Town")
end,

View File

@ -1,4 +1,4 @@
name = settlements_medieval
description = Adds small medieval settlements to map generation.
depends = settlements, default, walls, stairs, xpanes, fire, vessels, farming, doors, beds
optional_depends = mobs_npc, namegen, commoditymarket_fantasy, bell
optional_depends = mobs_npc, name_generator, commoditymarket_fantasy, bell

View File

@ -54,14 +54,14 @@ local mer_settlements = {
},
generate_name = function(pos)
if minetest.get_modpath("namegen") then
return namegen.generate("mer_settlements")
if minetest.get_modpath("name_generator") then
return name_generator.generate("mer_settlements")
end
return S("Mer camp")
end,
}
if minetest.get_modpath("namegen") then
namegen.parse_lines(io.lines(modpath.."/namegen_mer.cfg"))
if minetest.get_modpath("name_generator") then
name_generator.parse_lines(io.lines(modpath.."/namegen_mer.cfg"))
end
settlements.register_settlement("mer", mer_settlements)

View File

@ -1,4 +1,4 @@
name = settlements_mer
description = Adds small underwater coral settlements to map generation.
depends = settlements, default
optional_depends = namegen
optional_depends = name_generator

View File

@ -53,15 +53,15 @@ local ruin_settlements = {
},
generate_name = function(pos)
if minetest.get_modpath("namegen") then
return namegen.generate("ruin_settlement")
if minetest.get_modpath("name_generator") then
return name_generator.generate("ruin_settlement")
end
return S("Ruins")
end,
}
if minetest.get_modpath("namegen") then
namegen.parse_lines(io.lines(modpath.."/namegen_ruins.cfg"))
if minetest.get_modpath("name_generator") then
name_generator.parse_lines(io.lines(modpath.."/namegen_ruins.cfg"))
end
settlements.register_settlement("ruins", ruin_settlements)

View File

@ -1,4 +1,4 @@
name = settlements_ruins
description = Adds small ruined settlements to tundra map generation.
depends = settlements, default, stairs
optional_depends = namegen, commoditymarket_fantasy
optional_depends = name_generator, commoditymarket_fantasy