games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-05-13 21:56:29 +02:00
Code Issues Releases Activity

more updates

Browse Source
This commit is contained in:
MewMew 2020-10-03 23:13:27 +02:00
parent 922d57161c
commit e918b8b23e
3 changed files with 94 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
maps/mountain_race/main.lua
View File

@ -1,3 +1,6 @@
require 'modules.biters_yield_ore'
require "modules.rocks_yield_ore_veins"
local Collapse = require "modules.collapse"
local Immersive_cargo_wagons = require "modules.immersive_cargo_wagons.main"
local Terrain = require 'maps.mountain_race.terrain'
@ -17,7 +20,7 @@ local function on_chunk_generated(event)
local surface = event.surface
if surface.index ~= 1 then return end
local left_top = event.area.left_top
if left_top.y >= mountain_race.playfield_height or left_top.y < mountain_race.playfield_height * -1 or left_top.x < 0 then
if left_top.y >= mountain_race.playfield_height or left_top.y < 0 or left_top.x < 0 then
Terrain.draw_out_of_map_chunk(surface, left_top)
return
end
@ -42,9 +45,15 @@ local function on_entity_died(event)
return
end
end
if entity.name == "character" then
Team.update_spawn_positions(mountain_race)
end
end
local function on_player_joined_game(event)
Team.update_spawn_positions(mountain_race)
local player = game.players[event.player_index]
if game.tick == 0 then
@ -59,17 +68,25 @@ local function on_player_joined_game(event)
end
Team.setup_player(mountain_race, player)
local surface = game.surfaces.nauvis
local tile = surface.get_tile(player.position)
if tile.valid then
if tile.name == "out-of-map" then
player.teleport(surface.find_non_colliding_position("character", player.force.get_spawn_position(surface), 64, 0.5), surface)
end
end
end
local function init(mountain_race)
if game.ticks_played % 60 ~= 30 then return end
if game.ticks_played % 120 ~= 30 then return end
game.print("game resetting..")
Immersive_cargo_wagons.reset()
Collapse.set_kill_entities(true)
Collapse.set_speed(1)
Collapse.set_amount(4)
Collapse.set_speed(4)
Collapse.set_amount(0)
Collapse.set_max_line_size(mountain_race.border_width + mountain_race.playfield_height * 2)
Collapse.set_surface(surface)
Collapse.set_position({0, 0})
@ -86,10 +103,10 @@ local function init(mountain_race)
end
local function prepare_terrain(mountain_race)
if game.ticks_played % 30 ~= 0 then return end
if game.ticks_played % 60 ~= 30 then return end
Terrain.clone_south_to_north(mountain_race)
if mountain_race.clone_x < 4 then return end
if mountain_race.clone_x < 6 then return end
game.print("preparing spawn..")
mountain_race.gamestate = "prepare_spawn"
end
@ -118,13 +135,38 @@ local function spawn_players(mountain_race)
mountain_race.gamestate = "game_in_progress"
end
local function set_collapse_speed(mountain_race)
if not mountain_race.locomotives.north then return end
if not mountain_race.locomotives.south then return end
local amount = math.abs(mountain_race.locomotives.north.position.x - mountain_race.locomotives.south.position.x) - 8
amount = math.floor(amount / 32)
if amount < 0 then amount = 0 end
Collapse.set_amount(amount)
end
local function chart(mountain_race)
local surface = game.surfaces.nauvis
local north = game.forces.north
local south = game.forces.south
local r = 128
local p = north.get_spawn_position(surface)
south.chart(surface, {{p.x - r, p.y - r}, {p.x + r, p.y + r}})
local p = south.get_spawn_position(surface)
north.chart(surface, {{p.x - r, p.y - r}, {p.x + r, p.y + r}})
end
local game_tasks = {
[30] = set_collapse_speed,
[60] = Terrain.clone_south_to_north,
[90] = chart,
}
local function game_in_progress(mountain_race)
local tick = game.ticks_played
if tick % 120 == 0 then
Terrain.clone_south_to_north(mountain_race)
end
if tick % 30 ~= 0 then return end
local task = tick % 120
if not game_tasks[task] then return end
game_tasks[task](mountain_race)
end
local function game_over(mountain_race)
@ -133,6 +175,7 @@ local function game_over(mountain_race)
if not mountain_race.reset_countdown then
mountain_race.reset_countdown = 10
Collapse.set_amount(0)
local message = "Team " .. mountain_race.victorious_team .. " has won the race!"
game.print(message, {255, 155, 0})
Server.to_discord_bold(table.concat{'*** ', message, ' ***'})
@ -149,6 +192,7 @@ end
local gamestates = {
["init"] = init,
["reroll_terrain"] = Terrain.reroll_terrain,
["generate_chunks"] = Terrain.generate_chunks,
["prepare_terrain"] = prepare_terrain,
["prepare_spawn"] = prepare_spawn,
["spawn_players"] = spawn_players,
@ -161,6 +205,7 @@ local function on_tick()
end
local function on_init()
game.difficulty_settings.technology_price_multiplier = 0.5
mountain_race.reset_counter = 0
mountain_race.gamestate = "init"
mountain_race.border_width = 4
@ -177,4 +222,6 @@ Event.add(defines.events.on_tick, on_tick)
Event.add(defines.events.on_chunk_generated, on_chunk_generated)
Event.add(defines.events.on_entity_damaged, on_entity_damaged)
Event.add(defines.events.on_entity_died, on_entity_died)
Event.add(defines.events.on_player_joined_game, on_player_joined_game)
Event.add(defines.events.on_player_joined_game, on_player_joined_game)
require "modules.rocks_yield_ore"

16
maps/mountain_race/team.lua
View File

@ -1,7 +1,7 @@
local Public = {}
local math_random = math.random
local starting_items = {['iron-plate'] = 32, ['iron-gear-wheel'] = 16, ['stone'] = 20, ['pistol'] = 1, ['firearm-magazine'] = 16}
local starting_items = {['iron-plate'] = 32, ['iron-gear-wheel'] = 16, ['stone'] = 20, ['pistol'] = 1, ['firearm-magazine'] = 128, ['rail'] = 16}
function Public.init_teams()
game.create_force("north")
@ -21,6 +21,7 @@ function Public.configure_teams(mountain_race)
force.technologies["artillery-shell-range-1"].enabled = false
force.technologies["artillery-shell-speed-1"].enabled = false
force.technologies["land-mine"].enabled = false
force.technologies["railway"].researched = true
end
game.forces.north.set_friend("spectator", true)
game.forces.south.set_friend("spectator", true)
@ -76,4 +77,17 @@ function Public.setup_player(mountain_race, player)
end
end
function Public.update_spawn_positions(mountain_race)
if not mountain_race.locomotives.north then return end
if not mountain_race.locomotives.south then return end
local surface = game.surfaces.nauvis
for _, force_name in pairs({"north", "south"}) do
local force = game.forces[force_name]
local p = mountain_race.locomotives[force_name].position
force.set_spawn_position({p.x, p.y + 2}, surface)
end
end
return Public

35
maps/mountain_race/terrain.lua
View File

@ -65,7 +65,7 @@ function Public.generate_spawn(mountain_race, force_name)
["south"] = {255, 65, 65},
}
for x = 0, 32, 2 do
for x = 0, 48, 2 do
surface.create_entity({name = 'straight-rail', position = {p.x + x, p.y}, direction = 2, force = force_name})
for k, tile in pairs(surface.find_tiles_filtered({area = {{p.x + x, p.y}, {p.x + x + 2, p.y + 2}}})) do
if tile.collides_with("resource-layer") then surface.set_tiles({{name = "landfill", position = tile.position}}, true) end
@ -73,7 +73,7 @@ function Public.generate_spawn(mountain_race, force_name)
end
local entity = surface.create_entity({name = 'locomotive', position = {p.x + 6, p.y}, force = force_name, direction = 2})
entity.minable = false
entity.color = teams[force_name]
rendering.draw_text({
@ -94,6 +94,15 @@ function Public.generate_spawn(mountain_race, force_name)
wagon.entity_count = 999
end
function Public.generate_chunks(mountain_race)
if game.ticks_played % 60 ~= 0 then return end
local surface = game.surfaces.nauvis
surface.request_to_generate_chunks({0, 0}, 10)
if not surface.is_chunk_generated({9, 0}) then return end
game.print("preparing terrain..")
mountain_race.gamestate = "prepare_terrain"
end
function Public.reroll_terrain(mountain_race)
if game.ticks_played % 60 ~= 0 then return end
@ -110,19 +119,19 @@ function Public.reroll_terrain(mountain_race)
local surface = game.surfaces.nauvis
local mgs = surface.map_gen_settings
mgs.seed = math_random(1, 99999999)
mgs.water = 1
mgs.water = 0.75
mgs.starting_area = 1
mgs.terrain_segmentation = 2
mgs.terrain_segmentation = 8
mgs.cliff_settings = {cliff_elevation_interval = 0, cliff_elevation_0 = 0}
mgs.autoplace_controls = {
["coal"] = {frequency = 8, size = 0.7, richness = 0.5,},
["stone"] = {frequency = 8, size = 0.7, richness = 0.5,},
["copper-ore"] = {frequency = 8, size = 0.7, richness = 0.75,},
["iron-ore"] = {frequency = 8, size = 0.7, richness = 1,},
["uranium-ore"] = {frequency = 5, size = 0.5, richness = 0.5,},
["crude-oil"] = {frequency = 5, size = 1, richness = 1,},
["coal"] = {frequency = 16, size = 1, richness = 0.5,},
["stone"] = {frequency = 16, size = 1, richness = 0.5,},
["copper-ore"] = {frequency = 16, size = 1, richness = 0.75,},
["iron-ore"] = {frequency = 16, size = 1, richness = 1,},
["uranium-ore"] = {frequency = 8, size = 0.5, richness = 0.5,},
["crude-oil"] = {frequency = 32, size = 1, richness = 1,},
["trees"] = {frequency = math.random(4, 32) * 0.1, size = math.random(4, 16) * 0.1, richness = math.random(1, 10) * 0.1},
["enemy-base"] = {frequency = 0, size = 0, richness = 0}
["enemy-base"] = {frequency = 16, size = 1, richness = 1}
}
surface.map_gen_settings = mgs
surface.clear(false)
@ -130,8 +139,8 @@ function Public.reroll_terrain(mountain_race)
surface.delete_chunk({chunk.x, chunk.y})
end
game.print("preparing terrain..")
mountain_race.gamestate = "prepare_terrain"
game.print("generating chunks..")
mountain_race.gamestate = "generate_chunks"
end
return Public