diff --git a/map_gen/presets/GoT.lua b/map_gen/presets/GoT.lua index e1ae51fe..cb0efcd8 100644 --- a/map_gen/presets/GoT.lua +++ b/map_gen/presets/GoT.lua @@ -1,5 +1,5 @@ require "map_gen.shared.generate" -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.builders" map_gen_decoratives = true local pic = require "map_gen.data.presets.GoT" local pic = decompress(pic) diff --git a/map_gen/presets/UK.lua b/map_gen/presets/UK.lua index 5bdf71b5..17e6a16e 100644 --- a/map_gen/presets/UK.lua +++ b/map_gen/presets/UK.lua @@ -1,4 +1,4 @@ -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.builders" local pic = require "map_gen.data.presets.UK" local pic = decompress(pic) diff --git a/map_gen/presets/antfarm.lua b/map_gen/presets/antfarm.lua index e3d7b0c9..8c84b419 100644 --- a/map_gen/presets/antfarm.lua +++ b/map_gen/presets/antfarm.lua @@ -1,5 +1,5 @@ -require ".shared.generate" -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.generate" +require "map_gen.shared.builders" local pic = require "map_gen.data.presets.antfarm" @@ -14,4 +14,4 @@ map = scale(map, scale_factor, scale_factor) --map = change_tile(map, false, "water") --map = change_map_gen_collision_tile(map, "water-tile", "grass-1") -return map \ No newline at end of file +return map diff --git a/map_gen/presets/cage.lua b/map_gen/presets/cage.lua index f25c571d..a2863682 100644 --- a/map_gen/presets/cage.lua +++ b/map_gen/presets/cage.lua @@ -1,5 +1,5 @@ require "map_gen.shared.generate" -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.builders" local pic = require "map_gen.data.presets.cage" diff --git a/map_gen/presets/connected_dots.lua b/map_gen/presets/connected_dots.lua index be45647a..692da69e 100644 --- a/map_gen/presets/connected_dots.lua +++ b/map_gen/presets/connected_dots.lua @@ -1,5 +1,5 @@ require "map_gen.shared.generate" -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.builders" local function no_resources(x, y, world_x, world_y, tile, entity) local surface = MAP_GEN_SURFACE diff --git a/map_gen/presets/creation_of_adam.lua b/map_gen/presets/creation_of_adam.lua index 09f3c3e5..9a2e2194 100644 --- a/map_gen/presets/creation_of_adam.lua +++ b/map_gen/presets/creation_of_adam.lua @@ -1,5 +1,5 @@ require "map_gen.shared.generate" -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.builders" local pic = require "map_gen.data.presets.creation_of_adam2" diff --git a/map_gen/presets/goat.lua b/map_gen/presets/goat.lua index 20519181..52823de6 100644 --- a/map_gen/presets/goat.lua +++ b/map_gen/presets/goat.lua @@ -1,5 +1,5 @@ require "map_gen.shared.generate" -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.builders" local pic = require "map_gen.data.presets.goat" diff --git a/map_gen/presets/lines_and_balls.lua b/map_gen/presets/lines_and_balls.lua index 073f4c2d..e22e612c 100644 --- a/map_gen/presets/lines_and_balls.lua +++ b/map_gen/presets/lines_and_balls.lua @@ -4,7 +4,7 @@ map_gen_rows_per_tick = 4 -- Inclusive integer between 1 and 32. Used for map_ge -- Recommend to use map_gen, but map_gen_not_threaded may be useful for testing / debugging. require "map_gen.shared.generate_not_threaded" --require "map_gen.shared.generate" -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.builders" local big_circle = circle_builder(150) local small_circle = circle_builder(140) diff --git a/map_gen/presets/manhattan.lua b/map_gen/presets/manhattan.lua index 76c39dcf..3a3d8813 100644 --- a/map_gen/presets/manhattan.lua +++ b/map_gen/presets/manhattan.lua @@ -1,5 +1,5 @@ require "map_gen.shared.generate" -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.builders" local pic = require "map_gen.data.presets.manhattan" diff --git a/map_gen/presets/maori.lua b/map_gen/presets/maori.lua index fd076cec..26463ccc 100644 --- a/map_gen/presets/maori.lua +++ b/map_gen/presets/maori.lua @@ -1,5 +1,5 @@ require "map_gen.shared.generate" -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.builders" local pic = require "map_gen.data.presets.maori" diff --git a/map_gen/presets/mobius_strip.lua b/map_gen/presets/mobius_strip.lua index b57f17f6..b74d9ed8 100644 --- a/map_gen/presets/mobius_strip.lua +++ b/map_gen/presets/mobius_strip.lua @@ -1,5 +1,5 @@ require "map_gen.shared.generate" -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.builders" local inner_circle = invert(circle_builder(48)) local outer_circle = circle_builder(64) diff --git a/map_gen/presets/mona_lisa.lua b/map_gen/presets/mona_lisa.lua index 821505e4..74a22866 100644 --- a/map_gen/presets/mona_lisa.lua +++ b/map_gen/presets/mona_lisa.lua @@ -1,5 +1,5 @@ require "map_gen.shared.generate" -require "map_gen.combined.grilledham_map_gen.builders" +require "map_gen.shared.builders" local pic = require "map_gen.data.presets.color_mona_lisa" diff --git a/map_gen/shared/generate.lua b/map_gen/shared/generate.lua index a02ba2ff..9e93e6bb 100644 --- a/map_gen/shared/generate.lua +++ b/map_gen/shared/generate.lua @@ -1,4 +1,4 @@ -require("map_gen.combined.grilledham_map_gen.builders") +require("map_gen.shared.builders") require("utils.poisson_rng") local Thread = require "utils.Thread" diff --git a/map_gen/shared/generate_not_threaded.lua b/map_gen/shared/generate_not_threaded.lua index b004c77e..4bff58e1 100644 --- a/map_gen/shared/generate_not_threaded.lua +++ b/map_gen/shared/generate_not_threaded.lua @@ -1,4 +1,4 @@ -require("map_gen.combined.grilledham_map_gen.builders") +require("map_gen.shared.builders") require("utils.poisson_rng") local function do_row(row, data)