diff --git a/buildings.lua b/buildings.lua index 760e6bc..759277c 100644 --- a/buildings.lua +++ b/buildings.lua @@ -11,6 +11,7 @@ mg_villages.village_sizes = { logcabin = { min = 15, max = 30, space_between_buildings=1, texture = 'default_wood.png'}, canadian = { min = 40, max = 110, space_between_buildings=1, texture = 'wool_white.png'}, grasshut = { min = 10, max = 40, space_between_buildings=1, texture = 'dryplants_reed.png'}, + tent = { min = 5, max = 20, space_between_buildings=2, texture = 'wool_white.png'}, } -- if set to true, the outer buildings in medieval villages will be fields; this is not very convincing yet @@ -107,18 +108,18 @@ mg_villages.BUILDINGS = { {scm="tree_place_9", yoff= 1, orients={0}, farming_plus=0, avoid='', typ='village_square', weight={medieval=1/12}, pervillage=1}, {scm="tree_place_10", yoff= 1, orients={0}, farming_plus=0, avoid='', typ='village_square', weight={medieval=1/12}, pervillage=1}, - {scm="wagon_1", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_2", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_3", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_4", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_5", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_6", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_7", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_8", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_9", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_10", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_11", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, - {scm="wagon_12", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12}, axis=1}, + {scm="wagon_1", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_2", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_3", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_4", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_5", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_6", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_7", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_8", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_9", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_10", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_11", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, + {scm="wagon_12", yoff= 0, orients={0,1,2,3}, farming_plus=0, avoid='', typ='wagon', weight={medieval=1/12,tent=1/3}, axis=1}, {scm="bench_1", yoff= 0, orients={0,1,2}, farming_plus=0, avoid='', typ='bench', weight={medieval=1/12}}, {scm="bench_2", yoff= 0, orients={0,1,2}, farming_plus=0, avoid='', typ='bench', weight={medieval=1/12}}, @@ -226,6 +227,20 @@ mg_villages.BUILDINGS = { {scm="field_3", yoff=-2, orients={0,1,2,3}, farming_plus=0, avoid='', typ='field', weight={fields=1}}, {scm="field_4", yoff=-2, orients={0,1,2,3}, farming_plus=0, avoid='', typ='field', weight={fields=1}}, + {scm="tent_tiny_1", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1}}, + {scm="tent_tiny_2", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1}}, + {scm="tent_big_1", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1}}, + {scm="tent_big_2", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1}}, + {scm="tent_medium_1", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/2}}, + {scm="tent_medium_2", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/2}}, + {scm="tent_medium_3", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/2}}, + {scm="tent_medium_4", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/2}}, + {scm="tent_open_1", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, + {scm="tent_open_2", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, + {scm="tent_open_3", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, + {scm="tent_open_big_1", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, + {scm="tent_open_big_2", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, + {scm="tent_open_big_3", yoff=0, orients={3}, farming_plus=0, avoid='', typ='tent', weight={tent=1/5}}, } @@ -245,6 +260,7 @@ if( minetest.get_modpath("cottages")) then table.insert( mg_villages.village_types, 'lumberjack' ); table.insert( mg_villages.village_types, 'claytrader' ); table.insert( mg_villages.village_types, 'logcabin' ); + table.insert( mg_villages.village_types, 'tent' ); end if( minetest.get_modpath( 'hdb' ) and minetest.get_modpath( 'nbu' )) then diff --git a/replacements.lua b/replacements.lua index 219baea..144eabe 100644 --- a/replacements.lua +++ b/replacements.lua @@ -492,6 +492,23 @@ mg_villages.get_replacement_list = function( housetype, pr ) end + if( housetype == 'tent' ) then + table.insert( replacements, { "glasspanes:wool_pane", "cottages:wool_tent" }); + table.insert( replacements, { "default:gravel", "default:sand" }); + -- realtest needs diffrent fence posts and doors + if( mg_villages.realtest_trees ) then + local wood_type = mg_villages.replace_materials( replacements, pr, + {'default:wood'}, + {''}, + { 'default:wood' }, + 'default:wood'); + mg_villages.replace_tree_trunk( replacements, wood_type ); + mg_villages.replace_saplings( replacements, wood_type ); + end + return replacements; + end + + if( housetype == 'grasshut' ) then table.insert( replacements, {'moreblocks:fence_jungle_wood', 'default:fence' }); diff --git a/rotate.lua b/rotate.lua index 5ea86df..286a427 100644 --- a/rotate.lua +++ b/rotate.lua @@ -15,8 +15,8 @@ end -- accessd through mg_villages.mirror_facedir[ (rotation%2)+1 ][ facedir+1 ] mg_villages.mirror_facedir = {{ 2, 1, 0, 3, -- 0, 1, 2, 3 - 8, 5, 10, 7, -- 4, 5, 6, 7 - 4, 9, 6, 11, -- 8, 9,10,11 + 8, 9, 10, 11, -- 4, 5, 6, 7 + 4, 5, 6, 7, -- 8, 9,10,11 12, 13, 14, 15, --12,13,14,15 16, 17, 18, 19, --16,17,18,19 22, 21, 20, 23 --20,21,22,23 diff --git a/schems/tent_big_1.mts b/schems/tent_big_1.mts index e118416..9fe0c9b 100644 Binary files a/schems/tent_big_1.mts and b/schems/tent_big_1.mts differ diff --git a/schems/tent_big_2.mts b/schems/tent_big_2.mts index 346bae6..9683fd9 100644 Binary files a/schems/tent_big_2.mts and b/schems/tent_big_2.mts differ diff --git a/schems/tent_medium_1.mts b/schems/tent_medium_1.mts index a28b6ea..b31c19e 100644 Binary files a/schems/tent_medium_1.mts and b/schems/tent_medium_1.mts differ diff --git a/schems/tent_medium_2.mts b/schems/tent_medium_2.mts index efca9d6..711f38b 100644 Binary files a/schems/tent_medium_2.mts and b/schems/tent_medium_2.mts differ diff --git a/schems/tent_medium_3.mts b/schems/tent_medium_3.mts index 790b7dd..75d72b5 100644 Binary files a/schems/tent_medium_3.mts and b/schems/tent_medium_3.mts differ diff --git a/schems/tent_medium_4.mts b/schems/tent_medium_4.mts index bd78e87..9e3938f 100644 Binary files a/schems/tent_medium_4.mts and b/schems/tent_medium_4.mts differ diff --git a/schems/tent_open_1.mts b/schems/tent_open_1.mts index a10e442..03a2c57 100644 Binary files a/schems/tent_open_1.mts and b/schems/tent_open_1.mts differ diff --git a/schems/tent_open_2.mts b/schems/tent_open_2.mts index 2a56355..54e23d0 100644 Binary files a/schems/tent_open_2.mts and b/schems/tent_open_2.mts differ diff --git a/schems/tent_open_3.mts b/schems/tent_open_3.mts index 7ce23d7..55a1dd3 100644 Binary files a/schems/tent_open_3.mts and b/schems/tent_open_3.mts differ diff --git a/schems/tent_open_big_1.mts b/schems/tent_open_big_1.mts index 96860e3..0391e01 100644 Binary files a/schems/tent_open_big_1.mts and b/schems/tent_open_big_1.mts differ diff --git a/schems/tent_open_big_2.mts b/schems/tent_open_big_2.mts index 4d114f9..509a6f9 100644 Binary files a/schems/tent_open_big_2.mts and b/schems/tent_open_big_2.mts differ diff --git a/schems/tent_open_big_3.mts b/schems/tent_open_big_3.mts index f1c173b..2e752be 100644 Binary files a/schems/tent_open_big_3.mts and b/schems/tent_open_big_3.mts differ diff --git a/schems/tent_tiny_1.mts b/schems/tent_tiny_1.mts index 5d491b6..e3b5782 100644 Binary files a/schems/tent_tiny_1.mts and b/schems/tent_tiny_1.mts differ diff --git a/schems/tent_tiny_2.mts b/schems/tent_tiny_2.mts index e872675..f2c97c8 100644 Binary files a/schems/tent_tiny_2.mts and b/schems/tent_tiny_2.mts differ