moved map_gen.lua to map_gen/shared/generate.lua. Also fixed typo

map_gen/combined/borg_planet.lua

@@ -1,7 +1,7 @@
 --Author: MewMew
 -- !! ATTENTION !! 
 -- Use water only in starting area as map setting!!!
-require "map_genshared.perlin_noise"
+require "map_gen.shared.perlin_noise"
 
 wreck_item_pool = {}
 wreck_item_pool = {{name="iron-gear-wheel", count=32},{name="iron-plate", count=64},{name="rocket-control-unit", count=1},{name="rocket-fuel", count=7} ,{name="coal", count=8},{name="rocket-launcher", count=1},{name="rocket", count=32},{name="copper-cable", count=128},{name="land-mine", count=64},{name="railgun", count=1},{name="railgun-dart", count=128},{name="fast-inserter", count=8},{name="stack-filter-inserter", count=2},{name="belt-immunity-equipment", count=1},{name="fusion-reactor-equipment", count=1},{name="electric-engine-unit", count=8},{name="exoskeleton-equipment", count=1},{name="rocket-fuel", count=10},{name="used-up-uranium-fuel-cell", count=3},{name="uranium-fuel-cell", count=2},{name="power-armor", count=1},{name="modular-armor", count=1},{name="water-barrel", count=4},{name="sulfuric-acid-barrel", count=6},{name="crude-oil-barrel", count=8},{name="energy-shield-equipment", count=1},{name="explosive-rocket", count=32}}

map_gen/combined/borg_planet_v2.lua

@@ -1,7 +1,7 @@
 --Author: MewMew
 -- !! ATTENTION !!
 -- Use water only in starting area as map setting!!!
-require "map_genshared.perlin_noise"
+require "map_gen.shared.perlin_noise"
 local Thread = require "utils.Thread"
 
 wreck_item_pool = {}

map_gen/combined/dagobah_swamp.lua

@@ -2,7 +2,7 @@
 -- Threaded by Tris
 -- !! ATTENTION !!
 -- Use water only in starting area as map setting!!!
-require "map_genshared.perlin_noise"
+require "map_gen.shared.perlin_noise"
 local Thread = require "utils.Thread"
 	wreck_item_pool = {}
 	wreck_item_pool = {{name="iron-gear-wheel", count=32},{name="iron-plate", count=64},{name="rocket-control-unit", count=1} ,{name="coal", count=4},{name="rocket-launcher", count=1},{name="rocket", count=32},{name="copper-cable", count=128},{name="land-mine", count=64},{name="railgun", count=1},{name="railgun-dart", count=128},{name="fast-inserter", count=8},{name="stack-filter-inserter", count=2},{name="belt-immunity-equipment", count=1},{name="fusion-reactor-equipment", count=1},{name="electric-engine-unit", count=8},{name="exoskeleton-equipment", count=1},{name="rocket-fuel", count=10},{name="used-up-uranium-fuel-cell", count=3},{name="uranium-fuel-cell", count=2}}

map_gen/combined/island_resort.lua

@@ -1,5 +1,5 @@
 --Author: MewMew
-require "map_genshared.perlin_noise"
+require "map_gen.shared.perlin_noise"
 local Thread = require "utils.Thread"
 
 local radius = 129

map_gen/combined/red_planet_v2.lua

@@ -3,7 +3,7 @@
 -- !! ATTENTION !!
 -- Use water only in starting area as map setting!!!
 
-require "map_genshared.perlin_noise"
+require "map_gen.shared.perlin_noise"
 local Thread = require "utils.Thread"
 
 wreck_item_pool = {}

map_gen/ores/fluffy_rainbows.lua

@@ -1,6 +1,6 @@
 --Author: MewMew
 
-require "map_genshared.perlin_noise"
+require "map_gen.shared.perlin_noise"
 
 function run_combined_module(event)
   if not global.perlin_noise_seed then global.perlin_noise_seed = math.random(1000,1000000) end

map_gen/ores/harmonic_gen.lua

@@ -1,4 +1,4 @@
-require "map_genshared.perlin_noise"
+require "map_gen.shared.perlin_noise"
 
 -- list of {x, y, ore_type, size, richness, rng_seed}
 local ctrs = {

map_gen/ores/neko_crazy_ores.lua

@@ -1,4 +1,4 @@
-require "map_genshared.perlin_noise"
+require "map_gen.shared.perlin_noise"
 
 local random_ores = {"iron-ore","coal","copper-ore","stone","uranium-ore"}
 local random_dense = {1.15,0.8,1,0.9, 0.5}	--ore density reference

map_gen/ores/resource_clustertruck.lua

@@ -1,6 +1,6 @@
 --Author: MewMew
 
-require "map_genshared.perlin_noise"
+require "map_gen.shared.perlin_noise"
 
 function run_combined_module(event)
   if not global.resource_cluster_truck then global.resource_cluster_truck = 1 end

map_gen/presets/GoT.lua

@@ -1,7 +1,7 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.shared.generate"
+require "map_gen.combined.grilledham_map_gen.builders"
 map_gen_decoratives = true
-local pic = require "map_gendata.GoT"
+local pic = require "map_gen.data.GoT"
 local pic = decompress(pic)
 
 local shape = picture_builder(pic)

map_gen/presets/UK.lua

@@ -1,6 +1,6 @@
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.combined.grilledham_map_gen.builders"
 
-local pic = require "map_gendata.UK"
+local pic = require "map_gen.data.UK"
 local pic = decompress(pic)
 local map = picture_builder(pic)
 

map_gen/presets/antfarm.lua

@@ -1,7 +1,7 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.shared.generate"
+require "map_gen.combined.grilledham_map_gen.builders"
 
-local pic = require "map_gendata.antfarm"
+local pic = require "map_gen.data.antfarm"
 
 local scale_factor = 12
 local shape = picture_builder(pic.data, pic.width, pic.height)

map_gen/presets/biome_test.lua

@@ -1,8 +1,8 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
+require "map_gen.shared.generate"
 
 map_gen_decoratives = true
 
-local pic = require "map_gendata.biome_test"
+local pic = require "map_gen.data.biome_test"
 
 local shape = picture_builder(pic)
 

map_gen/presets/cage.lua

@@ -1,7 +1,7 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.shared.generate"
+require "map_gen.combined.grilledham_map_gen.builders"
 
-local pic = require "map_gendata.cage"
+local pic = require "map_gen.data.cage"
 
 local shape = picture_builder(pic.data, pic.width, pic.height)
 shape = translate(shape, 10, -96)

map_gen/presets/connected_dots.lua

@@ -1,5 +1,5 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.shared.generate"
+require "map_gen.combined.grilledham_map_gen.builders"
 
 local function no_resources(x, y, world_x, world_y, tile, entity)
     local surface = MAP_GEN_SURFACE

map_gen/presets/creation_of_adam.lua

@@ -1,7 +1,7 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.shared.generate"
+require "map_gen.combined.grilledham_map_gen.builders"
 
-local pic = require "map_gendata.creation_of_adam2"
+local pic = require "map_gen.data.creation_of_adam2"
 
 local scale_factor = 3
 local shape = picture_builder(pic.data, pic.width, pic.height)

map_gen/presets/goat.lua

@@ -1,7 +1,7 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.shared.generate"
+require "map_gen.combined.grilledham_map_gen.builders"
 
-local pic = require "map_gendata.goat"
+local pic = require "map_gen.data.goat"
 
 local shape = picture_builder(pic.data, pic.width, pic.height)
 shape = translate(shape, 10, -96)

map_gen/presets/lines_and_balls.lua

@@ -2,9 +2,9 @@ map_gen_decoratives = false -- Generate our own decoratives
 map_gen_rows_per_tick = 4 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
 
 -- Recommend to use map_gen, but map_gen_not_threaded may be useful for testing / debugging.
-require "map_gencombined.grilledham_map_gen.map_gen_not_threaded"
---require "map_gencombined.grilledham_map_gen.map_gen"
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.shared.generate_not_threaded"
+--require "map_gen.shared.generate"
+require "map_gen.combined.grilledham_map_gen.builders"
 
 local big_circle = circle_builder(150)
 local small_circle = circle_builder(140)

map_gen/presets/manhattan.lua

@@ -1,7 +1,7 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.shared.generate"
+require "map_gen.combined.grilledham_map_gen.builders"
 
-local pic = require "map_gendata.manhattan"
+local pic = require "map_gen.data.manhattan"
 
 local shape = picture_builder(pic.data, pic.width, pic.height)
 shape = translate(shape, 10, -96)

map_gen/presets/maori.lua

@@ -1,7 +1,7 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.shared.generate"
+require "map_gen.combined.grilledham_map_gen.builders"
 
-local pic = require "map_gendata.maori"
+local pic = require "map_gen.data.maori"
 
 local shape = picture_builder(pic.data, pic.width, pic.height)
 shape = translate(shape, 10, -96)

map_gen/presets/mobius_strip.lua

@@ -1,5 +1,5 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.shared.generate"
+require "map_gen.combined.grilledham_map_gen.builders"
 
 local inner_circle = invert(circle_builder(48))
 local outer_circle = circle_builder(64)

map_gen/presets/mona_lisa.lua

@@ -1,7 +1,7 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
-require "map_gencombined.grilledham_map_gen.builders"
+require "map_gen.shared.generate"
+require "map_gen.combined.grilledham_map_gen.builders"
 
-local pic = require "map_gendata.color_mona_lisa"
+local pic = require "map_gen.data.color_mona_lisa"
 
 local shape = picture_builder(pic.data, pic.width, pic.height)
 shape = translate(shape, 10, -96)

map_gen/presets/north_america.lua

@@ -1,6 +1,6 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
+require "map_gen.shared.generate"
 map_gen_decoratives = true
-local pic = require "map_gendata.north_america"
+local pic = require "map_gen.data.north_america"
 local pic = decompress(pic)
 local map = picture_builder(pic)
 

map_gen/presets/template.lua

@@ -2,10 +2,10 @@ map_gen_decoratives = false -- Generate our own decoratives
 map_gen_rows_per_tick = 4 -- Inclusive integer between 1 and 32. Used for map_gen_threaded, higher numbers will generate map quicker but cause more lag.
 
 -- Recommend to use map_gen, but map_gen_not_threaded may be useful for testing / debugging.
---require "map_gencombined.grilledham_map_gen.map_gen_not_threaded"
-require "map_gencombined.grilledham_map_gen.map_gen"
+--require "map_gen.shared.generate_not_threaded"
+require "map_gen.shared.generate"
 
-local pic = require "map_gendata.template"
+local pic = require "map_gen.data.template"
 local pic = decompress(pic)
 local map = picture_builder(pic)
 

map_gen/presets/turkey.lua

@@ -1,7 +1,7 @@
-require "map_gencombined.grilledham_map_gen.map_gen"
+require "map_gen.shared.generate"
 
 map_gen_decoratives = true
-local pic = require "map_gendata.turkey"
+local pic = require "map_gen.data.turkey"
 local pic = decompress(pic)
 
 local shape = picture_builder(pic)

map_gen/shape/maze.lua

@@ -1,4 +1,4 @@
-require "map_genshared.chunk_utils"
+require "map_gen.shared.chunk_utils"
 
 local wall_thickness = 1
 local cell_size = 3 --must be an uneven number

map_gen/shape/rectangular_spiral.lua

@@ -1,5 +1,5 @@
-require "map_genshared.compass"
-require "map_genshared.chunk_utils"
+require "map_gen.shared.compass"
+require "map_gen.shared.chunk_utils"
 
 local compass = Compass.new()
 local pixels={}

map_gen/shared/generate.lua

@@ -1,4 +1,4 @@
-require("map_gencombined.grilledham_map_gen.builders")
+require("map_gen.combined.grilledham_map_gen.builders")
 require("utils.poisson_rng")
 
 local Thread = require "utils.Thread"

map_gen/shared/generate_not_threaded.lua

@@ -1,4 +1,4 @@
-require("map_gencombined.grilledham_map_gen.builders")
+require("map_gen.combined.grilledham_map_gen.builders")
 require("utils.poisson_rng")
 
 local function do_row(row, data)  

map_gen/terrain/neko_bridged_rivers.lua

@@ -1,5 +1,5 @@
 
-require "map_genshared.perlin_noise"
+require "map_gen.shared.perlin_noise"
 
 local tree_to_place = {"dry-tree","dry-hairy-tree","tree-06","tree-06","tree-01","tree-02","tree-03"}
 

map_gen/terrain/neko_river_overlay.lua

@@ -1,5 +1,5 @@
 
-require "map_genshared.perlin_noise"
+require "map_gen.shared.perlin_noise"
 
 local tree_to_place = {"dry-tree","dry-hairy-tree","tree-06","tree-06","tree-01","tree-02","tree-03"}