games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2024-12-26 22:56:43 +02:00
Code Issues Releases Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Gerkiz 2022-04-08 16:51:52 +02:00 committed by GitHub
commit 4e8231f05d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maps/mountain_fortress_v3/breached_wall.lua
View File

@ -276,6 +276,10 @@ local function distance(player)
Task.set_timeout_in_ticks(550, collapse_message, data)
end
if Collapse.start_now() then
clear_breach_text_and_render()
end
RPG.set_value_to_player(index, 'bonus', bonus + 1)
RPG.gain_xp(player, bonus_xp_on_join * bonus)

19
maps/mountain_fortress_v3/terrain.lua
View File

@ -341,7 +341,7 @@ local function wall(p, data)
force = 'player',
callback = stone_wall
}
if not alert_zone_1 then
if not alert_zone_1 and data.y >= -zone_settings.zone_depth then
local x_min = -zone_settings.zone_width / 2
local x_max = zone_settings.zone_width / 2
WPT.set('zone1_beam1', surface.create_entity({name = 'electric-beam', position = {x_min, p.y}, source = {x_min, p.y}, target = {x_max, p.y}}))
@ -2568,8 +2568,21 @@ local function init_terrain(adjusted_zones)
count = count + 1
end
adjusted_zones.size = count
adjusted_zones.shuffled_zones = shuffled_zones
count = count - 1
local shuffle_again = {}
local size = 132
for inc = 1, size do
local map = shuffled_zones[random(1, count)]
if map then
shuffle_again[inc] = map
end
end
adjusted_zones.size = size
adjusted_zones.shuffled_zones = shuffle_again
adjusted_zones.init_terrain = true
end