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

fix for missing markets

Browse Source
This commit is contained in:
MewMew 2020-02-24 15:55:59 +01:00
parent 044bf2459e
commit c988c42522
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control.lua
View File

@ -69,7 +69,7 @@ require "modules.autostash"
---- enable maps here ---- (maps higher up in the list may be more actually playable) ---- enable maps here ---- (maps higher up in the list may be more actually playable)
--require "maps.fish_defender.main" --require "maps.fish_defender.main"
--require "maps.biter_battles_v2.main" --require "maps.biter_battles_v2.main"
require "maps.native_war.main" --require "maps.native_war.main"
--require "maps.mountain_fortress_v2.main" --require "maps.mountain_fortress_v2.main"
--require "maps.island_troopers.main" --require "maps.island_troopers.main"
--require "maps.biter_hatchery.main" --require "maps.biter_hatchery.main"

7
maps/stone_maze/1x1_rooms.lua
View File

@ -1,3 +1,4 @@
local Basic_markets = require "functions.basic_markets"
local get_noise = require 'maps.stone_maze.noise' local get_noise = require 'maps.stone_maze.noise'
local room = {} local room = {}
@ -197,7 +198,7 @@ room.three_rocks = function(surface, cell_left_top, direction)
if math.random(1,2) == 1 then if math.random(1,2) == 1 then
local position = surface.find_non_colliding_position("market", {x = left_top.x + grid_size * 0.5, y = left_top.y + grid_size * 0.5}, grid_size * 0.5, 1) local position = surface.find_non_colliding_position("market", {x = left_top.x + grid_size * 0.5, y = left_top.y + grid_size * 0.5}, grid_size * 0.5, 1)
if position then super_market(surface, position, math.floor(global.maze_depth * 0.01) + 1) end if position then Basic_markets.super_market(surface, position, math.floor(global.maze_depth * 0.01) + 1) end
end end
surface.create_entity({name = rock_raffle[math.random(1, #rock_raffle)], position = {left_top.x + grid_size * 0.2, left_top.y + grid_size * 0.8}, force = "neutral"}) surface.create_entity({name = rock_raffle[math.random(1, #rock_raffle)], position = {left_top.x + grid_size * 0.2, left_top.y + grid_size * 0.8}, force = "neutral"})
@ -211,7 +212,7 @@ room.quad_rocks = function(surface, cell_left_top, direction)
if math.random(1,2) == 1 then if math.random(1,2) == 1 then
local position = surface.find_non_colliding_position("market", {x = left_top.x + grid_size * 0.5, y = left_top.y + grid_size * 0.5}, grid_size * 0.5, 1) local position = surface.find_non_colliding_position("market", {x = left_top.x + grid_size * 0.5, y = left_top.y + grid_size * 0.5}, grid_size * 0.5, 1)
if position then super_market(surface, position, math.floor(global.maze_depth * 0.01) + 1) end if position then Basic_markets.super_market(surface, position, math.floor(global.maze_depth * 0.01) + 1) end
end end
surface.create_entity({name = rock_raffle[math.random(1, #rock_raffle)], position = {left_top.x + grid_size * 0.15, left_top.y + grid_size * 0.15}, force = "neutral"}) surface.create_entity({name = rock_raffle[math.random(1, #rock_raffle)], position = {left_top.x + grid_size * 0.15, left_top.y + grid_size * 0.15}, force = "neutral"})
@ -313,7 +314,7 @@ local room_weights = {
{func = room.tons_of_rocks, weight = 35}, {func = room.tons_of_rocks, weight = 35},
{func = room.quad_rocks, weight = 7}, {func = room.quad_rocks, weight = 7},
{func = room.three_rocks, weight = 3}, {func = room.three_rocks, weight = 300},
{func = room.single_rock, weight = 8}, {func = room.single_rock, weight = 8},
{func = room.checkerboard_ore, weight = 7}, {func = room.checkerboard_ore, weight = 7},

3
maps/stone_maze/2x2_rooms.lua
View File

@ -1,3 +1,4 @@
local Basic_markets = require "functions.basic_markets"
local get_noise = require 'maps.stone_maze.noise' local get_noise = require 'maps.stone_maze.noise'
local room = {} local room = {}
@ -207,7 +208,7 @@ room.circle_pond_with_trees = function(surface, cell_left_top, direction)
map_functions.draw_noise_tile_circle({x = left_top.x + grid_size, y = left_top.y + grid_size}, "water", surface, grid_size * 0.5) map_functions.draw_noise_tile_circle({x = left_top.x + grid_size, y = left_top.y + grid_size}, "water", surface, grid_size * 0.5)
local position = surface.find_non_colliding_position("market", center_pos, grid_size, 1) local position = surface.find_non_colliding_position("market", center_pos, grid_size, 1)
if position then super_market(surface, position, math.floor(global.maze_depth * 0.01) + 1) end if position then Basic_markets.super_market(surface, position, math.floor(global.maze_depth * 0.01) + 1) end
for x = math.floor(grid_size * 2 * 0.1), math.floor(grid_size * 2 * 0.9), 1 do for x = math.floor(grid_size * 2 * 0.1), math.floor(grid_size * 2 * 0.9), 1 do
for y = math.floor(grid_size * 2 * 0.1), math.floor(grid_size * 2 * 0.9), 1 do for y = math.floor(grid_size * 2 * 0.1), math.floor(grid_size * 2 * 0.9), 1 do

1
maps/stone_maze/main.lua
View File

@ -9,7 +9,6 @@ require "modules.no_turrets"
--essentials --essentials
require "functions.maze" require "functions.maze"
require "functions.basic_markets"
require "modules.biters_yield_coins" require "modules.biters_yield_coins"
require "modules.rocks_yield_ore" require "modules.rocks_yield_ore"
require "modules.mineable_wreckage_yields_scrap" require "modules.mineable_wreckage_yields_scrap"