games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-02-07 13:31:40 +02:00
Code Issues Releases Activity

fixes

Browse Source
This commit is contained in:
MewMew 2019-08-21 01:17:06 +02:00
parent 8bb71c4d49
commit 82ff91416d
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
maps/overgrowth.lua
View File

@ -114,9 +114,9 @@ end
local function get_surface_settings()
local map_gen_settings = {}
map_gen_settings.seed = math_random(1, 1000000)
map_gen_settings.water = "2"
map_gen_settings.starting_area = "2.5"
map_gen_settings.cliff_settings = {cliff_elevation_interval = 38, cliff_elevation_0 = 38}
map_gen_settings.water = math_random(15, 30) * 0.1
map_gen_settings.starting_area = 1
map_gen_settings.cliff_settings = {cliff_elevation_interval = math_random(4, 48), cliff_elevation_0 = math_random(4, 48)}
map_gen_settings.autoplace_controls = {
["coal"] = {frequency = "2", size = "1", richness = "1"},
["stone"] = {frequency = "2", size = "1", richness = "1"},
@ -124,8 +124,8 @@ local function get_surface_settings()
["iron-ore"] = {frequency = "2.5", size = "1.1", richness = "1"},
["uranium-ore"] = {frequency = "2", size = "1", richness = "1"},
["crude-oil"] = {frequency = "3", size = "1", richness = "1.5"},
["trees"] = {frequency = "1", size = "1", richness = "0.5"},
["enemy-base"] = {frequency = "256", size = "0.61", richness = "1"}
["trees"] = {frequency = "2", size = "1", richness = "0.75"},
["enemy-base"] = {frequency = "4", size = "1.25", richness = "1"}
}
return map_gen_settings
end
@ -137,15 +137,16 @@ function reset_map()
global.trees_grow_chunks_charted = {}
global.trees_grow_chunks_charted_counter = 0
local surface = game.connected_players[1].surface
local surface = soft_reset_map(surface, get_surface_settings(), starting_items)
global.current_surface = soft_reset_map(global.current_surface, get_surface_settings(), starting_items)
reset_difficulty_poll()
global.trees_defeated = 0
tree_gui()
global.market = spawn_market(surface, {x = 0, y = -8})
global.market = spawn_market(global.current_surface, {x = 0, y = -8})
game.map_settings.enemy_evolution.time_factor = difficulties_votes_evo[4]
end
local function on_player_joined_game(event)
@ -153,13 +154,20 @@ local function on_player_joined_game(event)
if player.online_time == 0 then
for item, amount in pairs(starting_items) do
player.insert({name = item, count = amount})
end
end
if global.current_surface then
if player.surface.name ~= global.current_surface.name then
local pos = global.current_surface.find_non_colliding_position("character", {x = 0, y = 0}, 1, 0.5)
player.teleport(pos, global.current_surface)
end
end
if not global.market then
local surface = game.create_surface("overgrowth", get_surface_settings())
game.forces["player"].set_spawn_position({x = 0, y = 0}, surface)
player.teleport({0,0}, surface)
if not global.market and game.tick == 0 then
global.current_surface = game.create_surface("overgrowth", get_surface_settings())
game.forces["player"].set_spawn_position({x = 0, y = 0}, global.current_surface)
player.teleport({0,0}, global.current_surface)
reset_map()
end
@ -214,7 +222,7 @@ local function attack_market()
c = global.difficulty_vote_index * 2
game.map_settings.enemy_evolution.time_factor = difficulties_votes_evo[global.difficulty_vote_index]
end
game.connected_players[1].surface.set_multi_command({
global.current_surface.set_multi_command({
command={
type=defines.command.attack,
target=global.market,
@ -224,7 +232,7 @@ local function attack_market()
force = "enemy",
unit_search_distance=1024
})
game.connected_players[1].surface.set_multi_command({
global.current_surface.set_multi_command({
command={
type=defines.command.attack,
target=global.market,

8
modules/autohotbar.lua
View File

@ -20,6 +20,7 @@ end
local function set_hotbar(player, item)
if not game.entity_prototypes[item] then return end
if not game.recipe_prototypes[item] then return end
local slot_index = get_empty_hotbar_slot(player)
if not slot_index then return end
if is_item_already_present_in_hotbar(player, item) then return end
@ -41,6 +42,11 @@ local function on_picked_up_item(event)
set_hotbar(game.players[event.player_index], event.item_stack.name)
end
local function on_player_mined_entity(event)
set_hotbar(game.players[event.player_index], event.entity.name)
end
event.add(defines.events.on_player_fast_transferred, on_player_fast_transferred)
event.add(defines.events.on_player_crafted_item, on_player_crafted_item)
event.add(defines.events.on_picked_up_item, on_picked_up_item)
event.add(defines.events.on_picked_up_item, on_picked_up_item)
event.add(defines.events.on_player_mined_entity, on_player_mined_entity)

4
modules/difficulty_vote.lua
View File

@ -59,7 +59,9 @@ local function set_difficulty()
a = a / vote_count
local new_index = math.round(a, 0)
if global.difficulty_vote_index ~= new_index then
game.print(">>> Map difficulty has changed to " .. difficulties[new_index].name .. " difficulty!", difficulties[new_index].print_color)
local message = table.concat({">> Map difficulty has changed to ", difficulties[new_index].name, " difficulty!"})
game.print(message, difficulties[new_index].print_color)
server_commands.to_discord_embed(message)
end
global.difficulty_vote_index = new_index
global.difficulty_vote_value = difficulties[new_index].value