diff --git a/map_gen/data/.map_previews/factorio_logo_4096by4096.PNG b/map_gen/data/.map_previews/factorio_logo_4096by4096.PNG deleted file mode 100644 index 975ad788..00000000 Binary files a/map_gen/data/.map_previews/factorio_logo_4096by4096.PNG and /dev/null differ diff --git a/map_gen/maps/christmas_tree_of_terror.lua b/map_gen/maps/christmas_tree_of_terror.lua index e7514a50..042ea9a8 100644 --- a/map_gen/maps/christmas_tree_of_terror.lua +++ b/map_gen/maps/christmas_tree_of_terror.lua @@ -1,4 +1,5 @@ -- Map by Jayefuu, based on Triangle of Death map by grilledham +--TODO: rebalance and then enable market. local b = require 'map_gen.shared.builders' local Random = require 'map_gen.shared.random' @@ -23,11 +24,12 @@ RS.set_map_gen_settings( MGSP.cliff_none } ) -global.config.market.create_standard_market = false +--disables the market and coin features. set line 28 to "true" instead of "false" to negate this. +global.config.market.enabled = false ScenarioInfo.set_map_name('Christmas Tree of Terror') -ScenarioInfo.set_map_description("Triangle of death's Christmas cousin!\nThe further you go down the tree, the better your presents get. Have you been a good factory worker this year?") -ScenarioInfo.add_map_extra_info('Christmas tree shaped death world with plenty of loot to fight for.\nCan you reach the presents at the base of the tree?') +ScenarioInfo.set_map_description("Triangle of death's Christmas cousin") +ScenarioInfo.add_map_extra_info('Christmas tree shaped death world.\nChristmas themed ore patches.\nLoot scattered in cars throughout the map.\nStandard market disabled.') local generator local ammos = { @@ -49,6 +51,7 @@ local ammos = { 'shotgun-shell' } +--Sets player ammo damage at a disadvantage. Change the number on line 59 to a less negative or positive integer to negate this. local function init_weapon_damage() local p_force = game.forces.player @@ -57,6 +60,7 @@ local function init_weapon_damage() end end +--Syncs ammo and turret damage techs between the player force and enemy. Event.add( defines.events.on_research_finished, function(event) diff --git a/map_gen/maps/factory_squared.lua b/map_gen/maps/factory_squared.lua new file mode 100644 index 00000000..be952972 --- /dev/null +++ b/map_gen/maps/factory_squared.lua @@ -0,0 +1,24 @@ +-- Size of the logo. +local scale_factor = 6 + +-- Distance between islands. +local island_distance_x = 256 +local island_distance_y = 128 + +local b = require "map_gen.shared.builders" + +local pic = require "map_gen.data.presets.factorio_logo2" +pic = b.decompress(pic) + +local shape = b.picture(pic) +shape = b.scale(shape, scale_factor, scale_factor) + +local pattern_width = scale_factor * pic.width + island_distance_x +local pattern_height = scale_factor * pic.height + island_distance_y +shape = b.single_pattern(shape, pattern_width, pattern_height) + +shape = b.change_tile(shape, false, "water") + +shape = b.fish(shape, 0.008) + +return shape diff --git a/map_gen/maps/loading_screen.lua b/map_gen/maps/loading_screen.lua new file mode 100644 index 00000000..b3c263ca --- /dev/null +++ b/map_gen/maps/loading_screen.lua @@ -0,0 +1,7 @@ +local b = require "map_gen.shared.builders" + +local pic = require "map_gen.data.presets.factory" +pic = b.decompress(pic) +local map = b.picture(pic) + +return map