From 6aed6d6317978bdfc3094fe719faaeedd926431c Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 31 Jan 2019 20:15:41 -0500 Subject: [PATCH] Change map loading method (#640) Add map loader --- .travis/release_builder.sh | 5 +- config.lua | 25 ++- control.lua | 4 +- map_gen/combined/diggy.lua | 2 - map_gen/{terrain => entities}/deathworld.lua | 0 .../{ores => entities}/fluffy_rainbows.lua | 0 map_gen/{ores => entities}/glitter_ores.lua | 0 map_gen/{ores => entities}/harmonic_gen.lua | 0 map_gen/{terrain => entities}/mines.lua | 0 .../neko_bridged_rivers.lua | 0 .../{ores => entities}/neko_crazy_ores.lua | 0 .../neko_river_overlay.lua | 0 .../resource_clustertruck.lua | 0 map_gen/{ores => entities}/tiny_ores.lua | 0 map_gen/{terrain => entities}/worms.lua | 0 map_gen/{presets => maps}/ContraSpiral.lua | 0 map_gen/{presets => maps}/GoT.lua | 0 map_gen/{presets => maps}/UK.lua | 0 map_gen/{presets => maps}/antfarm.lua | 0 map_gen/{presets => maps}/bacon_islands.lua | 0 map_gen/{presets => maps}/beach.lua | 0 map_gen/{combined => maps}/borg_planet.lua | 0 map_gen/{combined => maps}/borg_planet_v2.lua | 0 map_gen/{presets => maps}/broken_web.lua | 0 .../christmas_tree_of_terror.lua | 0 map_gen/{presets => maps}/connected_dots.lua | 0 map_gen/{presets => maps}/cookies.lua | 0 map_gen/{presets => maps}/crash_site.lua | 110 +++++------ .../crash_site/blueprint_extractor.lua | 0 .../{presets => maps}/crash_site/commands.lua | 0 .../crash_site/crash_site_toast.lua | 0 .../crash_site/entity_died_events.lua | 0 .../crash_site/outpost_builder.lua | 2 +- .../outpost_data/artillery_block.lua | 2 +- .../outpost_data/big_ammo_factory.lua | 14 +- .../outpost_data/big_centrifuge.lua | 2 +- .../outpost_data/big_chemical_factory.lua | 8 +- .../outpost_data/big_chemical_plant.lua | 2 +- .../outpost_data/big_circuit_factory.lua | 6 +- .../outpost_data/big_copper_plate_factory.lua | 6 +- .../crash_site/outpost_data/big_factory.lua | 2 +- .../crash_site/outpost_data/big_furance.lua | 2 +- .../outpost_data/big_gear_factory.lua | 6 +- .../outpost_data/big_iron_plate_factory.lua | 8 +- .../outpost_data/big_oil_refinery.lua | 8 +- .../outpost_data/big_power_factory.lua | 8 +- .../crash_site/outpost_data/big_refinery.lua | 2 +- .../outpost_data/big_science_factory.lua | 6 +- .../outpost_data/big_stone_factory.lua | 10 +- .../outpost_data/big_weapon_factory.lua | 14 +- .../outpost_data/big_worm_turrets.lua | 2 +- .../outpost_data/heavy_flame_turrets.lua | 2 +- .../outpost_data/heavy_gun_turrets.lua | 2 +- .../outpost_data/heavy_laser_turrets.lua | 2 +- .../crash_site/outpost_data/laser_block.lua | 2 +- .../outpost_data/light_flame_turrets.lua | 2 +- .../outpost_data/light_gun_turrets.lua | 2 +- .../outpost_data/light_laser_turrets.lua | 2 +- .../outpost_data/medium_ammo_factory.lua | 10 +- .../outpost_data/medium_centrifuge.lua | 2 +- .../outpost_data/medium_chemical_factory.lua | 6 +- .../outpost_data/medium_chemical_plant.lua | 2 +- .../outpost_data/medium_circuit_factory.lua | 6 +- .../medium_copper_plate_factory.lua | 6 +- .../outpost_data/medium_factory.lua | 2 +- .../outpost_data/medium_flame_turrets.lua | 2 +- .../outpost_data/medium_furance.lua | 2 +- .../outpost_data/medium_gear_factory.lua | 6 +- .../outpost_data/medium_gun_turrets.lua | 2 +- .../medium_iron_plate_factory.lua | 6 +- .../outpost_data/medium_laser_turrets.lua | 2 +- .../outpost_data/medium_oil_refinery.lua | 8 +- .../outpost_data/medium_power_factory.lua | 6 +- .../outpost_data/medium_refinery.lua | 2 +- .../outpost_data/medium_science_factory.lua | 6 +- .../outpost_data/medium_stone_factory.lua | 10 +- .../outpost_data/medium_weapon_factory.lua | 10 +- .../crash_site/outpost_data/mini_blank.lua | 2 +- .../crash_site/outpost_data/mini_factory.lua | 2 +- .../outpost_data/mini_gun_turret.lua | 2 +- .../outpost_data/mini_gun_turret_block.lua | 2 +- .../outpost_data/mini_hazard_wall_chests.lua | 2 +- .../outpost_data/mini_hazard_walls.lua | 2 +- .../outpost_data/mini_laser_turret.lua | 2 +- .../outpost_data/mini_laser_turret_block.lua | 2 +- .../outpost_data/mini_t1_ammo_factory.lua | 12 +- .../outpost_data/mini_t1_module_factory.lua | 12 +- .../mini_t1_production_factory.lua | 12 +- .../outpost_data/mini_t1_robotics_factory.lua | 12 +- .../outpost_data/mini_t1_science_factory.lua | 12 +- .../outpost_data/mini_t1_train_factory.lua | 12 +- .../outpost_data/mini_t1_weapon_factory.lua | 12 +- .../outpost_data/mini_t2_ammo_factory.lua | 12 +- .../outpost_data/mini_t2_energy_factory.lua | 12 +- .../mini_t2_logistics_factory.lua | 12 +- .../outpost_data/mini_t2_module_factory.lua | 12 +- .../outpost_data/mini_t2_science_factory.lua | 12 +- .../outpost_data/mini_t2_weapon_factory.lua | 12 +- .../mini_t3_logistics_factory.lua | 12 +- .../outpost_data/mini_t3_module_factory.lua | 12 +- .../outpost_data/mini_t3_science_factory.lua | 12 +- .../outpost_data/mini_wall_chests.lua | 2 +- .../crash_site/outpost_data/mini_walls.lua | 2 +- .../outpost_data/nuclear_reactor_block.lua | 2 +- .../outpost_data/small_ammo_factory.lua | 10 +- .../outpost_data/small_centrifuge.lua | 2 +- .../outpost_data/small_chemical_factory.lua | 6 +- .../outpost_data/small_chemical_plant.lua | 2 +- .../outpost_data/small_circuit_factory.lua | 8 +- .../small_copper_plate_factory.lua | 8 +- .../crash_site/outpost_data/small_factory.lua | 2 +- .../crash_site/outpost_data/small_furance.lua | 2 +- .../outpost_data/small_gear_factory.lua | 8 +- .../outpost_data/small_iron_plate_factory.lua | 8 +- .../outpost_data/small_oil_refinery.lua | 8 +- .../outpost_data/small_power_factory.lua | 10 +- .../outpost_data/small_refinery.lua | 2 +- .../outpost_data/small_science_factory.lua | 8 +- .../outpost_data/small_stone_factory.lua | 10 +- .../outpost_data/small_weapon_factory.lua | 10 +- .../outpost_data/small_worm_turrets.lua | 2 +- .../outpost_data/solar_panel_block.lua | 2 +- .../outpost_data/steam_engine_block.lua | 2 +- .../outpost_data/storage_tank_block.lua | 2 +- .../crash_site/outpost_data/thin_walls.lua | 2 +- .../crash_site/outpost_data/walls.lua | 2 +- .../crash_site/weapon_balance.lua | 0 .../{presets => maps}/creation_of_adam.lua | 0 .../{presets => maps}/creation_of_adam2.lua | 0 map_gen/{presets => maps}/crosses.lua | 0 map_gen/{presets => maps}/crosses3.lua | 0 map_gen/{presets => maps}/danger_ores.lua | 0 map_gen/maps/default.lua | 3 + map_gen/{shape => maps}/diagonal_lattice.lua | 0 map_gen/{presets => maps}/diagonal_ribbon.lua | 0 map_gen/{presets => maps}/dickbutt.lua | 0 map_gen/maps/diggy.lua | 2 + .../Config.lua => maps/diggy/config.lua} | 30 +-- .../{Diggy/Debug.lua => maps/diggy/debug.lua} | 0 .../diggy/feature/alien_spawner.lua} | 4 +- .../diggy/feature/antigrief.lua} | 2 +- .../diggy/feature/coin_gathering.lua} | 6 +- .../diggy/feature/diggy_cave_collapse.lua} | 6 +- .../diggy/feature/diggy_hole.lua} | 4 +- .../diggy/feature/experience.lua} | 2 +- .../diggy/feature/night_time.lua} | 0 .../diggy/feature/refresh_map.lua} | 0 .../diggy/feature/scattered_resources.lua} | 4 +- .../diggy/feature/setup_player.lua} | 0 .../diggy/feature/simple_room_generator.lua} | 4 +- .../diggy/feature/starting_zone.lua} | 6 +- .../diggy/orepattern/clusters.lua} | 0 .../diggy/orepattern/tendrils.lua} | 0 .../diggy/orepattern}/tendrils_impure.lua | 0 .../{Diggy/Readme.md => maps/diggy/readme.md} | 0 .../Scenario.lua => maps/diggy/scenario.lua} | 6 +- .../diggy/score_table.lua} | 0 .../Template.lua => maps/diggy/template.lua} | 0 map_gen/{combined => maps}/dimensions.lua | 2 +- map_gen/{presets => maps}/dino_island.lua | 0 map_gen/{presets => maps}/dna.lua | 0 map_gen/{shape => maps}/donut.lua | 0 map_gen/{presets => maps}/double_beach.lua | 2 +- map_gen/{presets => maps}/factorio_logo.lua | 0 map_gen/{presets => maps}/factorio_logo2.lua | 0 map_gen/{presets => maps}/factory.lua | 0 map_gen/{presets => maps}/fish_islands.lua | 0 map_gen/{presets => maps}/fractal_balls.lua | 0 map_gen/{presets => maps}/fruit_loops.lua | 0 map_gen/{presets => maps}/gears.lua | 0 map_gen/{presets => maps}/goat.lua | 0 map_gen/{presets => maps}/goats_on_goats.lua | 0 .../{presets => maps}/grid_bot_islands.lua | 0 map_gen/{presets => maps}/grid_islands.lua | 0 .../grid_islands_rotated.lua | 0 map_gen/{presets => maps}/hearts.lua | 0 map_gen/{presets => maps}/honeycomb.lua | 0 map_gen/{presets => maps}/hub_spiral.lua | 0 map_gen/{shape => maps}/infinite_mazes.lua | 0 map_gen/{combined => maps}/island_resort.lua | 0 map_gen/{shape => maps}/left.lua | 0 map_gen/{presets => maps}/line_and_tree.lua | 0 map_gen/{presets => maps}/line_and_trees.lua | 0 map_gen/{presets => maps}/lines.lua | 0 map_gen/{presets => maps}/lines_and_balls.lua | 0 .../{presets => maps}/lines_and_squares.lua | 0 .../{presets => maps}/maltease_crossings.lua | 0 map_gen/{presets => maps}/manhattan.lua | 0 map_gen/{presets => maps}/maori.lua | 0 map_gen/{shape => maps}/maze.lua | 0 map_gen/{combined => maps}/meteor_strike.lua | 0 .../{combined => maps}/meteor_strike_data.lua | 0 map_gen/{presets => maps}/misc_stuff.lua | 0 map_gen/{presets => maps}/mobius_strip.lua | 2 +- map_gen/{presets => maps}/mona_lisa.lua | 0 map_gen/{presets => maps}/north_america.lua | 0 map_gen/{shape => maps}/pacman.lua | 4 +- .../{shape => maps}/pacman_grids/classic.lua | 0 .../pacman_grids/rotated_rectangles.lua | 0 map_gen/{presets => maps}/plus.lua | 0 map_gen/{shape => maps}/right.lua | 0 map_gen/{presets => maps}/ring_of_balls.lua | 0 map_gen/{presets => maps}/rings_and_boxes.lua | 0 map_gen/{presets => maps}/rotten_apples.lua | 0 .../{presets => maps}/sierpinski_carpet.lua | 0 map_gen/{presets => maps}/spiral.lua | 0 map_gen/{shape => maps}/spiral2.lua | 0 .../{presets => maps}/spiral_crossings.lua | 0 .../{presets => maps}/spiral_of_spirals.lua | 0 .../spiral.lua => maps/spiral_shape.lua} | 0 map_gen/{shape => maps}/spiral_tri.lua | 0 map_gen/{presets => maps}/square_spiral.lua | 0 map_gen/{presets => maps}/template.lua | 0 .../terraforming_danger_ores.lua | 0 map_gen/{presets => maps}/test.lua | 0 map_gen/maps/tetris.lua | 1 + .../{combined => maps}/tetris/scenario.lua | 8 +- map_gen/{combined => maps}/tetris/shape.lua | 0 map_gen/{combined => maps}/tetris/states.lua | 0 .../{combined => maps}/tetris/tetrimino.lua | 0 map_gen/{combined => maps}/tetris/view.lua | 0 map_gen/{shape => maps}/threaded_spirals.lua | 0 .../toxic_danger_ore_jungle.lua | 0 map_gen/{presets => maps}/toxic_jungle.lua | 0 .../{presets => maps}/triangle_of_death.lua | 0 map_gen/{presets => maps}/turkey.lua | 0 map_gen/{shape => maps}/up.lua | 0 map_gen/{presets => maps}/vanilla.lua | 0 map_gen/{presets => maps}/venice.lua | 0 map_gen/{presets => maps}/venus.lua | 6 +- map_gen/{presets => maps}/void_gears.lua | 0 map_gen/{presets => maps}/web.lua | 0 map_gen/{presets => maps}/women.lua | 0 map_gen/{presets => maps}/world_map.lua | 0 .../world_map_thanksgiving.lua | 0 map_gen/{shape => maps}/x_shape.lua | 0 map_gen/presets/tetris.lua | 1 - map_gen/{misc => shared}/car_body.lua | 0 .../{misc => shared}/change_landfill_tile.lua | 0 .../danger_ore_banned_entities.lua | 0 map_gen/{misc => shared}/day_night.lua | 0 map_gen/{misc => shared}/loot_items.lua | 0 map_gen/shared/map_loader.lua | 27 +++ map_gen/{misc => shared}/naughty_words.lua | 0 map_gen/{misc => shared}/nightfall.lua | 0 map_gen/{misc => shared}/rail_grid.lua | 0 .../restrict_landfill_tile.lua | 0 map_gen/{misc => shared}/rusky_pvp.lua | 0 .../{misc => shared}/silly_player_names.lua | 0 map_gen/{misc => shared}/spawn_control.lua | 0 map_gen/{misc => shared}/terraforming.lua | 0 map_gen/{misc => shared}/wreck_items.lua | 0 map_gen/{misc => terrain}/tris_chunk_grid.lua | 0 map_layout.lua | 171 ------------------ map_selection.lua | 32 ++++ 255 files changed, 469 insertions(+), 562 deletions(-) delete mode 100644 map_gen/combined/diggy.lua rename map_gen/{terrain => entities}/deathworld.lua (100%) rename map_gen/{ores => entities}/fluffy_rainbows.lua (100%) rename map_gen/{ores => entities}/glitter_ores.lua (100%) rename map_gen/{ores => entities}/harmonic_gen.lua (100%) rename map_gen/{terrain => entities}/mines.lua (100%) rename map_gen/{terrain => entities}/neko_bridged_rivers.lua (100%) rename map_gen/{ores => entities}/neko_crazy_ores.lua (100%) rename map_gen/{terrain => entities}/neko_river_overlay.lua (100%) rename map_gen/{ores => entities}/resource_clustertruck.lua (100%) rename map_gen/{ores => entities}/tiny_ores.lua (100%) rename map_gen/{terrain => entities}/worms.lua (100%) rename map_gen/{presets => maps}/ContraSpiral.lua (100%) rename map_gen/{presets => maps}/GoT.lua (100%) rename map_gen/{presets => maps}/UK.lua (100%) rename map_gen/{presets => maps}/antfarm.lua (100%) rename map_gen/{presets => maps}/bacon_islands.lua (100%) rename map_gen/{presets => maps}/beach.lua (100%) rename map_gen/{combined => maps}/borg_planet.lua (100%) rename map_gen/{combined => maps}/borg_planet_v2.lua (100%) rename map_gen/{presets => maps}/broken_web.lua (100%) rename map_gen/{presets => maps}/christmas_tree_of_terror.lua (100%) rename map_gen/{presets => maps}/connected_dots.lua (100%) rename map_gen/{presets => maps}/cookies.lua (100%) rename map_gen/{presets => maps}/crash_site.lua (79%) rename map_gen/{presets => maps}/crash_site/blueprint_extractor.lua (100%) rename map_gen/{presets => maps}/crash_site/commands.lua (100%) rename map_gen/{presets => maps}/crash_site/crash_site_toast.lua (100%) rename map_gen/{presets => maps}/crash_site/entity_died_events.lua (100%) rename map_gen/{presets => maps}/crash_site/outpost_builder.lua (99%) rename map_gen/{presets => maps}/crash_site/outpost_data/artillery_block.lua (96%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_ammo_factory.lua (89%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_centrifuge.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_chemical_factory.lua (92%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_chemical_plant.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_circuit_factory.lua (94%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_copper_plate_factory.lua (89%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_factory.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_furance.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_gear_factory.lua (95%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_iron_plate_factory.lua (90%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_oil_refinery.lua (92%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_power_factory.lua (95%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_refinery.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_science_factory.lua (93%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_stone_factory.lua (89%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_weapon_factory.lua (93%) rename map_gen/{presets => maps}/crash_site/outpost_data/big_worm_turrets.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/heavy_flame_turrets.lua (99%) rename map_gen/{presets => maps}/crash_site/outpost_data/heavy_gun_turrets.lua (99%) rename map_gen/{presets => maps}/crash_site/outpost_data/heavy_laser_turrets.lua (99%) rename map_gen/{presets => maps}/crash_site/outpost_data/laser_block.lua (96%) rename map_gen/{presets => maps}/crash_site/outpost_data/light_flame_turrets.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/light_gun_turrets.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/light_laser_turrets.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_ammo_factory.lua (91%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_centrifuge.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_chemical_factory.lua (93%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_chemical_plant.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_circuit_factory.lua (91%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_copper_plate_factory.lua (89%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_factory.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_flame_turrets.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_furance.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_gear_factory.lua (95%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_gun_turrets.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_iron_plate_factory.lua (90%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_laser_turrets.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_oil_refinery.lua (91%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_power_factory.lua (94%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_refinery.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_science_factory.lua (92%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_stone_factory.lua (88%) rename map_gen/{presets => maps}/crash_site/outpost_data/medium_weapon_factory.lua (94%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_blank.lua (84%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_factory.lua (87%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_gun_turret.lua (96%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_gun_turret_block.lua (88%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_hazard_wall_chests.lua (97%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_hazard_walls.lua (96%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_laser_turret.lua (96%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_laser_turret_block.lua (91%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t1_ammo_factory.lua (84%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t1_module_factory.lua (82%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t1_production_factory.lua (83%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t1_robotics_factory.lua (84%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t1_science_factory.lua (80%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t1_train_factory.lua (79%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t1_weapon_factory.lua (81%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t2_ammo_factory.lua (84%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t2_energy_factory.lua (82%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t2_logistics_factory.lua (84%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t2_module_factory.lua (80%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t2_science_factory.lua (77%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t2_weapon_factory.lua (85%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t3_logistics_factory.lua (85%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t3_module_factory.lua (80%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_t3_science_factory.lua (78%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_wall_chests.lua (96%) rename map_gen/{presets => maps}/crash_site/outpost_data/mini_walls.lua (95%) rename map_gen/{presets => maps}/crash_site/outpost_data/nuclear_reactor_block.lua (95%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_ammo_factory.lua (89%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_centrifuge.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_chemical_factory.lua (92%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_chemical_plant.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_circuit_factory.lua (87%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_copper_plate_factory.lua (85%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_factory.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_furance.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_gear_factory.lua (91%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_iron_plate_factory.lua (85%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_oil_refinery.lua (91%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_power_factory.lua (89%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_refinery.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_science_factory.lua (88%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_stone_factory.lua (87%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_weapon_factory.lua (93%) rename map_gen/{presets => maps}/crash_site/outpost_data/small_worm_turrets.lua (96%) rename map_gen/{presets => maps}/crash_site/outpost_data/solar_panel_block.lua (95%) rename map_gen/{presets => maps}/crash_site/outpost_data/steam_engine_block.lua (95%) rename map_gen/{presets => maps}/crash_site/outpost_data/storage_tank_block.lua (95%) rename map_gen/{presets => maps}/crash_site/outpost_data/thin_walls.lua (98%) rename map_gen/{presets => maps}/crash_site/outpost_data/walls.lua (98%) rename map_gen/{presets => maps}/crash_site/weapon_balance.lua (100%) rename map_gen/{presets => maps}/creation_of_adam.lua (100%) rename map_gen/{presets => maps}/creation_of_adam2.lua (100%) rename map_gen/{presets => maps}/crosses.lua (100%) rename map_gen/{presets => maps}/crosses3.lua (100%) rename map_gen/{presets => maps}/danger_ores.lua (100%) create mode 100644 map_gen/maps/default.lua rename map_gen/{shape => maps}/diagonal_lattice.lua (100%) rename map_gen/{presets => maps}/diagonal_ribbon.lua (100%) rename map_gen/{presets => maps}/dickbutt.lua (100%) create mode 100644 map_gen/maps/diggy.lua rename map_gen/{Diggy/Config.lua => maps/diggy/config.lua} (97%) rename map_gen/{Diggy/Debug.lua => maps/diggy/debug.lua} (100%) rename map_gen/{Diggy/Feature/AlienSpawner.lua => maps/diggy/feature/alien_spawner.lua} (98%) rename map_gen/{Diggy/Feature/Antigrief.lua => maps/diggy/feature/antigrief.lua} (95%) rename map_gen/{Diggy/Feature/CoinGathering.lua => maps/diggy/feature/coin_gathering.lua} (97%) rename map_gen/{Diggy/Feature/DiggyCaveCollapse.lua => maps/diggy/feature/diggy_cave_collapse.lua} (99%) rename map_gen/{Diggy/Feature/DiggyHole.lua => maps/diggy/feature/diggy_hole.lua} (98%) rename map_gen/{Diggy/Feature/Experience.lua => maps/diggy/feature/experience.lua} (99%) rename map_gen/{Diggy/Feature/NightTime.lua => maps/diggy/feature/night_time.lua} (100%) rename map_gen/{Diggy/Feature/RefreshMap.lua => maps/diggy/feature/refresh_map.lua} (100%) rename map_gen/{Diggy/Feature/ScatteredResources.lua => maps/diggy/feature/scattered_resources.lua} (99%) rename map_gen/{Diggy/Feature/SetupPlayer.lua => maps/diggy/feature/setup_player.lua} (100%) rename map_gen/{Diggy/Feature/SimpleRoomGenerator.lua => maps/diggy/feature/simple_room_generator.lua} (97%) rename map_gen/{Diggy/Feature/StartingZone.lua => maps/diggy/feature/starting_zone.lua} (94%) rename map_gen/{Diggy/Orepattern/Clusters.lua => maps/diggy/orepattern/clusters.lua} (100%) rename map_gen/{Diggy/Orepattern/Tendrils.lua => maps/diggy/orepattern/tendrils.lua} (100%) rename map_gen/{Diggy/Orepattern => maps/diggy/orepattern}/tendrils_impure.lua (100%) rename map_gen/{Diggy/Readme.md => maps/diggy/readme.md} (100%) rename map_gen/{Diggy/Scenario.lua => maps/diggy/scenario.lua} (92%) rename map_gen/{Diggy/ScoreTable.lua => maps/diggy/score_table.lua} (100%) rename map_gen/{Diggy/Template.lua => maps/diggy/template.lua} (100%) rename map_gen/{combined => maps}/dimensions.lua (99%) rename map_gen/{presets => maps}/dino_island.lua (100%) rename map_gen/{presets => maps}/dna.lua (100%) rename map_gen/{shape => maps}/donut.lua (100%) rename map_gen/{presets => maps}/double_beach.lua (92%) rename map_gen/{presets => maps}/factorio_logo.lua (100%) rename map_gen/{presets => maps}/factorio_logo2.lua (100%) rename map_gen/{presets => maps}/factory.lua (100%) rename map_gen/{presets => maps}/fish_islands.lua (100%) rename map_gen/{presets => maps}/fractal_balls.lua (100%) rename map_gen/{presets => maps}/fruit_loops.lua (100%) rename map_gen/{presets => maps}/gears.lua (100%) rename map_gen/{presets => maps}/goat.lua (100%) rename map_gen/{presets => maps}/goats_on_goats.lua (100%) rename map_gen/{presets => maps}/grid_bot_islands.lua (100%) rename map_gen/{presets => maps}/grid_islands.lua (100%) rename map_gen/{presets => maps}/grid_islands_rotated.lua (100%) rename map_gen/{presets => maps}/hearts.lua (100%) rename map_gen/{presets => maps}/honeycomb.lua (100%) rename map_gen/{presets => maps}/hub_spiral.lua (100%) rename map_gen/{shape => maps}/infinite_mazes.lua (100%) rename map_gen/{combined => maps}/island_resort.lua (100%) rename map_gen/{shape => maps}/left.lua (100%) rename map_gen/{presets => maps}/line_and_tree.lua (100%) rename map_gen/{presets => maps}/line_and_trees.lua (100%) rename map_gen/{presets => maps}/lines.lua (100%) rename map_gen/{presets => maps}/lines_and_balls.lua (100%) rename map_gen/{presets => maps}/lines_and_squares.lua (100%) rename map_gen/{presets => maps}/maltease_crossings.lua (100%) rename map_gen/{presets => maps}/manhattan.lua (100%) rename map_gen/{presets => maps}/maori.lua (100%) rename map_gen/{shape => maps}/maze.lua (100%) rename map_gen/{combined => maps}/meteor_strike.lua (100%) rename map_gen/{combined => maps}/meteor_strike_data.lua (100%) rename map_gen/{presets => maps}/misc_stuff.lua (100%) rename map_gen/{presets => maps}/mobius_strip.lua (98%) rename map_gen/{presets => maps}/mona_lisa.lua (100%) rename map_gen/{presets => maps}/north_america.lua (100%) rename map_gen/{shape => maps}/pacman.lua (74%) rename map_gen/{shape => maps}/pacman_grids/classic.lua (100%) rename map_gen/{shape => maps}/pacman_grids/rotated_rectangles.lua (100%) rename map_gen/{presets => maps}/plus.lua (100%) rename map_gen/{shape => maps}/right.lua (100%) rename map_gen/{presets => maps}/ring_of_balls.lua (100%) rename map_gen/{presets => maps}/rings_and_boxes.lua (100%) rename map_gen/{presets => maps}/rotten_apples.lua (100%) rename map_gen/{presets => maps}/sierpinski_carpet.lua (100%) rename map_gen/{presets => maps}/spiral.lua (100%) rename map_gen/{shape => maps}/spiral2.lua (100%) rename map_gen/{presets => maps}/spiral_crossings.lua (100%) rename map_gen/{presets => maps}/spiral_of_spirals.lua (100%) rename map_gen/{shape/spiral.lua => maps/spiral_shape.lua} (100%) rename map_gen/{shape => maps}/spiral_tri.lua (100%) rename map_gen/{presets => maps}/square_spiral.lua (100%) rename map_gen/{presets => maps}/template.lua (100%) rename map_gen/{presets => maps}/terraforming_danger_ores.lua (100%) rename map_gen/{presets => maps}/test.lua (100%) create mode 100644 map_gen/maps/tetris.lua rename map_gen/{combined => maps}/tetris/scenario.lua (98%) rename map_gen/{combined => maps}/tetris/shape.lua (100%) rename map_gen/{combined => maps}/tetris/states.lua (100%) rename map_gen/{combined => maps}/tetris/tetrimino.lua (100%) rename map_gen/{combined => maps}/tetris/view.lua (100%) rename map_gen/{shape => maps}/threaded_spirals.lua (100%) rename map_gen/{presets => maps}/toxic_danger_ore_jungle.lua (100%) rename map_gen/{presets => maps}/toxic_jungle.lua (100%) rename map_gen/{presets => maps}/triangle_of_death.lua (100%) rename map_gen/{presets => maps}/turkey.lua (100%) rename map_gen/{shape => maps}/up.lua (100%) rename map_gen/{presets => maps}/vanilla.lua (100%) rename map_gen/{presets => maps}/venice.lua (100%) rename map_gen/{presets => maps}/venus.lua (95%) rename map_gen/{presets => maps}/void_gears.lua (100%) rename map_gen/{presets => maps}/web.lua (100%) rename map_gen/{presets => maps}/women.lua (100%) rename map_gen/{presets => maps}/world_map.lua (100%) rename map_gen/{presets => maps}/world_map_thanksgiving.lua (100%) rename map_gen/{shape => maps}/x_shape.lua (100%) delete mode 100644 map_gen/presets/tetris.lua rename map_gen/{misc => shared}/car_body.lua (100%) rename map_gen/{misc => shared}/change_landfill_tile.lua (100%) rename map_gen/{misc => shared}/danger_ore_banned_entities.lua (100%) rename map_gen/{misc => shared}/day_night.lua (100%) rename map_gen/{misc => shared}/loot_items.lua (100%) create mode 100644 map_gen/shared/map_loader.lua rename map_gen/{misc => shared}/naughty_words.lua (100%) rename map_gen/{misc => shared}/nightfall.lua (100%) rename map_gen/{misc => shared}/rail_grid.lua (100%) rename map_gen/{misc => shared}/restrict_landfill_tile.lua (100%) rename map_gen/{misc => shared}/rusky_pvp.lua (100%) rename map_gen/{misc => shared}/silly_player_names.lua (100%) rename map_gen/{misc => shared}/spawn_control.lua (100%) rename map_gen/{misc => shared}/terraforming.lua (100%) rename map_gen/{misc => shared}/wreck_items.lua (100%) rename map_gen/{misc => terrain}/tris_chunk_grid.lua (100%) delete mode 100644 map_layout.lua create mode 100644 map_selection.lua diff --git a/.travis/release_builder.sh b/.travis/release_builder.sh index aa7e08f2..bd5f2ef7 100755 --- a/.travis/release_builder.sh +++ b/.travis/release_builder.sh @@ -17,7 +17,7 @@ cat working_copy/resources/version.lua function process_map (){ echo "-----$1-----" mv "$3" "$1" - echo "return $2" > "$1/map_selection.lua" + echo "return require 'map_gen.maps.$2'" > "$1/map_selection.lua" echo "Contents of map_selection:" cat "$1/map_selection.lua" echo "Creating zip..." @@ -37,4 +37,5 @@ function process_map (){ #Each map after the default redmew release repeats the pattern of $1=The regular name of the map (proper casing), $2=The name of the map file (lower case), $3 "$PREVIOUS_NAME" process_map "RedMew" "default" "working_copy" true #process_map "Diggy" "diggy" "$PREVIOUS_NAME" -#process_map "Crashsite" "crashsite" "$PREVIOUS_NAME" +#process_map "Crashsite" "crash_site" "$PREVIOUS_NAME" +#process_map "Tetris" "tetris" "$PREVIOUS_NAME" diff --git a/config.lua b/config.lua index 094b8cb6..94d680b8 100644 --- a/config.lua +++ b/config.lua @@ -16,6 +16,21 @@ global.config = { -- New Scenario Features, appears in the "What's new" tab new_info_key = 'Nothing is new. The world is at peace' }, + -- map generation settings for redmew's maps (only applies to maps that use 'shapes') + map_generation = { + -- whether to regen decoratives + ['regen_decoratives'] = false, + -- the number of 'tiles' that are calculated per tick + ['tiles_per_tick'] = 32, + -- the entity modules to load (takes a list of requires), example included + ['entity_modules'] = { + -- require('map_gen.entities.fluffy_rainbows') + }, + -- the terrain modules to load (takes a list of requires), example included + ['terrain_modules'] = { + --require('map_gen.terrain.tris_chunk_grid') + }, + }, -- redmew_surface allows a map preset to control world generation as well as map and difficulty settings -- the entire module can be toggled or just individual parts redmew_surface = { @@ -84,9 +99,9 @@ global.config = { ['medium-spitter'] = {low = 1, high = 3, chance = 0}, ['big-spitter'] = {low = 1, high = 3, chance = 0}, ['behemoth-spitter'] = {low = 1, high = 10, chance = 0}, - ['medium-biter'] = {low = 1, high = 3, chance = 0}, - ['big-biter'] = {low = 1, high = 5, chance = 0}, - ['behemoth-biter'] = {low = 1, high = 10, chance = 0} + ['medium-biter'] = {low = 1, high = 3, chance = 0}, + ['big-biter'] = {low = 1, high = 5, chance = 0}, + ['behemoth-biter'] = {low = 1, high = 10, chance = 0} } }, -- adds anti-nuke griefing @@ -198,7 +213,7 @@ global.config = { }, -- makes manual stuff cumbersome lazy_bastard = { - enabled = false, + enabled = false }, -- automatically marks miners for deconstruction when they are depleted (currently compatible with hard mods that add miners) autodeconstruct = { @@ -251,7 +266,7 @@ global.config = { }, -- adds a useless button with the biter percentage evolution_progress = { - enabled = true, + enabled = true } } diff --git a/control.lua b/control.lua index 288b73f0..7e2c2246 100644 --- a/control.lua +++ b/control.lua @@ -6,9 +6,9 @@ Debug = require 'utils.debug' require 'resources.version' require 'utils.table' --- Map layout and config dictate the map you play and the settings in it +-- Config and map_loader dictate the map you play and the settings in it local config = require 'config' -require 'map_layout' +require 'map_gen.shared.map_loader' -- to change the map you're playing, modify map_selection.lua -- Specific to RedMew hosts, can be disabled safely if not hosting on RedMew servers require 'features.server' diff --git a/map_gen/combined/diggy.lua b/map_gen/combined/diggy.lua deleted file mode 100644 index 8bd1c9e0..00000000 --- a/map_gen/combined/diggy.lua +++ /dev/null @@ -1,2 +0,0 @@ --- authors Linaori, valansch -require 'map_gen.Diggy.Scenario'.register() diff --git a/map_gen/terrain/deathworld.lua b/map_gen/entities/deathworld.lua similarity index 100% rename from map_gen/terrain/deathworld.lua rename to map_gen/entities/deathworld.lua diff --git a/map_gen/ores/fluffy_rainbows.lua b/map_gen/entities/fluffy_rainbows.lua similarity index 100% rename from map_gen/ores/fluffy_rainbows.lua rename to map_gen/entities/fluffy_rainbows.lua diff --git a/map_gen/ores/glitter_ores.lua b/map_gen/entities/glitter_ores.lua similarity index 100% rename from map_gen/ores/glitter_ores.lua rename to map_gen/entities/glitter_ores.lua diff --git a/map_gen/ores/harmonic_gen.lua b/map_gen/entities/harmonic_gen.lua similarity index 100% rename from map_gen/ores/harmonic_gen.lua rename to map_gen/entities/harmonic_gen.lua diff --git a/map_gen/terrain/mines.lua b/map_gen/entities/mines.lua similarity index 100% rename from map_gen/terrain/mines.lua rename to map_gen/entities/mines.lua diff --git a/map_gen/terrain/neko_bridged_rivers.lua b/map_gen/entities/neko_bridged_rivers.lua similarity index 100% rename from map_gen/terrain/neko_bridged_rivers.lua rename to map_gen/entities/neko_bridged_rivers.lua diff --git a/map_gen/ores/neko_crazy_ores.lua b/map_gen/entities/neko_crazy_ores.lua similarity index 100% rename from map_gen/ores/neko_crazy_ores.lua rename to map_gen/entities/neko_crazy_ores.lua diff --git a/map_gen/terrain/neko_river_overlay.lua b/map_gen/entities/neko_river_overlay.lua similarity index 100% rename from map_gen/terrain/neko_river_overlay.lua rename to map_gen/entities/neko_river_overlay.lua diff --git a/map_gen/ores/resource_clustertruck.lua b/map_gen/entities/resource_clustertruck.lua similarity index 100% rename from map_gen/ores/resource_clustertruck.lua rename to map_gen/entities/resource_clustertruck.lua diff --git a/map_gen/ores/tiny_ores.lua b/map_gen/entities/tiny_ores.lua similarity index 100% rename from map_gen/ores/tiny_ores.lua rename to map_gen/entities/tiny_ores.lua diff --git a/map_gen/terrain/worms.lua b/map_gen/entities/worms.lua similarity index 100% rename from map_gen/terrain/worms.lua rename to map_gen/entities/worms.lua diff --git a/map_gen/presets/ContraSpiral.lua b/map_gen/maps/ContraSpiral.lua similarity index 100% rename from map_gen/presets/ContraSpiral.lua rename to map_gen/maps/ContraSpiral.lua diff --git a/map_gen/presets/GoT.lua b/map_gen/maps/GoT.lua similarity index 100% rename from map_gen/presets/GoT.lua rename to map_gen/maps/GoT.lua diff --git a/map_gen/presets/UK.lua b/map_gen/maps/UK.lua similarity index 100% rename from map_gen/presets/UK.lua rename to map_gen/maps/UK.lua diff --git a/map_gen/presets/antfarm.lua b/map_gen/maps/antfarm.lua similarity index 100% rename from map_gen/presets/antfarm.lua rename to map_gen/maps/antfarm.lua diff --git a/map_gen/presets/bacon_islands.lua b/map_gen/maps/bacon_islands.lua similarity index 100% rename from map_gen/presets/bacon_islands.lua rename to map_gen/maps/bacon_islands.lua diff --git a/map_gen/presets/beach.lua b/map_gen/maps/beach.lua similarity index 100% rename from map_gen/presets/beach.lua rename to map_gen/maps/beach.lua diff --git a/map_gen/combined/borg_planet.lua b/map_gen/maps/borg_planet.lua similarity index 100% rename from map_gen/combined/borg_planet.lua rename to map_gen/maps/borg_planet.lua diff --git a/map_gen/combined/borg_planet_v2.lua b/map_gen/maps/borg_planet_v2.lua similarity index 100% rename from map_gen/combined/borg_planet_v2.lua rename to map_gen/maps/borg_planet_v2.lua diff --git a/map_gen/presets/broken_web.lua b/map_gen/maps/broken_web.lua similarity index 100% rename from map_gen/presets/broken_web.lua rename to map_gen/maps/broken_web.lua diff --git a/map_gen/presets/christmas_tree_of_terror.lua b/map_gen/maps/christmas_tree_of_terror.lua similarity index 100% rename from map_gen/presets/christmas_tree_of_terror.lua rename to map_gen/maps/christmas_tree_of_terror.lua diff --git a/map_gen/presets/connected_dots.lua b/map_gen/maps/connected_dots.lua similarity index 100% rename from map_gen/presets/connected_dots.lua rename to map_gen/maps/connected_dots.lua diff --git a/map_gen/presets/cookies.lua b/map_gen/maps/cookies.lua similarity index 100% rename from map_gen/presets/cookies.lua rename to map_gen/maps/cookies.lua diff --git a/map_gen/presets/crash_site.lua b/map_gen/maps/crash_site.lua similarity index 79% rename from map_gen/presets/crash_site.lua rename to map_gen/maps/crash_site.lua index 7c4faff6..f9d19acc 100644 --- a/map_gen/presets/crash_site.lua +++ b/map_gen/maps/crash_site.lua @@ -1,12 +1,12 @@ -require 'map_gen.presets.crash_site.blueprint_extractor' -require 'map_gen.presets.crash_site.entity_died_events' -require 'map_gen.presets.crash_site.weapon_balance' -require 'map_gen.presets.crash_site.commands' +require 'map_gen.maps.crash_site.blueprint_extractor' +require 'map_gen.maps.crash_site.entity_died_events' +require 'map_gen.maps.crash_site.weapon_balance' +require 'map_gen.maps.crash_site.commands' local b = require 'map_gen.shared.builders' local Global = require('utils.global') local Random = require 'map_gen.shared.random' -local OutpostBuilder = require 'map_gen.presets.crash_site.outpost_builder' +local OutpostBuilder = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local Task = require 'utils.task' local math = require 'utils.math' @@ -44,73 +44,73 @@ global.config.market.enabled = false local outpost_seed = nil --91000 local ore_seed = nil --92000 -local small_iron_plate_factory = require 'map_gen.presets.crash_site.outpost_data.small_iron_plate_factory' -local medium_iron_plate_factory = require 'map_gen.presets.crash_site.outpost_data.medium_iron_plate_factory' -local big_iron_plate_factory = require 'map_gen.presets.crash_site.outpost_data.big_iron_plate_factory' +local small_iron_plate_factory = require 'map_gen.maps.crash_site.outpost_data.small_iron_plate_factory' +local medium_iron_plate_factory = require 'map_gen.maps.crash_site.outpost_data.medium_iron_plate_factory' +local big_iron_plate_factory = require 'map_gen.maps.crash_site.outpost_data.big_iron_plate_factory' -local small_copper_plate_factory = require 'map_gen.presets.crash_site.outpost_data.small_copper_plate_factory' -local medium_copper_plate_factory = require 'map_gen.presets.crash_site.outpost_data.medium_copper_plate_factory' -local big_copper_plate_factory = require 'map_gen.presets.crash_site.outpost_data.big_copper_plate_factory' +local small_copper_plate_factory = require 'map_gen.maps.crash_site.outpost_data.small_copper_plate_factory' +local medium_copper_plate_factory = require 'map_gen.maps.crash_site.outpost_data.medium_copper_plate_factory' +local big_copper_plate_factory = require 'map_gen.maps.crash_site.outpost_data.big_copper_plate_factory' -local small_stone_factory = require 'map_gen.presets.crash_site.outpost_data.small_stone_factory' -local medium_stone_factory = require 'map_gen.presets.crash_site.outpost_data.medium_stone_factory' -local big_stone_factory = require 'map_gen.presets.crash_site.outpost_data.big_stone_factory' +local small_stone_factory = require 'map_gen.maps.crash_site.outpost_data.small_stone_factory' +local medium_stone_factory = require 'map_gen.maps.crash_site.outpost_data.medium_stone_factory' +local big_stone_factory = require 'map_gen.maps.crash_site.outpost_data.big_stone_factory' -local small_gear_factory = require 'map_gen.presets.crash_site.outpost_data.small_gear_factory' -local medium_gear_factory = require 'map_gen.presets.crash_site.outpost_data.medium_gear_factory' -local big_gear_factory = require 'map_gen.presets.crash_site.outpost_data.big_gear_factory' +local small_gear_factory = require 'map_gen.maps.crash_site.outpost_data.small_gear_factory' +local medium_gear_factory = require 'map_gen.maps.crash_site.outpost_data.medium_gear_factory' +local big_gear_factory = require 'map_gen.maps.crash_site.outpost_data.big_gear_factory' -local small_circuit_factory = require 'map_gen.presets.crash_site.outpost_data.small_circuit_factory' -local medium_circuit_factory = require 'map_gen.presets.crash_site.outpost_data.medium_circuit_factory' -local big_circuit_factory = require 'map_gen.presets.crash_site.outpost_data.big_circuit_factory' +local small_circuit_factory = require 'map_gen.maps.crash_site.outpost_data.small_circuit_factory' +local medium_circuit_factory = require 'map_gen.maps.crash_site.outpost_data.medium_circuit_factory' +local big_circuit_factory = require 'map_gen.maps.crash_site.outpost_data.big_circuit_factory' -local small_ammo_factory = require 'map_gen.presets.crash_site.outpost_data.small_ammo_factory' -local medium_ammo_factory = require 'map_gen.presets.crash_site.outpost_data.medium_ammo_factory' -local big_ammo_factory = require 'map_gen.presets.crash_site.outpost_data.big_ammo_factory' +local small_ammo_factory = require 'map_gen.maps.crash_site.outpost_data.small_ammo_factory' +local medium_ammo_factory = require 'map_gen.maps.crash_site.outpost_data.medium_ammo_factory' +local big_ammo_factory = require 'map_gen.maps.crash_site.outpost_data.big_ammo_factory' -local small_weapon_factory = require 'map_gen.presets.crash_site.outpost_data.small_weapon_factory' -local medium_weapon_factory = require 'map_gen.presets.crash_site.outpost_data.medium_weapon_factory' -local big_weapon_factory = require 'map_gen.presets.crash_site.outpost_data.big_weapon_factory' +local small_weapon_factory = require 'map_gen.maps.crash_site.outpost_data.small_weapon_factory' +local medium_weapon_factory = require 'map_gen.maps.crash_site.outpost_data.medium_weapon_factory' +local big_weapon_factory = require 'map_gen.maps.crash_site.outpost_data.big_weapon_factory' -local small_science_factory = require 'map_gen.presets.crash_site.outpost_data.small_science_factory' -local medium_science_factory = require 'map_gen.presets.crash_site.outpost_data.medium_science_factory' -local big_science_factory = require 'map_gen.presets.crash_site.outpost_data.big_science_factory' +local small_science_factory = require 'map_gen.maps.crash_site.outpost_data.small_science_factory' +local medium_science_factory = require 'map_gen.maps.crash_site.outpost_data.medium_science_factory' +local big_science_factory = require 'map_gen.maps.crash_site.outpost_data.big_science_factory' -local small_oil_refinery = require 'map_gen.presets.crash_site.outpost_data.small_oil_refinery' -local medium_oil_refinery = require 'map_gen.presets.crash_site.outpost_data.medium_oil_refinery' -local big_oil_refinery = require 'map_gen.presets.crash_site.outpost_data.big_oil_refinery' +local small_oil_refinery = require 'map_gen.maps.crash_site.outpost_data.small_oil_refinery' +local medium_oil_refinery = require 'map_gen.maps.crash_site.outpost_data.medium_oil_refinery' +local big_oil_refinery = require 'map_gen.maps.crash_site.outpost_data.big_oil_refinery' -local small_chemical_factory = require 'map_gen.presets.crash_site.outpost_data.small_chemical_factory' -local medium_chemical_factory = require 'map_gen.presets.crash_site.outpost_data.medium_chemical_factory' -local big_chemical_factory = require 'map_gen.presets.crash_site.outpost_data.big_chemical_factory' +local small_chemical_factory = require 'map_gen.maps.crash_site.outpost_data.small_chemical_factory' +local medium_chemical_factory = require 'map_gen.maps.crash_site.outpost_data.medium_chemical_factory' +local big_chemical_factory = require 'map_gen.maps.crash_site.outpost_data.big_chemical_factory' -local small_power_factory = require 'map_gen.presets.crash_site.outpost_data.small_power_factory' -local medium_power_factory = require 'map_gen.presets.crash_site.outpost_data.medium_power_factory' -local big_power_factory = require 'map_gen.presets.crash_site.outpost_data.big_power_factory' +local small_power_factory = require 'map_gen.maps.crash_site.outpost_data.small_power_factory' +local medium_power_factory = require 'map_gen.maps.crash_site.outpost_data.medium_power_factory' +local big_power_factory = require 'map_gen.maps.crash_site.outpost_data.big_power_factory' -local thin_walls = require 'map_gen.presets.crash_site.outpost_data.thin_walls' +local thin_walls = require 'map_gen.maps.crash_site.outpost_data.thin_walls' -local mini_t1_ammo_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t1_ammo_factory' -local mini_t2_ammo_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t2_ammo_factory' +local mini_t1_ammo_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t1_ammo_factory' +local mini_t2_ammo_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t2_ammo_factory' -local mini_t1_weapon_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t1_weapon_factory' -local mini_t2_weapon_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t2_weapon_factory' +local mini_t1_weapon_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t1_weapon_factory' +local mini_t2_weapon_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t2_weapon_factory' -local mini_t2_logistics_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t2_logistics_factory' -local mini_t3_logistics_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t3_logistics_factory' +local mini_t2_logistics_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t2_logistics_factory' +local mini_t3_logistics_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t3_logistics_factory' -local mini_t1_science_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t1_science_factory' -local mini_t2_science_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t2_science_factory' -local mini_t3_science_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t3_science_factory' +local mini_t1_science_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t1_science_factory' +local mini_t2_science_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t2_science_factory' +local mini_t3_science_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t3_science_factory' -local mini_t1_module_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t1_module_factory' -local mini_t2_module_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t2_module_factory' -local mini_t3_module_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t3_module_factory' +local mini_t1_module_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t1_module_factory' +local mini_t2_module_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t2_module_factory' +local mini_t3_module_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t3_module_factory' -local mini_t1_robotics_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t1_robotics_factory' -local mini_t1_production_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t1_production_factory' -local mini_t2_energy_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t2_energy_factory' -local mini_t1_train_factory = require 'map_gen.presets.crash_site.outpost_data.mini_t1_train_factory' +local mini_t1_robotics_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t1_robotics_factory' +local mini_t1_production_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t1_production_factory' +local mini_t2_energy_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t2_energy_factory' +local mini_t1_train_factory = require 'map_gen.maps.crash_site.outpost_data.mini_t1_train_factory' local spawn_callback_callback = Token.register( diff --git a/map_gen/presets/crash_site/blueprint_extractor.lua b/map_gen/maps/crash_site/blueprint_extractor.lua similarity index 100% rename from map_gen/presets/crash_site/blueprint_extractor.lua rename to map_gen/maps/crash_site/blueprint_extractor.lua diff --git a/map_gen/presets/crash_site/commands.lua b/map_gen/maps/crash_site/commands.lua similarity index 100% rename from map_gen/presets/crash_site/commands.lua rename to map_gen/maps/crash_site/commands.lua diff --git a/map_gen/presets/crash_site/crash_site_toast.lua b/map_gen/maps/crash_site/crash_site_toast.lua similarity index 100% rename from map_gen/presets/crash_site/crash_site_toast.lua rename to map_gen/maps/crash_site/crash_site_toast.lua diff --git a/map_gen/presets/crash_site/entity_died_events.lua b/map_gen/maps/crash_site/entity_died_events.lua similarity index 100% rename from map_gen/presets/crash_site/entity_died_events.lua rename to map_gen/maps/crash_site/entity_died_events.lua diff --git a/map_gen/presets/crash_site/outpost_builder.lua b/map_gen/maps/crash_site/outpost_builder.lua similarity index 99% rename from map_gen/presets/crash_site/outpost_builder.lua rename to map_gen/maps/crash_site/outpost_builder.lua index d8acb74f..a1f21558 100644 --- a/map_gen/presets/crash_site/outpost_builder.lua +++ b/map_gen/maps/crash_site/outpost_builder.lua @@ -7,7 +7,7 @@ local Retailer = require 'features.retailer' local PlayerStats = require 'features.player_stats' local RS = require 'map_gen.shared.redmew_surface' local Server = require 'features.server' -local CrashSiteToast = require 'map_gen.presets.crash_site.crash_site_toast' +local CrashSiteToast = require 'map_gen.maps.crash_site.crash_site_toast' local table = require 'utils.table' --local next = next diff --git a/map_gen/presets/crash_site/outpost_data/artillery_block.lua b/map_gen/maps/crash_site/outpost_data/artillery_block.lua similarity index 96% rename from map_gen/presets/crash_site/outpost_data/artillery_block.lua rename to map_gen/maps/crash_site/outpost_data/artillery_block.lua index 79a4801a..5441f3c2 100644 --- a/map_gen/presets/crash_site/outpost_data/artillery_block.lua +++ b/map_gen/maps/crash_site/outpost_data/artillery_block.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_1_way { turret = {callback = ob.refill_turret_callback, data = ob.artillery_shell_ammo}, diff --git a/map_gen/presets/crash_site/outpost_data/big_ammo_factory.lua b/map_gen/maps/crash_site/outpost_data/big_ammo_factory.lua similarity index 89% rename from map_gen/presets/crash_site/outpost_data/big_ammo_factory.lua rename to map_gen/maps/crash_site/outpost_data/big_ammo_factory.lua index ee94206e..ec53cd6f 100644 --- a/map_gen/presets/crash_site/outpost_data/big_ammo_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_ammo_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -120,7 +120,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.big_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.big_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -162,7 +162,7 @@ local level4 = local artillery = ob.extend_1_way( - require 'map_gen.presets.crash_site.outpost_data.artillery_block', + require 'map_gen.maps.crash_site.outpost_data.artillery_block', {fallback = level4, max_count = 1} ) @@ -174,12 +174,12 @@ return { max_level = 4 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_gun_turrets', - require 'map_gen.presets.crash_site.outpost_data.heavy_laser_turrets', - require 'map_gen.presets.crash_site.outpost_data.heavy_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_gun_turrets', + require 'map_gen.maps.crash_site.outpost_data.heavy_laser_turrets', + require 'map_gen.maps.crash_site.outpost_data.heavy_flame_turrets' }, bases = { - {require 'map_gen.presets.crash_site.outpost_data.laser_block'}, + {require 'map_gen.maps.crash_site.outpost_data.laser_block'}, {level2}, {artillery} } diff --git a/map_gen/presets/crash_site/outpost_data/big_centrifuge.lua b/map_gen/maps/crash_site/outpost_data/big_centrifuge.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/big_centrifuge.lua rename to map_gen/maps/crash_site/outpost_data/big_centrifuge.lua index 0c30c40b..92144a10 100644 --- a/map_gen/presets/crash_site/outpost_data/big_centrifuge.lua +++ b/map_gen/maps/crash_site/outpost_data/big_centrifuge.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/big_chemical_factory.lua b/map_gen/maps/crash_site/outpost_data/big_chemical_factory.lua similarity index 92% rename from map_gen/presets/crash_site/outpost_data/big_chemical_factory.lua rename to map_gen/maps/crash_site/outpost_data/big_chemical_factory.lua index 8a3a9c0a..32d99a3e 100644 --- a/map_gen/presets/crash_site/outpost_data/big_chemical_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_chemical_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -110,8 +110,8 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.big_chemical_plant' -local base_factory2 = require 'map_gen.presets.crash_site.outpost_data.big_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.big_chemical_plant' +local base_factory2 = require 'map_gen.maps.crash_site.outpost_data.big_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -159,7 +159,7 @@ return { max_level = 3 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_flame_turrets' }, bases = { {level3b, level2}, diff --git a/map_gen/presets/crash_site/outpost_data/big_chemical_plant.lua b/map_gen/maps/crash_site/outpost_data/big_chemical_plant.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/big_chemical_plant.lua rename to map_gen/maps/crash_site/outpost_data/big_chemical_plant.lua index b33be574..74ae3b83 100644 --- a/map_gen/presets/crash_site/outpost_data/big_chemical_plant.lua +++ b/map_gen/maps/crash_site/outpost_data/big_chemical_plant.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/big_circuit_factory.lua b/map_gen/maps/crash_site/outpost_data/big_circuit_factory.lua similarity index 94% rename from map_gen/presets/crash_site/outpost_data/big_circuit_factory.lua rename to map_gen/maps/crash_site/outpost_data/big_circuit_factory.lua index 14746c87..5783c633 100644 --- a/map_gen/presets/crash_site/outpost_data/big_circuit_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_circuit_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' @@ -93,7 +93,7 @@ local loot_callback = end ) -local base_factory = require 'map_gen.presets.crash_site.outpost_data.big_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.big_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -147,7 +147,7 @@ return { max_level = 3 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_laser_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_laser_turrets' }, bases = { {level3_c, level2}, diff --git a/map_gen/presets/crash_site/outpost_data/big_copper_plate_factory.lua b/map_gen/maps/crash_site/outpost_data/big_copper_plate_factory.lua similarity index 89% rename from map_gen/presets/crash_site/outpost_data/big_copper_plate_factory.lua rename to map_gen/maps/crash_site/outpost_data/big_copper_plate_factory.lua index 03f29850..6c6d2699 100644 --- a/map_gen/presets/crash_site/outpost_data/big_copper_plate_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_copper_plate_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -48,7 +48,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_furance' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_furance' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -76,7 +76,7 @@ return { max_level = 3 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_gun_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_gun_turrets' }, bases = { {level2, level3}, diff --git a/map_gen/presets/crash_site/outpost_data/big_factory.lua b/map_gen/maps/crash_site/outpost_data/big_factory.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/big_factory.lua rename to map_gen/maps/crash_site/outpost_data/big_factory.lua index ea94ce82..64ed2c72 100644 --- a/map_gen/presets/crash_site/outpost_data/big_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/big_furance.lua b/map_gen/maps/crash_site/outpost_data/big_furance.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/big_furance.lua rename to map_gen/maps/crash_site/outpost_data/big_furance.lua index d11e48e9..c4a9112e 100644 --- a/map_gen/presets/crash_site/outpost_data/big_furance.lua +++ b/map_gen/maps/crash_site/outpost_data/big_furance.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/big_gear_factory.lua b/map_gen/maps/crash_site/outpost_data/big_gear_factory.lua similarity index 95% rename from map_gen/presets/crash_site/outpost_data/big_gear_factory.lua rename to map_gen/maps/crash_site/outpost_data/big_gear_factory.lua index fa2ce30c..2ed82f08 100644 --- a/map_gen/presets/crash_site/outpost_data/big_gear_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_gear_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -125,7 +125,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.big_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.big_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -171,7 +171,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_gun_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_gun_turrets' }, bases = { {level4, level3, level2} diff --git a/map_gen/presets/crash_site/outpost_data/big_iron_plate_factory.lua b/map_gen/maps/crash_site/outpost_data/big_iron_plate_factory.lua similarity index 90% rename from map_gen/presets/crash_site/outpost_data/big_iron_plate_factory.lua rename to map_gen/maps/crash_site/outpost_data/big_iron_plate_factory.lua index 398e01d1..91f54cda 100644 --- a/map_gen/presets/crash_site/outpost_data/big_iron_plate_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_iron_plate_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -72,8 +72,8 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_furance' -local base_factory2 = require 'map_gen.presets.crash_site.outpost_data.big_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_furance' +local base_factory2 = require 'map_gen.maps.crash_site.outpost_data.big_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -120,7 +120,7 @@ return { max_level = 3 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_gun_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_gun_turrets' }, bases = { {level2, level3}, diff --git a/map_gen/presets/crash_site/outpost_data/big_oil_refinery.lua b/map_gen/maps/crash_site/outpost_data/big_oil_refinery.lua similarity index 92% rename from map_gen/presets/crash_site/outpost_data/big_oil_refinery.lua rename to map_gen/maps/crash_site/outpost_data/big_oil_refinery.lua index 78ed2981..f6b61f61 100644 --- a/map_gen/presets/crash_site/outpost_data/big_oil_refinery.lua +++ b/map_gen/maps/crash_site/outpost_data/big_oil_refinery.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -94,8 +94,8 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.big_refinery' -local storage_tank = require 'map_gen.presets.crash_site.outpost_data.storage_tank_block' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.big_refinery' +local storage_tank = require 'map_gen.maps.crash_site.outpost_data.storage_tank_block' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) @@ -134,7 +134,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_flame_turrets' }, bases = { {level4, level2} diff --git a/map_gen/presets/crash_site/outpost_data/big_power_factory.lua b/map_gen/maps/crash_site/outpost_data/big_power_factory.lua similarity index 95% rename from map_gen/presets/crash_site/outpost_data/big_power_factory.lua rename to map_gen/maps/crash_site/outpost_data/big_power_factory.lua index a881ac49..f21bc83c 100644 --- a/map_gen/presets/crash_site/outpost_data/big_power_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_power_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -180,8 +180,8 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.big_factory' -local base_factory2 = require 'map_gen.presets.crash_site.outpost_data.big_centrifuge' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.big_factory' +local base_factory2 = require 'map_gen.maps.crash_site.outpost_data.big_centrifuge' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -230,7 +230,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_gun_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_gun_turrets' }, bases = { {level4, level2} diff --git a/map_gen/presets/crash_site/outpost_data/big_refinery.lua b/map_gen/maps/crash_site/outpost_data/big_refinery.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/big_refinery.lua rename to map_gen/maps/crash_site/outpost_data/big_refinery.lua index e8c69124..1538519b 100644 --- a/map_gen/presets/crash_site/outpost_data/big_refinery.lua +++ b/map_gen/maps/crash_site/outpost_data/big_refinery.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/big_science_factory.lua b/map_gen/maps/crash_site/outpost_data/big_science_factory.lua similarity index 93% rename from map_gen/presets/crash_site/outpost_data/big_science_factory.lua rename to map_gen/maps/crash_site/outpost_data/big_science_factory.lua index b10dc9b2..99a32c89 100644 --- a/map_gen/presets/crash_site/outpost_data/big_science_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_science_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -83,7 +83,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.big_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.big_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -120,7 +120,7 @@ return { max_level = 3 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_laser_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_laser_turrets' }, bases = { {level3, level2}, diff --git a/map_gen/presets/crash_site/outpost_data/big_stone_factory.lua b/map_gen/maps/crash_site/outpost_data/big_stone_factory.lua similarity index 89% rename from map_gen/presets/crash_site/outpost_data/big_stone_factory.lua rename to map_gen/maps/crash_site/outpost_data/big_stone_factory.lua index 3e23c480..7ff6e002 100644 --- a/map_gen/presets/crash_site/outpost_data/big_stone_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_stone_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -83,8 +83,8 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.big_furance' -local base_factory2 = require 'map_gen.presets.crash_site.outpost_data.big_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.big_furance' +local base_factory2 = require 'map_gen.maps.crash_site.outpost_data.big_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -121,8 +121,8 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_gun_turrets', - require 'map_gen.presets.crash_site.outpost_data.walls' + require 'map_gen.maps.crash_site.outpost_data.heavy_gun_turrets', + require 'map_gen.maps.crash_site.outpost_data.walls' }, bases = { {level4, level2} diff --git a/map_gen/presets/crash_site/outpost_data/big_weapon_factory.lua b/map_gen/maps/crash_site/outpost_data/big_weapon_factory.lua similarity index 93% rename from map_gen/presets/crash_site/outpost_data/big_weapon_factory.lua rename to map_gen/maps/crash_site/outpost_data/big_weapon_factory.lua index 83814b3a..08a31160 100644 --- a/map_gen/presets/crash_site/outpost_data/big_weapon_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_weapon_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -224,7 +224,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.big_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.big_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -257,7 +257,7 @@ local level4 = local artillery = ob.extend_1_way( - require 'map_gen.presets.crash_site.outpost_data.artillery_block', + require 'map_gen.maps.crash_site.outpost_data.artillery_block', {fallback = level4, max_count = 1} ) @@ -269,12 +269,12 @@ return { max_level = 4 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_gun_turrets', - require 'map_gen.presets.crash_site.outpost_data.heavy_laser_turrets', - require 'map_gen.presets.crash_site.outpost_data.heavy_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_gun_turrets', + require 'map_gen.maps.crash_site.outpost_data.heavy_laser_turrets', + require 'map_gen.maps.crash_site.outpost_data.heavy_flame_turrets' }, bases = { - {require 'map_gen.presets.crash_site.outpost_data.laser_block'}, + {require 'map_gen.maps.crash_site.outpost_data.laser_block'}, {level2}, {artillery} } diff --git a/map_gen/presets/crash_site/outpost_data/big_worm_turrets.lua b/map_gen/maps/crash_site/outpost_data/big_worm_turrets.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/big_worm_turrets.lua rename to map_gen/maps/crash_site/outpost_data/big_worm_turrets.lua index f871ef72..d09e451b 100644 --- a/map_gen/presets/crash_site/outpost_data/big_worm_turrets.lua +++ b/map_gen/maps/crash_site/outpost_data/big_worm_turrets.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls { ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/heavy_flame_turrets.lua b/map_gen/maps/crash_site/outpost_data/heavy_flame_turrets.lua similarity index 99% rename from map_gen/presets/crash_site/outpost_data/heavy_flame_turrets.lua rename to map_gen/maps/crash_site/outpost_data/heavy_flame_turrets.lua index dbf539d6..77a21e0b 100644 --- a/map_gen/presets/crash_site/outpost_data/heavy_flame_turrets.lua +++ b/map_gen/maps/crash_site/outpost_data/heavy_flame_turrets.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls{ ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/heavy_gun_turrets.lua b/map_gen/maps/crash_site/outpost_data/heavy_gun_turrets.lua similarity index 99% rename from map_gen/presets/crash_site/outpost_data/heavy_gun_turrets.lua rename to map_gen/maps/crash_site/outpost_data/heavy_gun_turrets.lua index 7cf1f036..d73ac9fc 100644 --- a/map_gen/presets/crash_site/outpost_data/heavy_gun_turrets.lua +++ b/map_gen/maps/crash_site/outpost_data/heavy_gun_turrets.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls{ ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/heavy_laser_turrets.lua b/map_gen/maps/crash_site/outpost_data/heavy_laser_turrets.lua similarity index 99% rename from map_gen/presets/crash_site/outpost_data/heavy_laser_turrets.lua rename to map_gen/maps/crash_site/outpost_data/heavy_laser_turrets.lua index 532fca4d..644f0a88 100644 --- a/map_gen/presets/crash_site/outpost_data/heavy_laser_turrets.lua +++ b/map_gen/maps/crash_site/outpost_data/heavy_laser_turrets.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls{ ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/laser_block.lua b/map_gen/maps/crash_site/outpost_data/laser_block.lua similarity index 96% rename from map_gen/presets/crash_site/outpost_data/laser_block.lua rename to map_gen/maps/crash_site/outpost_data/laser_block.lua index f1cbcb23..0e3c2ee5 100644 --- a/map_gen/presets/crash_site/outpost_data/laser_block.lua +++ b/map_gen/maps/crash_site/outpost_data/laser_block.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_1_way { turret = {callback = ob.power_source_callback, data = ob.laser_turrent_power_source}, diff --git a/map_gen/presets/crash_site/outpost_data/light_flame_turrets.lua b/map_gen/maps/crash_site/outpost_data/light_flame_turrets.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/light_flame_turrets.lua rename to map_gen/maps/crash_site/outpost_data/light_flame_turrets.lua index 4046687c..b9ea0c5d 100644 --- a/map_gen/presets/crash_site/outpost_data/light_flame_turrets.lua +++ b/map_gen/maps/crash_site/outpost_data/light_flame_turrets.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls{ ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/light_gun_turrets.lua b/map_gen/maps/crash_site/outpost_data/light_gun_turrets.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/light_gun_turrets.lua rename to map_gen/maps/crash_site/outpost_data/light_gun_turrets.lua index f73871cc..9d1dbad1 100644 --- a/map_gen/presets/crash_site/outpost_data/light_gun_turrets.lua +++ b/map_gen/maps/crash_site/outpost_data/light_gun_turrets.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls{ ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/light_laser_turrets.lua b/map_gen/maps/crash_site/outpost_data/light_laser_turrets.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/light_laser_turrets.lua rename to map_gen/maps/crash_site/outpost_data/light_laser_turrets.lua index 2634948a..46827bec 100644 --- a/map_gen/presets/crash_site/outpost_data/light_laser_turrets.lua +++ b/map_gen/maps/crash_site/outpost_data/light_laser_turrets.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls{ ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/medium_ammo_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_ammo_factory.lua similarity index 91% rename from map_gen/presets/crash_site/outpost_data/medium_ammo_factory.lua rename to map_gen/maps/crash_site/outpost_data/medium_ammo_factory.lua index 33660d97..9f8ce461 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_ammo_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_ammo_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -104,7 +104,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -150,9 +150,9 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_gun_turrets', - require 'map_gen.presets.crash_site.outpost_data.heavy_laser_turrets', - require 'map_gen.presets.crash_site.outpost_data.heavy_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_gun_turrets', + require 'map_gen.maps.crash_site.outpost_data.heavy_laser_turrets', + require 'map_gen.maps.crash_site.outpost_data.heavy_flame_turrets' }, bases = { {level4, level3b, level2} diff --git a/map_gen/presets/crash_site/outpost_data/medium_centrifuge.lua b/map_gen/maps/crash_site/outpost_data/medium_centrifuge.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/medium_centrifuge.lua rename to map_gen/maps/crash_site/outpost_data/medium_centrifuge.lua index 0bca3649..437b08f2 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_centrifuge.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_centrifuge.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/medium_chemical_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_chemical_factory.lua similarity index 93% rename from map_gen/presets/crash_site/outpost_data/medium_chemical_factory.lua rename to map_gen/maps/crash_site/outpost_data/medium_chemical_factory.lua index 83dbce54..b3c72fe3 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_chemical_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_chemical_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -96,7 +96,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_chemical_plant' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_chemical_plant' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -133,7 +133,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.medium_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.medium_flame_turrets' }, bases = { {level4, level3, level2} diff --git a/map_gen/presets/crash_site/outpost_data/medium_chemical_plant.lua b/map_gen/maps/crash_site/outpost_data/medium_chemical_plant.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/medium_chemical_plant.lua rename to map_gen/maps/crash_site/outpost_data/medium_chemical_plant.lua index f8eda188..62cd40e3 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_chemical_plant.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_chemical_plant.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/medium_circuit_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_circuit_factory.lua similarity index 91% rename from map_gen/presets/crash_site/outpost_data/medium_circuit_factory.lua rename to map_gen/maps/crash_site/outpost_data/medium_circuit_factory.lua index 45f98498..f460b7ba 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_circuit_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_circuit_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' @@ -70,7 +70,7 @@ local loot_callback = end ) -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -106,7 +106,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.medium_laser_turrets' + require 'map_gen.maps.crash_site.outpost_data.medium_laser_turrets' }, bases = { {level4, level3, level2} diff --git a/map_gen/presets/crash_site/outpost_data/medium_copper_plate_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_copper_plate_factory.lua similarity index 89% rename from map_gen/presets/crash_site/outpost_data/medium_copper_plate_factory.lua rename to map_gen/maps/crash_site/outpost_data/medium_copper_plate_factory.lua index fc9fac70..94f946cd 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_copper_plate_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_copper_plate_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -48,7 +48,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_furance' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_furance' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -76,7 +76,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.medium_gun_turrets' + require 'map_gen.maps.crash_site.outpost_data.medium_gun_turrets' }, bases = { {level4, level2} diff --git a/map_gen/presets/crash_site/outpost_data/medium_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_factory.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/medium_factory.lua rename to map_gen/maps/crash_site/outpost_data/medium_factory.lua index 75fb1870..0b9db343 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/medium_flame_turrets.lua b/map_gen/maps/crash_site/outpost_data/medium_flame_turrets.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/medium_flame_turrets.lua rename to map_gen/maps/crash_site/outpost_data/medium_flame_turrets.lua index 6cad69a8..5dd99884 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_flame_turrets.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_flame_turrets.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls{ ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/medium_furance.lua b/map_gen/maps/crash_site/outpost_data/medium_furance.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/medium_furance.lua rename to map_gen/maps/crash_site/outpost_data/medium_furance.lua index 3231bbe0..6e2b64e0 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_furance.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_furance.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/medium_gear_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_gear_factory.lua similarity index 95% rename from map_gen/presets/crash_site/outpost_data/medium_gear_factory.lua rename to map_gen/maps/crash_site/outpost_data/medium_gear_factory.lua index f0017fce..9e477200 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_gear_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_gear_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -125,7 +125,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -172,7 +172,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.medium_gun_turrets' + require 'map_gen.maps.crash_site.outpost_data.medium_gun_turrets' }, bases = { {level4, level3, level2} diff --git a/map_gen/presets/crash_site/outpost_data/medium_gun_turrets.lua b/map_gen/maps/crash_site/outpost_data/medium_gun_turrets.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/medium_gun_turrets.lua rename to map_gen/maps/crash_site/outpost_data/medium_gun_turrets.lua index 50887967..4861eaaa 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_gun_turrets.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_gun_turrets.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls{ ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/medium_iron_plate_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_iron_plate_factory.lua similarity index 90% rename from map_gen/presets/crash_site/outpost_data/medium_iron_plate_factory.lua rename to map_gen/maps/crash_site/outpost_data/medium_iron_plate_factory.lua index 1ff8f884..16c29257 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_iron_plate_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_iron_plate_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -56,7 +56,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_furance' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_furance' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -94,7 +94,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.medium_gun_turrets' + require 'map_gen.maps.crash_site.outpost_data.medium_gun_turrets' }, bases = { {level4, level3, level2} diff --git a/map_gen/presets/crash_site/outpost_data/medium_laser_turrets.lua b/map_gen/maps/crash_site/outpost_data/medium_laser_turrets.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/medium_laser_turrets.lua rename to map_gen/maps/crash_site/outpost_data/medium_laser_turrets.lua index 506cba33..c9900a7e 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_laser_turrets.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_laser_turrets.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls{ ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/medium_oil_refinery.lua b/map_gen/maps/crash_site/outpost_data/medium_oil_refinery.lua similarity index 91% rename from map_gen/presets/crash_site/outpost_data/medium_oil_refinery.lua rename to map_gen/maps/crash_site/outpost_data/medium_oil_refinery.lua index b584b20d..443966e3 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_oil_refinery.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_oil_refinery.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -94,8 +94,8 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_refinery' -local storage_tank = require 'map_gen.presets.crash_site.outpost_data.storage_tank_block' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_refinery' +local storage_tank = require 'map_gen.maps.crash_site.outpost_data.storage_tank_block' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) @@ -134,7 +134,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.medium_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.medium_flame_turrets' }, bases = { {level4, level2} diff --git a/map_gen/presets/crash_site/outpost_data/medium_power_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_power_factory.lua similarity index 94% rename from map_gen/presets/crash_site/outpost_data/medium_power_factory.lua rename to map_gen/maps/crash_site/outpost_data/medium_power_factory.lua index 836e32e3..dd90b4d6 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_power_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_power_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -121,7 +121,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -160,7 +160,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.medium_laser_turrets' + require 'map_gen.maps.crash_site.outpost_data.medium_laser_turrets' }, bases = { {level4, level2} diff --git a/map_gen/presets/crash_site/outpost_data/medium_refinery.lua b/map_gen/maps/crash_site/outpost_data/medium_refinery.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/medium_refinery.lua rename to map_gen/maps/crash_site/outpost_data/medium_refinery.lua index 43f04155..71f75722 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_refinery.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_refinery.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/medium_science_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_science_factory.lua similarity index 92% rename from map_gen/presets/crash_site/outpost_data/medium_science_factory.lua rename to map_gen/maps/crash_site/outpost_data/medium_science_factory.lua index 74057e94..19fb7426 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_science_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_science_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -69,7 +69,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -104,7 +104,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.medium_laser_turrets' + require 'map_gen.maps.crash_site.outpost_data.medium_laser_turrets' }, bases = { {level4, level3b, level2} diff --git a/map_gen/presets/crash_site/outpost_data/medium_stone_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_stone_factory.lua similarity index 88% rename from map_gen/presets/crash_site/outpost_data/medium_stone_factory.lua rename to map_gen/maps/crash_site/outpost_data/medium_stone_factory.lua index 4c621031..ffa369b6 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_stone_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_stone_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -76,8 +76,8 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_furance' -local base_factory2 = require 'map_gen.presets.crash_site.outpost_data.medium_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_furance' +local base_factory2 = require 'map_gen.maps.crash_site.outpost_data.medium_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -115,8 +115,8 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.medium_gun_turrets', - require 'map_gen.presets.crash_site.outpost_data.walls' + require 'map_gen.maps.crash_site.outpost_data.medium_gun_turrets', + require 'map_gen.maps.crash_site.outpost_data.walls' }, bases = { {level4, level2} diff --git a/map_gen/presets/crash_site/outpost_data/medium_weapon_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_weapon_factory.lua similarity index 94% rename from map_gen/presets/crash_site/outpost_data/medium_weapon_factory.lua rename to map_gen/maps/crash_site/outpost_data/medium_weapon_factory.lua index bbf84a62..5a7e279a 100644 --- a/map_gen/presets/crash_site/outpost_data/medium_weapon_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_weapon_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -201,7 +201,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.medium_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -247,9 +247,9 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.heavy_gun_turrets', - require 'map_gen.presets.crash_site.outpost_data.heavy_laser_turrets', - require 'map_gen.presets.crash_site.outpost_data.heavy_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.heavy_gun_turrets', + require 'map_gen.maps.crash_site.outpost_data.heavy_laser_turrets', + require 'map_gen.maps.crash_site.outpost_data.heavy_flame_turrets' }, bases = { {level4, level3b, level2} diff --git a/map_gen/presets/crash_site/outpost_data/mini_blank.lua b/map_gen/maps/crash_site/outpost_data/mini_blank.lua similarity index 84% rename from map_gen/presets/crash_site/outpost_data/mini_blank.lua rename to map_gen/maps/crash_site/outpost_data/mini_blank.lua index e58b0287..2db9b747 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_blank.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_blank.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_1_way { part_size = 3, diff --git a/map_gen/presets/crash_site/outpost_data/mini_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_factory.lua similarity index 87% rename from map_gen/presets/crash_site/outpost_data/mini_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_factory.lua index c7042480..f5b6d66c 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_1_way { part_size = 3, diff --git a/map_gen/presets/crash_site/outpost_data/mini_gun_turret.lua b/map_gen/maps/crash_site/outpost_data/mini_gun_turret.lua similarity index 96% rename from map_gen/presets/crash_site/outpost_data/mini_gun_turret.lua rename to map_gen/maps/crash_site/outpost_data/mini_gun_turret.lua index 3347a601..78f0482e 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_gun_turret.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_gun_turret.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls { ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/mini_gun_turret_block.lua b/map_gen/maps/crash_site/outpost_data/mini_gun_turret_block.lua similarity index 88% rename from map_gen/presets/crash_site/outpost_data/mini_gun_turret_block.lua rename to map_gen/maps/crash_site/outpost_data/mini_gun_turret_block.lua index 8b4adeee..7e1f1671 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_gun_turret_block.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_gun_turret_block.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_1_way { part_size = 3, diff --git a/map_gen/presets/crash_site/outpost_data/mini_hazard_wall_chests.lua b/map_gen/maps/crash_site/outpost_data/mini_hazard_wall_chests.lua similarity index 97% rename from map_gen/presets/crash_site/outpost_data/mini_hazard_wall_chests.lua rename to map_gen/maps/crash_site/outpost_data/mini_hazard_wall_chests.lua index 5a00cf67..3061fda0 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_hazard_wall_chests.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_hazard_wall_chests.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls { ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/mini_hazard_walls.lua b/map_gen/maps/crash_site/outpost_data/mini_hazard_walls.lua similarity index 96% rename from map_gen/presets/crash_site/outpost_data/mini_hazard_walls.lua rename to map_gen/maps/crash_site/outpost_data/mini_hazard_walls.lua index cbc05c85..bcec0653 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_hazard_walls.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_hazard_walls.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls { ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/mini_laser_turret.lua b/map_gen/maps/crash_site/outpost_data/mini_laser_turret.lua similarity index 96% rename from map_gen/presets/crash_site/outpost_data/mini_laser_turret.lua rename to map_gen/maps/crash_site/outpost_data/mini_laser_turret.lua index 4db97f1d..ce6c2eae 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_laser_turret.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_laser_turret.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls { ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/mini_laser_turret_block.lua b/map_gen/maps/crash_site/outpost_data/mini_laser_turret_block.lua similarity index 91% rename from map_gen/presets/crash_site/outpost_data/mini_laser_turret_block.lua rename to map_gen/maps/crash_site/outpost_data/mini_laser_turret_block.lua index 4f6f70be..b86744b1 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_laser_turret_block.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_laser_turret_block.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_1_way { part_size = 3, diff --git a/map_gen/presets/crash_site/outpost_data/mini_t1_ammo_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t1_ammo_factory.lua similarity index 84% rename from map_gen/presets/crash_site/outpost_data/mini_t1_ammo_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t1_ammo_factory.lua index 86bb72d4..b7be7ee5 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t1_ammo_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t1_ammo_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -64,15 +64,15 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = ob.extend_1_way(turret, {fallback = wall_chests, max_count = 2}) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = ob.extend_1_way(gun_turret_block, {fallback = factory}) diff --git a/map_gen/presets/crash_site/outpost_data/mini_t1_module_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t1_module_factory.lua similarity index 82% rename from map_gen/presets/crash_site/outpost_data/mini_t1_module_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t1_module_factory.lua index 54921162..daf595f1 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t1_module_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t1_module_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -52,8 +52,8 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = @@ -66,9 +66,9 @@ turret = } ) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = diff --git a/map_gen/presets/crash_site/outpost_data/mini_t1_production_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t1_production_factory.lua similarity index 83% rename from map_gen/presets/crash_site/outpost_data/mini_t1_production_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t1_production_factory.lua index 0c7a7814..eea01630 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t1_production_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t1_production_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -61,15 +61,15 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = ob.extend_1_way(turret, {fallback = wall_chests, max_count = 2}) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = ob.extend_1_way(gun_turret_block, {fallback = factory}) diff --git a/map_gen/presets/crash_site/outpost_data/mini_t1_robotics_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t1_robotics_factory.lua similarity index 84% rename from map_gen/presets/crash_site/outpost_data/mini_t1_robotics_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t1_robotics_factory.lua index 51062069..41a0278f 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t1_robotics_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t1_robotics_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -57,8 +57,8 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = @@ -71,9 +71,9 @@ turret = } ) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = diff --git a/map_gen/presets/crash_site/outpost_data/mini_t1_science_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t1_science_factory.lua similarity index 80% rename from map_gen/presets/crash_site/outpost_data/mini_t1_science_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t1_science_factory.lua index 0607b0ee..387ba127 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t1_science_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t1_science_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -43,8 +43,8 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = @@ -57,9 +57,9 @@ turret = } ) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = diff --git a/map_gen/presets/crash_site/outpost_data/mini_t1_train_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t1_train_factory.lua similarity index 79% rename from map_gen/presets/crash_site/outpost_data/mini_t1_train_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t1_train_factory.lua index 8cf2d5f4..0671e03d 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t1_train_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t1_train_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -42,15 +42,15 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = ob.extend_1_way(turret, {fallback = wall_chests, max_count = 2}) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = ob.extend_1_way(gun_turret_block, {fallback = factory}) diff --git a/map_gen/presets/crash_site/outpost_data/mini_t1_weapon_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t1_weapon_factory.lua similarity index 81% rename from map_gen/presets/crash_site/outpost_data/mini_t1_weapon_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t1_weapon_factory.lua index df912e9b..b6aa780b 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t1_weapon_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t1_weapon_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -49,15 +49,15 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = ob.extend_1_way(turret, {fallback = wall_chests, max_count = 2}) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = ob.extend_1_way(gun_turret_block, {fallback = factory}) diff --git a/map_gen/presets/crash_site/outpost_data/mini_t2_ammo_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t2_ammo_factory.lua similarity index 84% rename from map_gen/presets/crash_site/outpost_data/mini_t2_ammo_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t2_ammo_factory.lua index 0d9cc771..1974e377 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t2_ammo_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t2_ammo_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -56,8 +56,8 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = @@ -70,9 +70,9 @@ turret = } ) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = diff --git a/map_gen/presets/crash_site/outpost_data/mini_t2_energy_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t2_energy_factory.lua similarity index 82% rename from map_gen/presets/crash_site/outpost_data/mini_t2_energy_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t2_energy_factory.lua index 03da7e28..4553dc5a 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t2_energy_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t2_energy_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -47,8 +47,8 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = @@ -61,9 +61,9 @@ turret = } ) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = diff --git a/map_gen/presets/crash_site/outpost_data/mini_t2_logistics_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t2_logistics_factory.lua similarity index 84% rename from map_gen/presets/crash_site/outpost_data/mini_t2_logistics_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t2_logistics_factory.lua index f01e9059..c70eb225 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t2_logistics_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t2_logistics_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -68,15 +68,15 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = ob.extend_1_way(turret, {fallback = wall_chests, max_count = 2}) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = ob.extend_1_way(gun_turret_block, {fallback = factory}) diff --git a/map_gen/presets/crash_site/outpost_data/mini_t2_module_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t2_module_factory.lua similarity index 80% rename from map_gen/presets/crash_site/outpost_data/mini_t2_module_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t2_module_factory.lua index 4eafb977..73ebe3b4 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t2_module_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t2_module_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -52,15 +52,15 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_hazard_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_laser_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_hazard_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_laser_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = ob.extend_walls(turret, {fallback = wall_chests, max_count = 2}) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local laser_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_laser_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local laser_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_laser_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = ob.extend_1_way(laser_turret_block, {fallback = factory}) diff --git a/map_gen/presets/crash_site/outpost_data/mini_t2_science_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t2_science_factory.lua similarity index 77% rename from map_gen/presets/crash_site/outpost_data/mini_t2_science_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t2_science_factory.lua index 3cb804f5..42d36a2e 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t2_science_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t2_science_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -44,15 +44,15 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_hazard_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_laser_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_hazard_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_laser_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = ob.extend_walls(turret, {fallback = wall_chests, max_count = 2}) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local laser_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_laser_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local laser_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_laser_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = ob.extend_1_way(laser_turret_block, {fallback = factory}) diff --git a/map_gen/presets/crash_site/outpost_data/mini_t2_weapon_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t2_weapon_factory.lua similarity index 85% rename from map_gen/presets/crash_site/outpost_data/mini_t2_weapon_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t2_weapon_factory.lua index 7a7aab63..9cb2794b 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t2_weapon_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t2_weapon_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -55,8 +55,8 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = @@ -69,9 +69,9 @@ turret = } ) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = diff --git a/map_gen/presets/crash_site/outpost_data/mini_t3_logistics_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t3_logistics_factory.lua similarity index 85% rename from map_gen/presets/crash_site/outpost_data/mini_t3_logistics_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t3_logistics_factory.lua index 9f7e1c7d..a6893e78 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t3_logistics_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t3_logistics_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -68,8 +68,8 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = @@ -82,9 +82,9 @@ turret = } ) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local gun_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_gun_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local gun_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_gun_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = diff --git a/map_gen/presets/crash_site/outpost_data/mini_t3_module_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t3_module_factory.lua similarity index 80% rename from map_gen/presets/crash_site/outpost_data/mini_t3_module_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t3_module_factory.lua index bc76ced7..544b9cef 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t3_module_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t3_module_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -52,15 +52,15 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_hazard_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_laser_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_hazard_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_laser_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = ob.extend_walls(turret, {fallback = wall_chests, max_count = 2}) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local laser_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_laser_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local laser_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_laser_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = ob.extend_1_way(laser_turret_block, {fallback = factory}) diff --git a/map_gen/presets/crash_site/outpost_data/mini_t3_science_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t3_science_factory.lua similarity index 78% rename from map_gen/presets/crash_site/outpost_data/mini_t3_science_factory.lua rename to map_gen/maps/crash_site/outpost_data/mini_t3_science_factory.lua index 56e9cd77..e3f4d04e 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_t3_science_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t3_science_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -44,15 +44,15 @@ local factory_callback = { } } -local wall_chests = require 'map_gen.presets.crash_site.outpost_data.mini_hazard_wall_chests' -local turret = require 'map_gen.presets.crash_site.outpost_data.mini_laser_turret' +local wall_chests = require 'map_gen.maps.crash_site.outpost_data.mini_hazard_wall_chests' +local turret = require 'map_gen.maps.crash_site.outpost_data.mini_laser_turret' wall_chests = ob.extend_walls(wall_chests, {loot = {callback = loot_callback}}) turret = ob.extend_walls(turret, {fallback = wall_chests, max_count = 2}) -local blank = require 'map_gen.presets.crash_site.outpost_data.mini_blank' -local base_factory = require 'map_gen.presets.crash_site.outpost_data.mini_factory' -local laser_turret_block = require 'map_gen.presets.crash_site.outpost_data.mini_laser_turret_block' +local blank = require 'map_gen.maps.crash_site.outpost_data.mini_blank' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.mini_factory' +local laser_turret_block = require 'map_gen.maps.crash_site.outpost_data.mini_laser_turret_block' local factory = ob.extend_1_way(base_factory, {factory = factory_callback, fallback = blank}) local gun = ob.extend_1_way(laser_turret_block, {fallback = factory}) diff --git a/map_gen/presets/crash_site/outpost_data/mini_wall_chests.lua b/map_gen/maps/crash_site/outpost_data/mini_wall_chests.lua similarity index 96% rename from map_gen/presets/crash_site/outpost_data/mini_wall_chests.lua rename to map_gen/maps/crash_site/outpost_data/mini_wall_chests.lua index ab506030..55ad1b1f 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_wall_chests.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_wall_chests.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls { ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/mini_walls.lua b/map_gen/maps/crash_site/outpost_data/mini_walls.lua similarity index 95% rename from map_gen/presets/crash_site/outpost_data/mini_walls.lua rename to map_gen/maps/crash_site/outpost_data/mini_walls.lua index f01c376f..737d9a78 100644 --- a/map_gen/presets/crash_site/outpost_data/mini_walls.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_walls.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls { ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/nuclear_reactor_block.lua b/map_gen/maps/crash_site/outpost_data/nuclear_reactor_block.lua similarity index 95% rename from map_gen/presets/crash_site/outpost_data/nuclear_reactor_block.lua rename to map_gen/maps/crash_site/outpost_data/nuclear_reactor_block.lua index f4317406..5d73440d 100644 --- a/map_gen/presets/crash_site/outpost_data/nuclear_reactor_block.lua +++ b/map_gen/maps/crash_site/outpost_data/nuclear_reactor_block.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' ob.make_1_way { force = 'neutral', diff --git a/map_gen/presets/crash_site/outpost_data/small_ammo_factory.lua b/map_gen/maps/crash_site/outpost_data/small_ammo_factory.lua similarity index 89% rename from map_gen/presets/crash_site/outpost_data/small_ammo_factory.lua rename to map_gen/maps/crash_site/outpost_data/small_ammo_factory.lua index e4127690..06e9d581 100644 --- a/map_gen/presets/crash_site/outpost_data/small_ammo_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_ammo_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -85,7 +85,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.small_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -122,9 +122,9 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.medium_gun_turrets', - require 'map_gen.presets.crash_site.outpost_data.medium_laser_turrets', - require 'map_gen.presets.crash_site.outpost_data.medium_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.medium_gun_turrets', + require 'map_gen.maps.crash_site.outpost_data.medium_laser_turrets', + require 'map_gen.maps.crash_site.outpost_data.medium_flame_turrets' }, bases = { {level4, level2} diff --git a/map_gen/presets/crash_site/outpost_data/small_centrifuge.lua b/map_gen/maps/crash_site/outpost_data/small_centrifuge.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/small_centrifuge.lua rename to map_gen/maps/crash_site/outpost_data/small_centrifuge.lua index 9c6d252f..96ddc890 100644 --- a/map_gen/presets/crash_site/outpost_data/small_centrifuge.lua +++ b/map_gen/maps/crash_site/outpost_data/small_centrifuge.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/small_chemical_factory.lua b/map_gen/maps/crash_site/outpost_data/small_chemical_factory.lua similarity index 92% rename from map_gen/presets/crash_site/outpost_data/small_chemical_factory.lua rename to map_gen/maps/crash_site/outpost_data/small_chemical_factory.lua index 4684fcee..eb39fd45 100644 --- a/map_gen/presets/crash_site/outpost_data/small_chemical_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_chemical_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -82,7 +82,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_chemical_plant' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.small_chemical_plant' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -119,7 +119,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.light_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.light_flame_turrets' }, bases = { {level4, level3, level2} diff --git a/map_gen/presets/crash_site/outpost_data/small_chemical_plant.lua b/map_gen/maps/crash_site/outpost_data/small_chemical_plant.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/small_chemical_plant.lua rename to map_gen/maps/crash_site/outpost_data/small_chemical_plant.lua index e2659515..7cd8cace 100644 --- a/map_gen/presets/crash_site/outpost_data/small_chemical_plant.lua +++ b/map_gen/maps/crash_site/outpost_data/small_chemical_plant.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/small_circuit_factory.lua b/map_gen/maps/crash_site/outpost_data/small_circuit_factory.lua similarity index 87% rename from map_gen/presets/crash_site/outpost_data/small_circuit_factory.lua rename to map_gen/maps/crash_site/outpost_data/small_circuit_factory.lua index 74a9feec..f3bb2bcd 100644 --- a/map_gen/presets/crash_site/outpost_data/small_circuit_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_circuit_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' @@ -56,11 +56,11 @@ local loot_callback = end ) -local gun_turrets = require 'map_gen.presets.crash_site.outpost_data.light_gun_turrets' -local laser_turrets = require 'map_gen.presets.crash_site.outpost_data.light_laser_turrets' +local gun_turrets = require 'map_gen.maps.crash_site.outpost_data.light_gun_turrets' +local laser_turrets = require 'map_gen.maps.crash_site.outpost_data.light_laser_turrets' laser_turrets = ob.extend_walls(laser_turrets, {max_count = 4, fallback = gun_turrets}) -local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.small_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = diff --git a/map_gen/presets/crash_site/outpost_data/small_copper_plate_factory.lua b/map_gen/maps/crash_site/outpost_data/small_copper_plate_factory.lua similarity index 85% rename from map_gen/presets/crash_site/outpost_data/small_copper_plate_factory.lua rename to map_gen/maps/crash_site/outpost_data/small_copper_plate_factory.lua index e25a17ba..259ca58e 100644 --- a/map_gen/presets/crash_site/outpost_data/small_copper_plate_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_copper_plate_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -48,11 +48,11 @@ local market = { } } -local turrets = require 'map_gen.presets.crash_site.outpost_data.light_gun_turrets' -local worms = require 'map_gen.presets.crash_site.outpost_data.big_worm_turrets' +local turrets = require 'map_gen.maps.crash_site.outpost_data.light_gun_turrets' +local worms = require 'map_gen.maps.crash_site.outpost_data.big_worm_turrets' worms = ob.extend_walls(worms, {max_count = 2, fallback = turrets}) -local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_furance' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.small_furance' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = diff --git a/map_gen/presets/crash_site/outpost_data/small_factory.lua b/map_gen/maps/crash_site/outpost_data/small_factory.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/small_factory.lua rename to map_gen/maps/crash_site/outpost_data/small_factory.lua index 435d3684..3a9e4617 100644 --- a/map_gen/presets/crash_site/outpost_data/small_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/small_furance.lua b/map_gen/maps/crash_site/outpost_data/small_furance.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/small_furance.lua rename to map_gen/maps/crash_site/outpost_data/small_furance.lua index 5e961bd9..a4671e5b 100644 --- a/map_gen/presets/crash_site/outpost_data/small_furance.lua +++ b/map_gen/maps/crash_site/outpost_data/small_furance.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/small_gear_factory.lua b/map_gen/maps/crash_site/outpost_data/small_gear_factory.lua similarity index 91% rename from map_gen/presets/crash_site/outpost_data/small_gear_factory.lua rename to map_gen/maps/crash_site/outpost_data/small_gear_factory.lua index e494fa63..ee907f60 100644 --- a/map_gen/presets/crash_site/outpost_data/small_gear_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_gear_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -91,11 +91,11 @@ local market = { } } -local turrets = require 'map_gen.presets.crash_site.outpost_data.light_gun_turrets' -local worms = require 'map_gen.presets.crash_site.outpost_data.big_worm_turrets' +local turrets = require 'map_gen.maps.crash_site.outpost_data.light_gun_turrets' +local worms = require 'map_gen.maps.crash_site.outpost_data.big_worm_turrets' worms = ob.extend_walls(worms, {max_count = 2, fallback = turrets}) -local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.small_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = diff --git a/map_gen/presets/crash_site/outpost_data/small_iron_plate_factory.lua b/map_gen/maps/crash_site/outpost_data/small_iron_plate_factory.lua similarity index 85% rename from map_gen/presets/crash_site/outpost_data/small_iron_plate_factory.lua rename to map_gen/maps/crash_site/outpost_data/small_iron_plate_factory.lua index 35c859ad..ec4be8ae 100644 --- a/map_gen/presets/crash_site/outpost_data/small_iron_plate_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_iron_plate_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -48,11 +48,11 @@ local market = { } } -local turrets = require 'map_gen.presets.crash_site.outpost_data.light_gun_turrets' -local worms = require 'map_gen.presets.crash_site.outpost_data.big_worm_turrets' +local turrets = require 'map_gen.maps.crash_site.outpost_data.light_gun_turrets' +local worms = require 'map_gen.maps.crash_site.outpost_data.big_worm_turrets' worms = ob.extend_walls(worms, {max_count = 2, fallback = turrets}) -local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_furance' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.small_furance' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = diff --git a/map_gen/presets/crash_site/outpost_data/small_oil_refinery.lua b/map_gen/maps/crash_site/outpost_data/small_oil_refinery.lua similarity index 91% rename from map_gen/presets/crash_site/outpost_data/small_oil_refinery.lua rename to map_gen/maps/crash_site/outpost_data/small_oil_refinery.lua index bd2a6b66..b3111584 100644 --- a/map_gen/presets/crash_site/outpost_data/small_oil_refinery.lua +++ b/map_gen/maps/crash_site/outpost_data/small_oil_refinery.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -94,8 +94,8 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_refinery' -local storage_tank = require 'map_gen.presets.crash_site.outpost_data.storage_tank_block' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.small_refinery' +local storage_tank = require 'map_gen.maps.crash_site.outpost_data.storage_tank_block' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) @@ -134,7 +134,7 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.light_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.light_flame_turrets' }, bases = { {level4, level2} diff --git a/map_gen/presets/crash_site/outpost_data/small_power_factory.lua b/map_gen/maps/crash_site/outpost_data/small_power_factory.lua similarity index 89% rename from map_gen/presets/crash_site/outpost_data/small_power_factory.lua rename to map_gen/maps/crash_site/outpost_data/small_power_factory.lua index 9e1f2497..6d0ec07c 100644 --- a/map_gen/presets/crash_site/outpost_data/small_power_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_power_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -96,12 +96,12 @@ local market = { } } -local turrets = require 'map_gen.presets.crash_site.outpost_data.light_gun_turrets' -local worms = require 'map_gen.presets.crash_site.outpost_data.big_worm_turrets' +local turrets = require 'map_gen.maps.crash_site.outpost_data.light_gun_turrets' +local worms = require 'map_gen.maps.crash_site.outpost_data.big_worm_turrets' worms = ob.extend_walls(worms, {max_count = 2, fallback = turrets}) -local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_furance' -local base_factory2 = require 'map_gen.presets.crash_site.outpost_data.small_chemical_plant' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.small_furance' +local base_factory2 = require 'map_gen.maps.crash_site.outpost_data.small_chemical_plant' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = diff --git a/map_gen/presets/crash_site/outpost_data/small_refinery.lua b/map_gen/maps/crash_site/outpost_data/small_refinery.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/small_refinery.lua rename to map_gen/maps/crash_site/outpost_data/small_refinery.lua index fbee598e..6f27eafb 100644 --- a/map_gen/presets/crash_site/outpost_data/small_refinery.lua +++ b/map_gen/maps/crash_site/outpost_data/small_refinery.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local level2 = ob.make_1_way { diff --git a/map_gen/presets/crash_site/outpost_data/small_science_factory.lua b/map_gen/maps/crash_site/outpost_data/small_science_factory.lua similarity index 88% rename from map_gen/presets/crash_site/outpost_data/small_science_factory.lua rename to map_gen/maps/crash_site/outpost_data/small_science_factory.lua index 702829d7..4bb587b0 100644 --- a/map_gen/presets/crash_site/outpost_data/small_science_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_science_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -61,11 +61,11 @@ local market = { } } -local gun_turrets = require 'map_gen.presets.crash_site.outpost_data.light_gun_turrets' -local laser_turrets = require 'map_gen.presets.crash_site.outpost_data.light_laser_turrets' +local gun_turrets = require 'map_gen.maps.crash_site.outpost_data.light_gun_turrets' +local laser_turrets = require 'map_gen.maps.crash_site.outpost_data.light_laser_turrets' laser_turrets = ob.extend_walls(laser_turrets, {max_count = 4, fallback = gun_turrets}) -local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.small_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = diff --git a/map_gen/presets/crash_site/outpost_data/small_stone_factory.lua b/map_gen/maps/crash_site/outpost_data/small_stone_factory.lua similarity index 87% rename from map_gen/presets/crash_site/outpost_data/small_stone_factory.lua rename to map_gen/maps/crash_site/outpost_data/small_stone_factory.lua index db9c7e27..8084e164 100644 --- a/map_gen/presets/crash_site/outpost_data/small_stone_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_stone_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -69,8 +69,8 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_furance' -local base_factory2 = require 'map_gen.presets.crash_site.outpost_data.small_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.small_furance' +local base_factory2 = require 'map_gen.maps.crash_site.outpost_data.small_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -107,8 +107,8 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.light_gun_turrets', - require 'map_gen.presets.crash_site.outpost_data.walls' + require 'map_gen.maps.crash_site.outpost_data.light_gun_turrets', + require 'map_gen.maps.crash_site.outpost_data.walls' }, bases = { {level4, level2} diff --git a/map_gen/presets/crash_site/outpost_data/small_weapon_factory.lua b/map_gen/maps/crash_site/outpost_data/small_weapon_factory.lua similarity index 93% rename from map_gen/presets/crash_site/outpost_data/small_weapon_factory.lua rename to map_gen/maps/crash_site/outpost_data/small_weapon_factory.lua index ab7935bf..9e9250b6 100644 --- a/map_gen/presets/crash_site/outpost_data/small_weapon_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_weapon_factory.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local Token = require 'utils.token' local loot = { @@ -161,7 +161,7 @@ local market = { } } -local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_factory' +local base_factory = require 'map_gen.maps.crash_site.outpost_data.small_factory' local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}}) local level3 = @@ -207,9 +207,9 @@ return { max_level = 2 }, walls = { - require 'map_gen.presets.crash_site.outpost_data.medium_gun_turrets', - require 'map_gen.presets.crash_site.outpost_data.medium_laser_turrets', - require 'map_gen.presets.crash_site.outpost_data.medium_flame_turrets' + require 'map_gen.maps.crash_site.outpost_data.medium_gun_turrets', + require 'map_gen.maps.crash_site.outpost_data.medium_laser_turrets', + require 'map_gen.maps.crash_site.outpost_data.medium_flame_turrets' }, bases = { {level4, level3b, level2} diff --git a/map_gen/presets/crash_site/outpost_data/small_worm_turrets.lua b/map_gen/maps/crash_site/outpost_data/small_worm_turrets.lua similarity index 96% rename from map_gen/presets/crash_site/outpost_data/small_worm_turrets.lua rename to map_gen/maps/crash_site/outpost_data/small_worm_turrets.lua index 14c9d558..5d41c1b0 100644 --- a/map_gen/presets/crash_site/outpost_data/small_worm_turrets.lua +++ b/map_gen/maps/crash_site/outpost_data/small_worm_turrets.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls{ ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/solar_panel_block.lua b/map_gen/maps/crash_site/outpost_data/solar_panel_block.lua similarity index 95% rename from map_gen/presets/crash_site/outpost_data/solar_panel_block.lua rename to map_gen/maps/crash_site/outpost_data/solar_panel_block.lua index 37f7eb52..5729e8f7 100644 --- a/map_gen/presets/crash_site/outpost_data/solar_panel_block.lua +++ b/map_gen/maps/crash_site/outpost_data/solar_panel_block.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_1_way { force = 'neutral', diff --git a/map_gen/presets/crash_site/outpost_data/steam_engine_block.lua b/map_gen/maps/crash_site/outpost_data/steam_engine_block.lua similarity index 95% rename from map_gen/presets/crash_site/outpost_data/steam_engine_block.lua rename to map_gen/maps/crash_site/outpost_data/steam_engine_block.lua index 807fc0b7..ae04aa6e 100644 --- a/map_gen/presets/crash_site/outpost_data/steam_engine_block.lua +++ b/map_gen/maps/crash_site/outpost_data/steam_engine_block.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_1_way { force = 'neutral', diff --git a/map_gen/presets/crash_site/outpost_data/storage_tank_block.lua b/map_gen/maps/crash_site/outpost_data/storage_tank_block.lua similarity index 95% rename from map_gen/presets/crash_site/outpost_data/storage_tank_block.lua rename to map_gen/maps/crash_site/outpost_data/storage_tank_block.lua index 3f6604fb..0290aadc 100644 --- a/map_gen/presets/crash_site/outpost_data/storage_tank_block.lua +++ b/map_gen/maps/crash_site/outpost_data/storage_tank_block.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_1_way { force = 'neutral', diff --git a/map_gen/presets/crash_site/outpost_data/thin_walls.lua b/map_gen/maps/crash_site/outpost_data/thin_walls.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/thin_walls.lua rename to map_gen/maps/crash_site/outpost_data/thin_walls.lua index 2a5bf324..eac7817e 100644 --- a/map_gen/presets/crash_site/outpost_data/thin_walls.lua +++ b/map_gen/maps/crash_site/outpost_data/thin_walls.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' local walls = ob.make_walls{ ob.make_4_way { diff --git a/map_gen/presets/crash_site/outpost_data/walls.lua b/map_gen/maps/crash_site/outpost_data/walls.lua similarity index 98% rename from map_gen/presets/crash_site/outpost_data/walls.lua rename to map_gen/maps/crash_site/outpost_data/walls.lua index 8388f0f9..f88dc9b3 100644 --- a/map_gen/presets/crash_site/outpost_data/walls.lua +++ b/map_gen/maps/crash_site/outpost_data/walls.lua @@ -1,4 +1,4 @@ -local ob = require 'map_gen.presets.crash_site.outpost_builder' +local ob = require 'map_gen.maps.crash_site.outpost_builder' return ob.make_walls { ob.make_4_way { diff --git a/map_gen/presets/crash_site/weapon_balance.lua b/map_gen/maps/crash_site/weapon_balance.lua similarity index 100% rename from map_gen/presets/crash_site/weapon_balance.lua rename to map_gen/maps/crash_site/weapon_balance.lua diff --git a/map_gen/presets/creation_of_adam.lua b/map_gen/maps/creation_of_adam.lua similarity index 100% rename from map_gen/presets/creation_of_adam.lua rename to map_gen/maps/creation_of_adam.lua diff --git a/map_gen/presets/creation_of_adam2.lua b/map_gen/maps/creation_of_adam2.lua similarity index 100% rename from map_gen/presets/creation_of_adam2.lua rename to map_gen/maps/creation_of_adam2.lua diff --git a/map_gen/presets/crosses.lua b/map_gen/maps/crosses.lua similarity index 100% rename from map_gen/presets/crosses.lua rename to map_gen/maps/crosses.lua diff --git a/map_gen/presets/crosses3.lua b/map_gen/maps/crosses3.lua similarity index 100% rename from map_gen/presets/crosses3.lua rename to map_gen/maps/crosses3.lua diff --git a/map_gen/presets/danger_ores.lua b/map_gen/maps/danger_ores.lua similarity index 100% rename from map_gen/presets/danger_ores.lua rename to map_gen/maps/danger_ores.lua diff --git a/map_gen/maps/default.lua b/map_gen/maps/default.lua new file mode 100644 index 00000000..92e45da9 --- /dev/null +++ b/map_gen/maps/default.lua @@ -0,0 +1,3 @@ +-- A blank file to allow map_selection to have a default +-- We return false because returning nil actually has require == true +return false diff --git a/map_gen/shape/diagonal_lattice.lua b/map_gen/maps/diagonal_lattice.lua similarity index 100% rename from map_gen/shape/diagonal_lattice.lua rename to map_gen/maps/diagonal_lattice.lua diff --git a/map_gen/presets/diagonal_ribbon.lua b/map_gen/maps/diagonal_ribbon.lua similarity index 100% rename from map_gen/presets/diagonal_ribbon.lua rename to map_gen/maps/diagonal_ribbon.lua diff --git a/map_gen/presets/dickbutt.lua b/map_gen/maps/dickbutt.lua similarity index 100% rename from map_gen/presets/dickbutt.lua rename to map_gen/maps/dickbutt.lua diff --git a/map_gen/maps/diggy.lua b/map_gen/maps/diggy.lua new file mode 100644 index 00000000..16318f3f --- /dev/null +++ b/map_gen/maps/diggy.lua @@ -0,0 +1,2 @@ +-- authors Linaori, valansch +require 'map_gen.maps.diggy.scenario'.register() diff --git a/map_gen/Diggy/Config.lua b/map_gen/maps/diggy/config.lua similarity index 97% rename from map_gen/Diggy/Config.lua rename to map_gen/maps/diggy/config.lua index e02a66da..171bf1b0 100644 --- a/map_gen/Diggy/Config.lua +++ b/map_gen/maps/diggy/config.lua @@ -7,7 +7,7 @@ local Config = { -- to disable a feature, change the flag features = { -- creates a starting zone - StartingZone = { + starting_zone = { enabled = true, -- initial starting position size, higher values are not recommended @@ -18,12 +18,12 @@ local Config = { }, -- controls the Daylight (Default diggy: enabled = true) - NightTime = { + night_time = { enabled = true, -- true = No Daylight, false = Day/night circle (Solar panels work) }, -- controls setting up the players - SetupPlayer = { + setup_player = { enabled = true, starting_items = { {name = 'iron-axe', count = 2}, @@ -55,7 +55,7 @@ local Config = { }, -- core feature - DiggyHole = { + diggy_hole = { enabled = true, -- initial damage per tick it damages a rock to mine, can be enhanced by robot_damage_per_mining_prod_level @@ -66,7 +66,7 @@ local Config = { }, -- adds the ability to collapse caves - DiggyCaveCollapse = { + diggy_cave_collapse = { enabled = true, -- adds per tile what the current stress is @@ -106,7 +106,7 @@ local Config = { }, -- Adds the ability to drop coins and track how many are sent into space - CoinGathering = { + coin_gathering = { enabled = true, -- value between 0 and 1, higher value means stronger variance between coordinates @@ -181,12 +181,12 @@ local Config = { }, -- replaces the chunks with void - RefreshMap = { + refresh_map = { enabled = true, }, -- automatically opens areas - SimpleRoomGenerator = { + simple_room_generator = { enabled = true, -- value between 0 and 1, higher value means stronger variance between coordinates @@ -207,7 +207,7 @@ local Config = { }, -- responsible for resource spawning - ScatteredResources = { + scattered_resources = { enabled = true, -- determines how distance is measured @@ -305,18 +305,18 @@ local Config = { cluster_mode = true, -- spawns tendrils of ore with roughly 80% purity - ore_pattern = require 'map_gen.Diggy.Orepattern.tendrils_impure', + ore_pattern = require 'map_gen.maps.diggy.orepattern.tendrils_impure', -- spawns some smaller dedicated and bigger mixed tendrils - --ore_pattern = require 'map_gen.Diggy.Orepattern.Tendrils', + --ore_pattern = require 'map_gen.maps.diggy.orepattern.tendrils', -- spawns clusters of ore similar to vanilla, but mixed - --ore_pattern = require 'map_gen.Diggy.Orepattern.Clusters', + --ore_pattern = require 'map_gen.maps.diggy.orepattern.clusters', }, -- controls the alien spawning mechanic - AlienSpawner = { + alien_spawner = { enabled = true, -- minimum distance from spawn before aliens can spawn @@ -348,13 +348,13 @@ local Config = { }, --Tracks players causing collapses - Antigrief = { + antigrief = { enabled = true, autojail = true, allowed_collapses_first_hour = 4, }, - Experience = { + experience = { enabled = true, -- controls the formula for calculating level up costs in stone sent to surface difficulty_scale = 15, -- Diggy default 15. Higher increases experience requirement climb diff --git a/map_gen/Diggy/Debug.lua b/map_gen/maps/diggy/debug.lua similarity index 100% rename from map_gen/Diggy/Debug.lua rename to map_gen/maps/diggy/debug.lua diff --git a/map_gen/Diggy/Feature/AlienSpawner.lua b/map_gen/maps/diggy/feature/alien_spawner.lua similarity index 98% rename from map_gen/Diggy/Feature/AlienSpawner.lua rename to map_gen/maps/diggy/feature/alien_spawner.lua index 502221c1..48cd234e 100644 --- a/map_gen/Diggy/Feature/AlienSpawner.lua +++ b/map_gen/maps/diggy/feature/alien_spawner.lua @@ -9,8 +9,8 @@ local Global = require 'utils.global' local Token = require 'utils.token' local Task = require 'utils.task' local AlienEvolutionProgress = require 'utils.alien_evolution_progress' -local Debug = require 'map_gen.Diggy.Debug' -local Template = require 'map_gen.Diggy.Template' +local Debug = require 'map_gen.maps.diggy.debug' +local Template = require 'map_gen.maps.diggy.template' local CreateParticles = require 'features.create_particles' local random = math.random local floor = math.floor diff --git a/map_gen/Diggy/Feature/Antigrief.lua b/map_gen/maps/diggy/feature/antigrief.lua similarity index 95% rename from map_gen/Diggy/Feature/Antigrief.lua rename to map_gen/maps/diggy/feature/antigrief.lua index 6b7febb6..1f7806f2 100644 --- a/map_gen/Diggy/Feature/Antigrief.lua +++ b/map_gen/maps/diggy/feature/antigrief.lua @@ -1,7 +1,7 @@ -- dependencies local Event = require 'utils.event' local Global = require 'utils.global' -local CaveCollapse = require 'map_gen.Diggy.Feature.DiggyCaveCollapse' +local CaveCollapse = require 'map_gen.maps.diggy.feature.diggy_cave_collapse' local Game = require 'utils.game' local Report = require 'features.report' local format = string.format diff --git a/map_gen/Diggy/Feature/CoinGathering.lua b/map_gen/maps/diggy/feature/coin_gathering.lua similarity index 97% rename from map_gen/Diggy/Feature/CoinGathering.lua rename to map_gen/maps/diggy/feature/coin_gathering.lua index 60268575..651fcf52 100644 --- a/map_gen/Diggy/Feature/CoinGathering.lua +++ b/map_gen/maps/diggy/feature/coin_gathering.lua @@ -5,9 +5,9 @@ -- dependencies local Event = require 'utils.event' local Game = require 'utils.game' -local ScoreTable = require 'map_gen.Diggy.ScoreTable' -local Debug = require 'map_gen.Diggy.Debug' -local Template = require 'map_gen.Diggy.Template' +local ScoreTable = require 'map_gen.maps.diggy.score_table' +local Debug = require 'map_gen.maps.diggy.debug' +local Template = require 'map_gen.maps.diggy.template' local Perlin = require 'map_gen.shared.perlin_noise' local random = math.random local ceil = math.ceil diff --git a/map_gen/Diggy/Feature/DiggyCaveCollapse.lua b/map_gen/maps/diggy/feature/diggy_cave_collapse.lua similarity index 99% rename from map_gen/Diggy/Feature/DiggyCaveCollapse.lua rename to map_gen/maps/diggy/feature/diggy_cave_collapse.lua index 37233576..c99d2d3c 100644 --- a/map_gen/Diggy/Feature/DiggyCaveCollapse.lua +++ b/map_gen/maps/diggy/feature/diggy_cave_collapse.lua @@ -3,9 +3,9 @@ ]] -- dependencies local Event = require 'utils.event' -local Template = require 'map_gen.Diggy.Template' -local ScoreTable = require 'map_gen.Diggy.ScoreTable' -local Debug = require 'map_gen.Diggy.Debug' +local Template = require 'map_gen.maps.diggy.template' +local ScoreTable = require 'map_gen.maps.diggy.score_table' +local Debug = require 'map_gen.maps.diggy.debug' local Task = require 'utils.task' local Token = require 'utils.token' local Global = require 'utils.global' diff --git a/map_gen/Diggy/Feature/DiggyHole.lua b/map_gen/maps/diggy/feature/diggy_hole.lua similarity index 98% rename from map_gen/Diggy/Feature/DiggyHole.lua rename to map_gen/maps/diggy/feature/diggy_hole.lua index d673e808..27b76adf 100644 --- a/map_gen/Diggy/Feature/DiggyHole.lua +++ b/map_gen/maps/diggy/feature/diggy_hole.lua @@ -6,8 +6,8 @@ -- dependencies local Event = require 'utils.event' local Global = require 'utils.global' -local Template = require 'map_gen.Diggy.Template' -local ScoreTable = require 'map_gen.Diggy.ScoreTable' +local Template = require 'map_gen.maps.diggy.template' +local ScoreTable = require 'map_gen.maps.diggy.score_table' local Command = require 'utils.command' local CreateParticles = require 'features.create_particles' local random = math.random diff --git a/map_gen/Diggy/Feature/Experience.lua b/map_gen/maps/diggy/feature/experience.lua similarity index 99% rename from map_gen/Diggy/Feature/Experience.lua rename to map_gen/maps/diggy/feature/experience.lua index b48f02d9..5762b2c1 100644 --- a/map_gen/Diggy/Feature/Experience.lua +++ b/map_gen/maps/diggy/feature/experience.lua @@ -3,7 +3,7 @@ local Event = require 'utils.event' local Game = require 'utils.game' local Global = require 'utils.global' local ForceControl = require 'features.force_control' -local ScoreTable = require 'map_gen.Diggy.ScoreTable' +local ScoreTable = require 'map_gen.maps.diggy.score_table' local Retailer = require 'features.retailer' local Gui = require 'utils.gui' local Utils = require 'utils.core' diff --git a/map_gen/Diggy/Feature/NightTime.lua b/map_gen/maps/diggy/feature/night_time.lua similarity index 100% rename from map_gen/Diggy/Feature/NightTime.lua rename to map_gen/maps/diggy/feature/night_time.lua diff --git a/map_gen/Diggy/Feature/RefreshMap.lua b/map_gen/maps/diggy/feature/refresh_map.lua similarity index 100% rename from map_gen/Diggy/Feature/RefreshMap.lua rename to map_gen/maps/diggy/feature/refresh_map.lua diff --git a/map_gen/Diggy/Feature/ScatteredResources.lua b/map_gen/maps/diggy/feature/scattered_resources.lua similarity index 99% rename from map_gen/Diggy/Feature/ScatteredResources.lua rename to map_gen/maps/diggy/feature/scattered_resources.lua index 7341cdb5..b3464636 100644 --- a/map_gen/Diggy/Feature/ScatteredResources.lua +++ b/map_gen/maps/diggy/feature/scattered_resources.lua @@ -4,8 +4,8 @@ -- dependencies local Event = require 'utils.event' -local Debug = require 'map_gen.Diggy.Debug' -local Template = require 'map_gen.Diggy.Template' +local Debug = require 'map_gen.maps.diggy.debug' +local Template = require 'map_gen.maps.diggy.template' local Perlin = require 'map_gen.shared.perlin_noise' local Simplex = require 'map_gen.shared.simplex_noise' local Utils = require 'utils.core' diff --git a/map_gen/Diggy/Feature/SetupPlayer.lua b/map_gen/maps/diggy/feature/setup_player.lua similarity index 100% rename from map_gen/Diggy/Feature/SetupPlayer.lua rename to map_gen/maps/diggy/feature/setup_player.lua diff --git a/map_gen/Diggy/Feature/SimpleRoomGenerator.lua b/map_gen/maps/diggy/feature/simple_room_generator.lua similarity index 97% rename from map_gen/Diggy/Feature/SimpleRoomGenerator.lua rename to map_gen/maps/diggy/feature/simple_room_generator.lua index 1190dd09..946a61bb 100644 --- a/map_gen/Diggy/Feature/SimpleRoomGenerator.lua +++ b/map_gen/maps/diggy/feature/simple_room_generator.lua @@ -3,9 +3,9 @@ ]] -- dependencies -local Template = require 'map_gen.Diggy.Template' +local Template = require 'map_gen.maps.diggy.template' local Event = require 'utils.event' -local Debug = require'map_gen.Diggy.Debug' +local Debug = require 'map_gen.maps.diggy.debug' local Task = require 'utils.task' local Token = require 'utils.token' local raise_event = script.raise_event diff --git a/map_gen/Diggy/Feature/StartingZone.lua b/map_gen/maps/diggy/feature/starting_zone.lua similarity index 94% rename from map_gen/Diggy/Feature/StartingZone.lua rename to map_gen/maps/diggy/feature/starting_zone.lua index 196e2c4b..bbc3e203 100644 --- a/map_gen/Diggy/Feature/StartingZone.lua +++ b/map_gen/maps/diggy/feature/starting_zone.lua @@ -4,9 +4,9 @@ -- dependencies local Event = require 'utils.event' local Token = require 'utils.token' -local Template = require 'map_gen.Diggy.Template' +local Template = require 'map_gen.maps.diggy.template' local Retailer = require 'features.retailer' -local DiggyCaveCollapse = require 'map_gen.Diggy.Feature.DiggyCaveCollapse' +local DiggyCaveCollapse = require 'map_gen.maps.diggy.feature.diggy_cave_collapse' local RS = require 'map_gen.shared.redmew_surface' local insert = table.insert @@ -34,7 +34,7 @@ function StartingZone.register(config) local start_point_cleanup = {{-0.9, -0.9}, {1.9, 1.9}} local surface = event.surface - -- hack to figure out whether the important chunks are generated via Diggy.Feature.RefreshMap. + -- hack to figure out whether the important chunks are generated via diggy.feature.refresh_map. if (4 ~= surface.count_tiles_filtered({start_point_area, name = 'lab-dark-1'})) then return end diff --git a/map_gen/Diggy/Orepattern/Clusters.lua b/map_gen/maps/diggy/orepattern/clusters.lua similarity index 100% rename from map_gen/Diggy/Orepattern/Clusters.lua rename to map_gen/maps/diggy/orepattern/clusters.lua diff --git a/map_gen/Diggy/Orepattern/Tendrils.lua b/map_gen/maps/diggy/orepattern/tendrils.lua similarity index 100% rename from map_gen/Diggy/Orepattern/Tendrils.lua rename to map_gen/maps/diggy/orepattern/tendrils.lua diff --git a/map_gen/Diggy/Orepattern/tendrils_impure.lua b/map_gen/maps/diggy/orepattern/tendrils_impure.lua similarity index 100% rename from map_gen/Diggy/Orepattern/tendrils_impure.lua rename to map_gen/maps/diggy/orepattern/tendrils_impure.lua diff --git a/map_gen/Diggy/Readme.md b/map_gen/maps/diggy/readme.md similarity index 100% rename from map_gen/Diggy/Readme.md rename to map_gen/maps/diggy/readme.md diff --git a/map_gen/Diggy/Scenario.lua b/map_gen/maps/diggy/scenario.lua similarity index 92% rename from map_gen/Diggy/Scenario.lua rename to map_gen/maps/diggy/scenario.lua index 9c0258f5..09ae5dad 100644 --- a/map_gen/Diggy/Scenario.lua +++ b/map_gen/maps/diggy/scenario.lua @@ -1,5 +1,5 @@ -- dependencies -local Config = require 'map_gen.Diggy.Config' +local Config = require 'map_gen.maps.diggy.config' local ScenarioInfo = require 'features.gui.info' local RS = require 'map_gen.shared.redmew_surface' local Event = require 'utils.event' @@ -56,7 +56,7 @@ function Scenario.register() each_enabled_feature( function(feature_name, feature_config) - local feature = require ('map_gen.Diggy.Feature.' .. feature_name) + local feature = require ('map_gen.maps.diggy.feature.' .. feature_name) if ('function' ~= type(feature.register)) then error('Feature ' .. feature_name .. ' did not define a register function.') end @@ -74,7 +74,7 @@ function Scenario.register() ) local landfill_tiles = {'dirt-1','dirt-2','dirt-3','dirt-4','dirt-5','dirt-6','dirt-7'} - require ('map_gen.misc.change_landfill_tile')(landfill_tiles) + require ('map_gen.shared.change_landfill_tile')(landfill_tiles) ScenarioInfo.set_map_name('Diggy') ScenarioInfo.set_map_description('Dig your way through!') diff --git a/map_gen/Diggy/ScoreTable.lua b/map_gen/maps/diggy/score_table.lua similarity index 100% rename from map_gen/Diggy/ScoreTable.lua rename to map_gen/maps/diggy/score_table.lua diff --git a/map_gen/Diggy/Template.lua b/map_gen/maps/diggy/template.lua similarity index 100% rename from map_gen/Diggy/Template.lua rename to map_gen/maps/diggy/template.lua diff --git a/map_gen/combined/dimensions.lua b/map_gen/maps/dimensions.lua similarity index 99% rename from map_gen/combined/dimensions.lua rename to map_gen/maps/dimensions.lua index b2c3fb30..3ede42eb 100644 --- a/map_gen/combined/dimensions.lua +++ b/map_gen/maps/dimensions.lua @@ -2,7 +2,7 @@ local Event = require 'utils.event' local RS = require 'map_gen.shared.redmew_surface' -local wrech_items_module = require 'map_gen.misc.wreck_items' +local wrech_items_module = require 'map_gen.shared.wreck_items' local resource_types = {'copper-ore', 'iron-ore', 'coal', 'stone', 'uranium-ore', 'crude-oil'} diff --git a/map_gen/presets/dino_island.lua b/map_gen/maps/dino_island.lua similarity index 100% rename from map_gen/presets/dino_island.lua rename to map_gen/maps/dino_island.lua diff --git a/map_gen/presets/dna.lua b/map_gen/maps/dna.lua similarity index 100% rename from map_gen/presets/dna.lua rename to map_gen/maps/dna.lua diff --git a/map_gen/shape/donut.lua b/map_gen/maps/donut.lua similarity index 100% rename from map_gen/shape/donut.lua rename to map_gen/maps/donut.lua diff --git a/map_gen/presets/double_beach.lua b/map_gen/maps/double_beach.lua similarity index 92% rename from map_gen/presets/double_beach.lua rename to map_gen/maps/double_beach.lua index cc2e5ac0..3923adcc 100644 --- a/map_gen/presets/double_beach.lua +++ b/map_gen/maps/double_beach.lua @@ -1,5 +1,5 @@ local b = require 'map_gen.shared.builders' -local beach = require 'map_gen.presets.beach' +local beach = require 'map_gen.maps.beach' local RS = require 'map_gen.shared.redmew_surface' local MGSP = require 'resources.map_gen_settings' diff --git a/map_gen/presets/factorio_logo.lua b/map_gen/maps/factorio_logo.lua similarity index 100% rename from map_gen/presets/factorio_logo.lua rename to map_gen/maps/factorio_logo.lua diff --git a/map_gen/presets/factorio_logo2.lua b/map_gen/maps/factorio_logo2.lua similarity index 100% rename from map_gen/presets/factorio_logo2.lua rename to map_gen/maps/factorio_logo2.lua diff --git a/map_gen/presets/factory.lua b/map_gen/maps/factory.lua similarity index 100% rename from map_gen/presets/factory.lua rename to map_gen/maps/factory.lua diff --git a/map_gen/presets/fish_islands.lua b/map_gen/maps/fish_islands.lua similarity index 100% rename from map_gen/presets/fish_islands.lua rename to map_gen/maps/fish_islands.lua diff --git a/map_gen/presets/fractal_balls.lua b/map_gen/maps/fractal_balls.lua similarity index 100% rename from map_gen/presets/fractal_balls.lua rename to map_gen/maps/fractal_balls.lua diff --git a/map_gen/presets/fruit_loops.lua b/map_gen/maps/fruit_loops.lua similarity index 100% rename from map_gen/presets/fruit_loops.lua rename to map_gen/maps/fruit_loops.lua diff --git a/map_gen/presets/gears.lua b/map_gen/maps/gears.lua similarity index 100% rename from map_gen/presets/gears.lua rename to map_gen/maps/gears.lua diff --git a/map_gen/presets/goat.lua b/map_gen/maps/goat.lua similarity index 100% rename from map_gen/presets/goat.lua rename to map_gen/maps/goat.lua diff --git a/map_gen/presets/goats_on_goats.lua b/map_gen/maps/goats_on_goats.lua similarity index 100% rename from map_gen/presets/goats_on_goats.lua rename to map_gen/maps/goats_on_goats.lua diff --git a/map_gen/presets/grid_bot_islands.lua b/map_gen/maps/grid_bot_islands.lua similarity index 100% rename from map_gen/presets/grid_bot_islands.lua rename to map_gen/maps/grid_bot_islands.lua diff --git a/map_gen/presets/grid_islands.lua b/map_gen/maps/grid_islands.lua similarity index 100% rename from map_gen/presets/grid_islands.lua rename to map_gen/maps/grid_islands.lua diff --git a/map_gen/presets/grid_islands_rotated.lua b/map_gen/maps/grid_islands_rotated.lua similarity index 100% rename from map_gen/presets/grid_islands_rotated.lua rename to map_gen/maps/grid_islands_rotated.lua diff --git a/map_gen/presets/hearts.lua b/map_gen/maps/hearts.lua similarity index 100% rename from map_gen/presets/hearts.lua rename to map_gen/maps/hearts.lua diff --git a/map_gen/presets/honeycomb.lua b/map_gen/maps/honeycomb.lua similarity index 100% rename from map_gen/presets/honeycomb.lua rename to map_gen/maps/honeycomb.lua diff --git a/map_gen/presets/hub_spiral.lua b/map_gen/maps/hub_spiral.lua similarity index 100% rename from map_gen/presets/hub_spiral.lua rename to map_gen/maps/hub_spiral.lua diff --git a/map_gen/shape/infinite_mazes.lua b/map_gen/maps/infinite_mazes.lua similarity index 100% rename from map_gen/shape/infinite_mazes.lua rename to map_gen/maps/infinite_mazes.lua diff --git a/map_gen/combined/island_resort.lua b/map_gen/maps/island_resort.lua similarity index 100% rename from map_gen/combined/island_resort.lua rename to map_gen/maps/island_resort.lua diff --git a/map_gen/shape/left.lua b/map_gen/maps/left.lua similarity index 100% rename from map_gen/shape/left.lua rename to map_gen/maps/left.lua diff --git a/map_gen/presets/line_and_tree.lua b/map_gen/maps/line_and_tree.lua similarity index 100% rename from map_gen/presets/line_and_tree.lua rename to map_gen/maps/line_and_tree.lua diff --git a/map_gen/presets/line_and_trees.lua b/map_gen/maps/line_and_trees.lua similarity index 100% rename from map_gen/presets/line_and_trees.lua rename to map_gen/maps/line_and_trees.lua diff --git a/map_gen/presets/lines.lua b/map_gen/maps/lines.lua similarity index 100% rename from map_gen/presets/lines.lua rename to map_gen/maps/lines.lua diff --git a/map_gen/presets/lines_and_balls.lua b/map_gen/maps/lines_and_balls.lua similarity index 100% rename from map_gen/presets/lines_and_balls.lua rename to map_gen/maps/lines_and_balls.lua diff --git a/map_gen/presets/lines_and_squares.lua b/map_gen/maps/lines_and_squares.lua similarity index 100% rename from map_gen/presets/lines_and_squares.lua rename to map_gen/maps/lines_and_squares.lua diff --git a/map_gen/presets/maltease_crossings.lua b/map_gen/maps/maltease_crossings.lua similarity index 100% rename from map_gen/presets/maltease_crossings.lua rename to map_gen/maps/maltease_crossings.lua diff --git a/map_gen/presets/manhattan.lua b/map_gen/maps/manhattan.lua similarity index 100% rename from map_gen/presets/manhattan.lua rename to map_gen/maps/manhattan.lua diff --git a/map_gen/presets/maori.lua b/map_gen/maps/maori.lua similarity index 100% rename from map_gen/presets/maori.lua rename to map_gen/maps/maori.lua diff --git a/map_gen/shape/maze.lua b/map_gen/maps/maze.lua similarity index 100% rename from map_gen/shape/maze.lua rename to map_gen/maps/maze.lua diff --git a/map_gen/combined/meteor_strike.lua b/map_gen/maps/meteor_strike.lua similarity index 100% rename from map_gen/combined/meteor_strike.lua rename to map_gen/maps/meteor_strike.lua diff --git a/map_gen/combined/meteor_strike_data.lua b/map_gen/maps/meteor_strike_data.lua similarity index 100% rename from map_gen/combined/meteor_strike_data.lua rename to map_gen/maps/meteor_strike_data.lua diff --git a/map_gen/presets/misc_stuff.lua b/map_gen/maps/misc_stuff.lua similarity index 100% rename from map_gen/presets/misc_stuff.lua rename to map_gen/maps/misc_stuff.lua diff --git a/map_gen/presets/mobius_strip.lua b/map_gen/maps/mobius_strip.lua similarity index 98% rename from map_gen/presets/mobius_strip.lua rename to map_gen/maps/mobius_strip.lua index 521817df..665a8816 100644 --- a/map_gen/presets/mobius_strip.lua +++ b/map_gen/maps/mobius_strip.lua @@ -93,7 +93,7 @@ end map = b.apply_effect(map, effect) -local Spawn_Control = require 'map_gen.misc.spawn_control' +local Spawn_Control = require 'map_gen.shared.spawn_control' Spawn_Control.add_spawn('left', -88, -88) Spawn_Control.add_spawn('right', 88, 88) diff --git a/map_gen/presets/mona_lisa.lua b/map_gen/maps/mona_lisa.lua similarity index 100% rename from map_gen/presets/mona_lisa.lua rename to map_gen/maps/mona_lisa.lua diff --git a/map_gen/presets/north_america.lua b/map_gen/maps/north_america.lua similarity index 100% rename from map_gen/presets/north_america.lua rename to map_gen/maps/north_america.lua diff --git a/map_gen/shape/pacman.lua b/map_gen/maps/pacman.lua similarity index 74% rename from map_gen/shape/pacman.lua rename to map_gen/maps/pacman.lua index 0e68a56d..b5e5200b 100644 --- a/map_gen/shape/pacman.lua +++ b/map_gen/maps/pacman.lua @@ -4,8 +4,8 @@ local grid_width = 40 local grid_height = 40 local grid_scale = 32 -- 4/8/16/32 are good values here - local starting_grid = require "pacman_grids.classic" ---local starting_grid = require "pacman_grids.rotated_rectangles" + local starting_grid = require "map_gen.maps.pacman_grids.classic" +--local starting_grid = require "map_gen.maps.pacman_grids.rotated_rectangles" local image_grid = starting_grid.image_grid local mult = 1 / grid_scale diff --git a/map_gen/shape/pacman_grids/classic.lua b/map_gen/maps/pacman_grids/classic.lua similarity index 100% rename from map_gen/shape/pacman_grids/classic.lua rename to map_gen/maps/pacman_grids/classic.lua diff --git a/map_gen/shape/pacman_grids/rotated_rectangles.lua b/map_gen/maps/pacman_grids/rotated_rectangles.lua similarity index 100% rename from map_gen/shape/pacman_grids/rotated_rectangles.lua rename to map_gen/maps/pacman_grids/rotated_rectangles.lua diff --git a/map_gen/presets/plus.lua b/map_gen/maps/plus.lua similarity index 100% rename from map_gen/presets/plus.lua rename to map_gen/maps/plus.lua diff --git a/map_gen/shape/right.lua b/map_gen/maps/right.lua similarity index 100% rename from map_gen/shape/right.lua rename to map_gen/maps/right.lua diff --git a/map_gen/presets/ring_of_balls.lua b/map_gen/maps/ring_of_balls.lua similarity index 100% rename from map_gen/presets/ring_of_balls.lua rename to map_gen/maps/ring_of_balls.lua diff --git a/map_gen/presets/rings_and_boxes.lua b/map_gen/maps/rings_and_boxes.lua similarity index 100% rename from map_gen/presets/rings_and_boxes.lua rename to map_gen/maps/rings_and_boxes.lua diff --git a/map_gen/presets/rotten_apples.lua b/map_gen/maps/rotten_apples.lua similarity index 100% rename from map_gen/presets/rotten_apples.lua rename to map_gen/maps/rotten_apples.lua diff --git a/map_gen/presets/sierpinski_carpet.lua b/map_gen/maps/sierpinski_carpet.lua similarity index 100% rename from map_gen/presets/sierpinski_carpet.lua rename to map_gen/maps/sierpinski_carpet.lua diff --git a/map_gen/presets/spiral.lua b/map_gen/maps/spiral.lua similarity index 100% rename from map_gen/presets/spiral.lua rename to map_gen/maps/spiral.lua diff --git a/map_gen/shape/spiral2.lua b/map_gen/maps/spiral2.lua similarity index 100% rename from map_gen/shape/spiral2.lua rename to map_gen/maps/spiral2.lua diff --git a/map_gen/presets/spiral_crossings.lua b/map_gen/maps/spiral_crossings.lua similarity index 100% rename from map_gen/presets/spiral_crossings.lua rename to map_gen/maps/spiral_crossings.lua diff --git a/map_gen/presets/spiral_of_spirals.lua b/map_gen/maps/spiral_of_spirals.lua similarity index 100% rename from map_gen/presets/spiral_of_spirals.lua rename to map_gen/maps/spiral_of_spirals.lua diff --git a/map_gen/shape/spiral.lua b/map_gen/maps/spiral_shape.lua similarity index 100% rename from map_gen/shape/spiral.lua rename to map_gen/maps/spiral_shape.lua diff --git a/map_gen/shape/spiral_tri.lua b/map_gen/maps/spiral_tri.lua similarity index 100% rename from map_gen/shape/spiral_tri.lua rename to map_gen/maps/spiral_tri.lua diff --git a/map_gen/presets/square_spiral.lua b/map_gen/maps/square_spiral.lua similarity index 100% rename from map_gen/presets/square_spiral.lua rename to map_gen/maps/square_spiral.lua diff --git a/map_gen/presets/template.lua b/map_gen/maps/template.lua similarity index 100% rename from map_gen/presets/template.lua rename to map_gen/maps/template.lua diff --git a/map_gen/presets/terraforming_danger_ores.lua b/map_gen/maps/terraforming_danger_ores.lua similarity index 100% rename from map_gen/presets/terraforming_danger_ores.lua rename to map_gen/maps/terraforming_danger_ores.lua diff --git a/map_gen/presets/test.lua b/map_gen/maps/test.lua similarity index 100% rename from map_gen/presets/test.lua rename to map_gen/maps/test.lua diff --git a/map_gen/maps/tetris.lua b/map_gen/maps/tetris.lua new file mode 100644 index 00000000..34e3f8a0 --- /dev/null +++ b/map_gen/maps/tetris.lua @@ -0,0 +1 @@ +return require 'map_gen.maps.tetris.scenario' diff --git a/map_gen/combined/tetris/scenario.lua b/map_gen/maps/tetris/scenario.lua similarity index 98% rename from map_gen/combined/tetris/scenario.lua rename to map_gen/maps/tetris/scenario.lua index 0bac5373..bc9d4cd7 100644 --- a/map_gen/combined/tetris/scenario.lua +++ b/map_gen/maps/tetris/scenario.lua @@ -3,11 +3,11 @@ local Token = require 'utils.token' local Task = require 'utils.task' local Global = require 'utils.global' local Debug = require 'utils.debug' -local Map = require 'map_gen.combined.tetris.shape' -local Tetrimino = require 'map_gen.combined.tetris.tetrimino'(Map) -local View = require 'map_gen.combined.tetris.view' +local Map = require 'map_gen.maps.tetris.shape' +local Tetrimino = require 'map_gen.maps.tetris.tetrimino'(Map) +local View = require 'map_gen.maps.tetris.view' local InfinityChest = require 'features.infinite_storage_chest' -local states = require 'map_gen.combined.tetris.states' +local states = require 'map_gen.maps.tetris.states' local StateMachine = require 'utils.state_machine' local RS = require 'map_gen.shared.redmew_surface' local MGSP = require 'resources.map_gen_settings' diff --git a/map_gen/combined/tetris/shape.lua b/map_gen/maps/tetris/shape.lua similarity index 100% rename from map_gen/combined/tetris/shape.lua rename to map_gen/maps/tetris/shape.lua diff --git a/map_gen/combined/tetris/states.lua b/map_gen/maps/tetris/states.lua similarity index 100% rename from map_gen/combined/tetris/states.lua rename to map_gen/maps/tetris/states.lua diff --git a/map_gen/combined/tetris/tetrimino.lua b/map_gen/maps/tetris/tetrimino.lua similarity index 100% rename from map_gen/combined/tetris/tetrimino.lua rename to map_gen/maps/tetris/tetrimino.lua diff --git a/map_gen/combined/tetris/view.lua b/map_gen/maps/tetris/view.lua similarity index 100% rename from map_gen/combined/tetris/view.lua rename to map_gen/maps/tetris/view.lua diff --git a/map_gen/shape/threaded_spirals.lua b/map_gen/maps/threaded_spirals.lua similarity index 100% rename from map_gen/shape/threaded_spirals.lua rename to map_gen/maps/threaded_spirals.lua diff --git a/map_gen/presets/toxic_danger_ore_jungle.lua b/map_gen/maps/toxic_danger_ore_jungle.lua similarity index 100% rename from map_gen/presets/toxic_danger_ore_jungle.lua rename to map_gen/maps/toxic_danger_ore_jungle.lua diff --git a/map_gen/presets/toxic_jungle.lua b/map_gen/maps/toxic_jungle.lua similarity index 100% rename from map_gen/presets/toxic_jungle.lua rename to map_gen/maps/toxic_jungle.lua diff --git a/map_gen/presets/triangle_of_death.lua b/map_gen/maps/triangle_of_death.lua similarity index 100% rename from map_gen/presets/triangle_of_death.lua rename to map_gen/maps/triangle_of_death.lua diff --git a/map_gen/presets/turkey.lua b/map_gen/maps/turkey.lua similarity index 100% rename from map_gen/presets/turkey.lua rename to map_gen/maps/turkey.lua diff --git a/map_gen/shape/up.lua b/map_gen/maps/up.lua similarity index 100% rename from map_gen/shape/up.lua rename to map_gen/maps/up.lua diff --git a/map_gen/presets/vanilla.lua b/map_gen/maps/vanilla.lua similarity index 100% rename from map_gen/presets/vanilla.lua rename to map_gen/maps/vanilla.lua diff --git a/map_gen/presets/venice.lua b/map_gen/maps/venice.lua similarity index 100% rename from map_gen/presets/venice.lua rename to map_gen/maps/venice.lua diff --git a/map_gen/presets/venus.lua b/map_gen/maps/venus.lua similarity index 95% rename from map_gen/presets/venus.lua rename to map_gen/maps/venus.lua index 4ef0ec82..dedc65d3 100644 --- a/map_gen/presets/venus.lua +++ b/map_gen/maps/venus.lua @@ -1,9 +1,9 @@ local b = require 'map_gen.shared.builders' local Event = require 'utils.event' global.map.terraforming.creep_retraction_tiles = {'sand-1'} -require 'map_gen.misc.nightfall' -- forces idle biters to attack at night -require 'map_gen.misc.terraforming' -- prevents players from building on non-terraformed tiles -local DayNight = require 'map_gen.misc.day_night' +require 'map_gen.shared.nightfall' -- forces idle biters to attack at night +require 'map_gen.shared.terraforming' -- prevents players from building on non-terraformed tiles +local DayNight = require 'map_gen.shared.day_night' local ScenarioInfo = require 'features.gui.info' local RS = require 'map_gen.shared.redmew_surface' diff --git a/map_gen/presets/void_gears.lua b/map_gen/maps/void_gears.lua similarity index 100% rename from map_gen/presets/void_gears.lua rename to map_gen/maps/void_gears.lua diff --git a/map_gen/presets/web.lua b/map_gen/maps/web.lua similarity index 100% rename from map_gen/presets/web.lua rename to map_gen/maps/web.lua diff --git a/map_gen/presets/women.lua b/map_gen/maps/women.lua similarity index 100% rename from map_gen/presets/women.lua rename to map_gen/maps/women.lua diff --git a/map_gen/presets/world_map.lua b/map_gen/maps/world_map.lua similarity index 100% rename from map_gen/presets/world_map.lua rename to map_gen/maps/world_map.lua diff --git a/map_gen/presets/world_map_thanksgiving.lua b/map_gen/maps/world_map_thanksgiving.lua similarity index 100% rename from map_gen/presets/world_map_thanksgiving.lua rename to map_gen/maps/world_map_thanksgiving.lua diff --git a/map_gen/shape/x_shape.lua b/map_gen/maps/x_shape.lua similarity index 100% rename from map_gen/shape/x_shape.lua rename to map_gen/maps/x_shape.lua diff --git a/map_gen/presets/tetris.lua b/map_gen/presets/tetris.lua deleted file mode 100644 index b75fa1a3..00000000 --- a/map_gen/presets/tetris.lua +++ /dev/null @@ -1 +0,0 @@ -return require 'map_gen.combined.tetris.scenario' diff --git a/map_gen/misc/car_body.lua b/map_gen/shared/car_body.lua similarity index 100% rename from map_gen/misc/car_body.lua rename to map_gen/shared/car_body.lua diff --git a/map_gen/misc/change_landfill_tile.lua b/map_gen/shared/change_landfill_tile.lua similarity index 100% rename from map_gen/misc/change_landfill_tile.lua rename to map_gen/shared/change_landfill_tile.lua diff --git a/map_gen/misc/danger_ore_banned_entities.lua b/map_gen/shared/danger_ore_banned_entities.lua similarity index 100% rename from map_gen/misc/danger_ore_banned_entities.lua rename to map_gen/shared/danger_ore_banned_entities.lua diff --git a/map_gen/misc/day_night.lua b/map_gen/shared/day_night.lua similarity index 100% rename from map_gen/misc/day_night.lua rename to map_gen/shared/day_night.lua diff --git a/map_gen/misc/loot_items.lua b/map_gen/shared/loot_items.lua similarity index 100% rename from map_gen/misc/loot_items.lua rename to map_gen/shared/loot_items.lua diff --git a/map_gen/shared/map_loader.lua b/map_gen/shared/map_loader.lua new file mode 100644 index 00000000..885f9a16 --- /dev/null +++ b/map_gen/shared/map_loader.lua @@ -0,0 +1,27 @@ +local b = require 'map_gen.shared.builders' +local RS = require 'map_gen.shared.redmew_surface' +local shape = require 'map_selection' +local config = global.config.map_generation + +if #config.entity_modules > 0 then + shape = shape or b.full_shape + shape = b.apply_entities(shape, config.entity_modules) +end + +if #config.terrain_modules > 0 then + shape = shape or b.full_shape + + for _, m in ipairs(config.terrain_modules) do + shape = b.overlay_tile_land(shape, m) + end +end + +if type(shape) == 'function' then + local surfaces = { + [RS.get_surface_name()] = shape + } + + local gen = require('map_gen.shared.generate') + gen.init({surfaces = surfaces, regen_decoratives = config.regen_decoratives, tiles_per_tick = config.tiles_per_tick}) + gen.register() +end diff --git a/map_gen/misc/naughty_words.lua b/map_gen/shared/naughty_words.lua similarity index 100% rename from map_gen/misc/naughty_words.lua rename to map_gen/shared/naughty_words.lua diff --git a/map_gen/misc/nightfall.lua b/map_gen/shared/nightfall.lua similarity index 100% rename from map_gen/misc/nightfall.lua rename to map_gen/shared/nightfall.lua diff --git a/map_gen/misc/rail_grid.lua b/map_gen/shared/rail_grid.lua similarity index 100% rename from map_gen/misc/rail_grid.lua rename to map_gen/shared/rail_grid.lua diff --git a/map_gen/misc/restrict_landfill_tile.lua b/map_gen/shared/restrict_landfill_tile.lua similarity index 100% rename from map_gen/misc/restrict_landfill_tile.lua rename to map_gen/shared/restrict_landfill_tile.lua diff --git a/map_gen/misc/rusky_pvp.lua b/map_gen/shared/rusky_pvp.lua similarity index 100% rename from map_gen/misc/rusky_pvp.lua rename to map_gen/shared/rusky_pvp.lua diff --git a/map_gen/misc/silly_player_names.lua b/map_gen/shared/silly_player_names.lua similarity index 100% rename from map_gen/misc/silly_player_names.lua rename to map_gen/shared/silly_player_names.lua diff --git a/map_gen/misc/spawn_control.lua b/map_gen/shared/spawn_control.lua similarity index 100% rename from map_gen/misc/spawn_control.lua rename to map_gen/shared/spawn_control.lua diff --git a/map_gen/misc/terraforming.lua b/map_gen/shared/terraforming.lua similarity index 100% rename from map_gen/misc/terraforming.lua rename to map_gen/shared/terraforming.lua diff --git a/map_gen/misc/wreck_items.lua b/map_gen/shared/wreck_items.lua similarity index 100% rename from map_gen/misc/wreck_items.lua rename to map_gen/shared/wreck_items.lua diff --git a/map_gen/misc/tris_chunk_grid.lua b/map_gen/terrain/tris_chunk_grid.lua similarity index 100% rename from map_gen/misc/tris_chunk_grid.lua rename to map_gen/terrain/tris_chunk_grid.lua diff --git a/map_layout.lua b/map_layout.lua deleted file mode 100644 index 431964dc..00000000 --- a/map_layout.lua +++ /dev/null @@ -1,171 +0,0 @@ ---[[ -This file is used to choose which styles you want. -You may choose up to one of each type shapes, terrain, ores and misc or one of the combined styles by removing uncommenting the line. -If you want to add your own module, just add it to the others -in this file and your run_*type*_module(event) function will be called. ---]] -local b = require 'map_gen.shared.builders' -local RS = require 'map_gen.shared.redmew_surface' -require 'utils.table' - -local shape = nil -local regen_decoratives = false -local tiles_per_tick = 32 - ---combined-- ---shape = require "map_gen.combined.island_resort" ---shape = require 'map_gen.combined.borg_planet_v2' ---require "map_gen.combined.dimensions" ---require "map_gen.combined.diggy" - ---presets-- ---shape = require "map_gen.presets.template" ---shape = require "map_gen.presets.dna" ---shape = require "map_gen.presets.lines_and_balls" ---shape = require "map_gen.presets.mobius_strip" ---shape = require "map_gen.presets.antfarm" ---shape = require "map_gen.presets.creation_of_adam" ---shape = require "map_gen.presets.creation_of_adam2" ---shape = require "map_gen.presets.manhattan" ---shape = require "map_gen.presets.mona_lisa" ---shape = require "map_gen.presets.connected_dots" ---shape = require "map_gen.presets.maori" ---shape = require "map_gen.presets.goat" ---shape = require "map_gen.presets.GoT" ---shape = require "map_gen.presets.turkey" -- needs to be rebuilt from missing source image. ---shape = require "map_gen.presets.north_america" -- needs to be rebuilt from missing source image. ---shape = require "map_gen.presets.UK" ---shape = require "map_gen.presets.venice" ---shape = require "map_gen.presets.goats_on_goats" ---shape = require "map_gen.presets.grid_islands" ---shape = require "map_gen.presets.grid_islands_rotated" ---shape = require "map_gen.presets.crosses" ---shape = require "map_gen.presets.crosses3" ---shape = require "map_gen.presets.broken_web" ---shape = require "map_gen.presets.misc_stuff" ---shape = require "map_gen.presets.lines" ---shape = require "map_gen.presets.dickbutt" ---shape = require "map_gen.presets.void_gears" ---shape = require "map_gen.presets.gears" ---shape = require "map_gen.presets.factorio_logo" ---shape = require "map_gen.presets.factorio_logo2" ---shape = require "map_gen.presets.hearts" ---shape = require "map_gen.presets.women" ---shape = require "map_gen.presets.fractal_balls" ---shape = require "map_gen.presets.fruit_loops" ---shape = require "map_gen.presets.fish_islands" ---shape = require "map_gen.presets.ContraSpiral" ---shape = require "map_gen.presets.cookies" ---shape = require "map_gen.presets.plus" ---shape = require "map_gen.presets.honeycomb" ---shape = require "map_gen.presets.line_and_trees" ---shape = require "map_gen.presets.line_and_tree" ---shape = require "map_gen.presets.square_spiral" ---shape = require "map_gen.presets.beach" ---shape = require "map_gen.presets.double_beach" ---shape = require "map_gen.presets.factory" ---shape = require "map_gen.presets.triangle_of_death" ---shape = require "map_gen.presets.world_map" ---shape = require "map_gen.presets.lines_and_squares" ---shape = require "map_gen.presets.spiral_of_spirals" ---shape = require 'map_gen.presets.crash_site' ---shape = require "map_gen.presets.dino_island" ---shape = require "map_gen.presets.toxic_jungle" ---shape = require "map_gen.presets.danger_ores" ---shape = require 'map_gen.presets.terraforming_danger_ores' ---shape = require "map_gen.presets.bacon_islands" ---shape = require "map_gen.presets.spiral" ---shape = require "map_gen.presets.hub_spiral" ---shape = require "map_gen.presets.diagonal_ribbon" ---shape = require "map_gen.presets.venus" ---shape = require "map_gen.presets.vanilla" ---shape = require "map_gen.presets.maltease_crossings" ---shape = require "map_gen.presets.tetris" ---shape = require "map_gen.presets.world_map_thanksgiving" ---shape = require "map_gen.presets.christmas_tree_of_terror" ---shape = require "map_gen.presets.rotten_apples" ---shape = require "map_gen.presets.spiral_crossings" ---shape = require "map_gen.presets.grid_bot_islands" ---shape = require "map_gen.presets.sierpinski_carpet" ---shape = require "map_gen.presets.test" - ---WIP maps-- ---require "map_gen.combined.meteor_strike" --unfinished ---shape = require "map_gen.presets.web" --unfinished ---shape = require "map_gen.presets.rings_and_boxes" --unfinished ---shape = require "map_gen.presets.ring_of_balls" --unfinished - ---shapes-- ---shape = require "map_gen.shape.left" ---shape = require "map_gen.shape.right" ---shape = require "map_gen.shape.up" ---require "map_gen.shape.maze" ---shape = require "map_gen.shape.spiral" ---shape = require "map_gen.shape.threaded_spirals" ---shape = require "map_gen.shape.spiral_tri" ---shape = require "map_gen.shape.spiral2" ---shape = require "map_gen.shape.donut" ---shape = b.rectangular_spiral(128) ---shape = require "map_gen.shape.diagonal_lattice" ---require "map_gen.shape.infinite_mazes" ---shape = require "map_gen.shape.x_shape" ---shape = require "map_gen.shape.pacman" - ---terrain-- ---shape = require "map_gen.terrain.neko_bridged_rivers" ---shape = require "map_gen.terrain.neko_river_overlay" - --- modules that only return max one entity per tile -local entity_modules = { - --require "map_gen.misc.loot_items", - --require "map_gen.terrain.mines", - --require "map_gen.terrain.deathworld", - --require "map_gen.ores.glitter_ores", - --require "map_gen.terrain.worms", - --require "map_gen.misc.wreck_items", - --require "map_gen.ores.neko_crazy_ores", - --require "map_gen.ores.fluffy_rainbows", - --require "map_gen.ores.harmonic_gen", - --require "map_gen.ores.resource_clustertruck" - --require "map_gen.ores.tiny_ores" -} - -local terrain_modules = { - --require "map_gen.misc.tris_chunk_grid", -} - ---everything else. You may use more than one of these, but beware they might not be compatible ---require "map_gen.misc.rusky_pvp" ---require("map_gen.misc.rail_grid") -- used for map_gen.presets.UK ---require ('map_gen.misc.change_landfill_tile'){'sand-1'} ---require ('map_gen.misc.danger_ore_banned_entities') ---require ('map_gen.misc.restrict_landfill_tile')({['water'] = true}) ---require "map_gen.ores.rso.rso_control" ---require 'map_gen.misc.nightfall' -- forces idle biters to attack at night ---require 'map_gen.misc.terraforming' -- prevents players from building on non-terraformed tiles ---require 'map_gen.misc.car_body' -- gives players cars instead of characters ---require 'map_gen.misc.naughty_words' -- admonishes players for cursing - -if #entity_modules > 0 then - shape = shape or b.full_shape - - shape = b.apply_entities(shape, entity_modules) -end - -if #terrain_modules > 0 then - shape = shape or b.full_shape - - for _, m in ipairs(terrain_modules) do - shape = b.overlay_tile_land(shape, m) - end -end - -if shape then - local surfaces = { - [RS.get_surface_name()] = shape - } - - local gen = require('map_gen.shared.generate') - gen.init({surfaces = surfaces, regen_decoratives = regen_decoratives, tiles_per_tick = tiles_per_tick}) - gen.register() -end diff --git a/map_selection.lua b/map_selection.lua new file mode 100644 index 00000000..40ffbb5a --- /dev/null +++ b/map_selection.lua @@ -0,0 +1,32 @@ +return require 'map_gen.maps.default' +--[[ + Replace the word default in the quotes above with the name of the map you want to play then save this file. + Example: If you want to play beach, line 1 should look like: + return require 'map_gen.maps.beach' + If default is left in place, you will get a vanilla world. + + You can get the full list of maps by looking in map_gen/maps/ + Names of some popular maps: + diggy + crash_site + beach + connected_dots + crosses + danger_ores + diagonal_ribbon + double_beach + fractal_balls + fruit_loops + grid_islands + grid_islands_rotated + line_and_tree + line_and_trees + lines_and_balls + lines_and_squares + maltease_crossings + rotten_apples + spiral_of_spirals + tetris + triangle_of_death + void_gears +]]