diff --git a/infimap.p8 b/infimap.p8 index 808b76a..d583fe5 100644 --- a/infimap.p8 +++ b/infimap.p8 @@ -7,14 +7,22 @@ __lua__ #include player.lua #include main.lua __gfx__ -000000000000000033333333335555333344443338333333333333e3383333833333333399999999999899999994999499999999999999990000000000000000 -00000000000000003333333335554553344444438a833383333e3e9e888338883333333399999999998a89999499949999999999999999990000000000000000 -0070070000000000333333335555555534444443383338a833e9e3e33733337333333333999999999998b9b99949994999944999999bb9b90000000000000000 -000770000000000033333333554554553344443333333383333e33333333333333378333999999999b9bb9b999994999994444999b9bb9b90000000000000000 -000770000000000033333333555555553335533333338333333333333333383333888733999999999b9bbbb999499994944444499b9bbbb90000000000000000 -00700700000000003333333355545555333553333338a8333e333e333333888338788883999999999bbbb99999994999944444499bbbb9990000000000000000 -000000000000000033333333355555533335533333338333e9e3e9e3333337333337733399999999999bb9999499994999444499999bb9990000000000000000 -0000000000000000333333333355553333555533333333333e333e33333333333337733399999999999bb9999999999999944999999bb9990000000000000000 +000000000000000033333333335555333344443338333333333333e3383333833333333399999999999899999994999499999999999999993333333399999999 +00000000000000003333333335554553344444438a833383333e3e9e888338883333333399999999998a89999499949999999999999999993333333399999999 +0070070000000000333333335555555534444443383338a833e9e3e33733337333333333999999999998b9b99949994999944999999bb9b93333333399999999 +000770000000000033333333554554553344443333333383333e33333333333333378333999999999b9bb9b999994999994444999b9bb9b93333333399999999 +000770000000000033333333555555553335533333338333333333333333383333888733999999999b9bbbb999499994944444499b9bbbb93333333399999999 +00700700000000003333333355545555333553333338a8333e333e333333888338788883999999999bbbb99999994999944444499bbbb99933355333999bb999 +000000000000000033333333355555533335533333338333e9e3e9e3333337333337733399999999999bb9999499994999444499999bb99933355333999bb999 +0000000000000000333333333355553333555533333333333e333e33333333333337733399999999999bb9999999999999944999999bb99933555533999bb999 +3333333333555533b333333300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +3333333335555553b333b3b300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +333333335555555533b3b3b300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +333333335555555533b3333300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +3333333355555555b3333b3300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +3333333355555555b33b3b3300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +33377333355555533b3b33b300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +33377333335555333b3333b300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 @@ -55,22 +63,14 @@ __gfx__ 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000880000002200000022000000220000002200007777000000777700000000000000000 -00000000000000000000000000000000000000000000000000000000000880000022220000244200000420000002400070000000000000070000000000000000 -00000000000000000000000000000000000000000000000000000000000880000022220000244200000422000022400070000000000000070000000000000000 -00000000000000000000000000000000000000000000000000000000000880000288882002888820000880000008800070000000000000077000000000000007 -00000000000000000000000000000000000000000000000000000000000880000048840000488400000480000008400070000000000000077000000000000007 -00000000000000000000000000000000000000000000000000000000000000000048840000488400000480000008400000000000000000007000000000000007 -00000000000000000000000000000000000000000000000000000000000880000008800000088000000880000008800000000000000000007000000000000007 -00000000000000000000000000000000000000000000000000000000000880000001100000011000001100000000110000000000000000000777700000077770 +00000000000000000000000000000000000000000000000000000000000880000002200000022000000220000002200000022000000220000002200000022000 +00000000000000000000000000000000000000000000000000000000000880000022220000244200000420000002400000222200002222000024420000244200 +00000000000000000000000000000000000000000000000000000000000880000022220000244200000422000022400000222200002222000024420000244200 +00000000000000000000000000000000000000000000000000000000000880000288882002888820000880000008800002888820028888200288882002888820 +00000000000000000000000000000000000000000000000000000000000880000048840000488400000480000008400000488400004884000048840000488400 +00000000000000000000000000000000000000000000000000000000000000000048840000488400000480000008400000488400004884000048840000488400 +00000000000000000000000000000000000000000000000000000000000880000008800000088000000880000008800000088000000880000008800000088000 +00000000000000000000000000000000000000000000000000000000000880000001100000011000001100000000110000011000000110000001100000011000 __gff__ 0000000303000000020003000103000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/mapgen.lua b/mapgen.lua index f04f8fb..b24126f 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -4,20 +4,25 @@ function init_mapgen() uid_seed = 2229 -- arbitrarily chosen number -- Metadata for different biomes - -- frequencies don't have to add up to 100, but they should by convention -- tile_frequencies tuples are {frequency, sprite_index}, see index_map.md + -- frequencies by convention add up to 1000, but this is arbitrary, the + -- only concern is the space consumed by the resulting tables. biome_data = { + meadow = { + biome_frequency = 20, + tile_frequencies = { {525, 2}, {200, 5}, {200, 6}, {55, 18}, {19, 3}, {1, 4} } + }, grassland = { - biome_frequency = 75, - tile_frequencies = { {40, 2}, {28, 5}, {28, 6}, {3, 3}, {1, 4} } + biome_frequency = 55, + tile_frequencies = { {500, 2}, {345, 18}, {4, 3}, {1, 4}, {100, 5}, {50, 6} } }, forest = { biome_frequency = 20, - tile_frequencies = { {60, 2}, {20, 4}, {5, 3}, {5, 5}, {4, 7}, {5, 6}, {1, 8} } + tile_frequencies = { {600, 2}, {200, 4}, {50, 3}, {50, 5}, {40, 7}, {59, 6}, {1, 8} } }, desert = { biome_frequency = 5, - tile_frequencies = { {80, 9}, {10, 11}, {6, 13}, {3, 12}, {1, 10} }, + tile_frequencies = { {800, 9}, {109, 11}, {60, 13}, {30, 12}, {1, 10} }, } } @@ -25,7 +30,7 @@ function init_mapgen() -- Lua's pairs() function appears not to guarantee a consistent return order, -- and we want our world to be deterministically generated, -- so the biome_metadata array needs to have its entries appear consistently. - biome_list = {"grassland", "forest", "desert"} + biome_list = {"grassland", "meadow", "forest", "desert"} -- this is the frequency list for the biomes themselves biome_metadata = {}