games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2024-12-30 23:17:53 +02:00
Code Issues Releases Activity

Fix stack overflow

Browse Source
This commit is contained in:
Gerkiz 2024-04-22 22:53:48 +02:00
parent 2a41b16803
commit 690d16de37
3 changed files with 37 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
maps/mountain_fortress_v3/breached_wall.lua
View File

@ -170,26 +170,23 @@ local check_distance_between_player_and_locomotive = function(player)
gap_between_locomotive.highest_pos = locomotive.position
gap_between_locomotive = Public.get('gap_between_locomotive')
local p_y = position.y
local t_y = gap_between_locomotive.highest_pos.y
local c_y = collapse_position.y
local locomotive_distance
local collapse_distance
local source
if adjusted_zones.reversed then
locomotive_distance = p_y - t_y >= gap_between_locomotive.neg_gap
collapse_distance = p_y - c_y >= gap_between_locomotive.neg_gap_collapse
source = {position.x, locomotive.position.y + gap_between_locomotive.neg_gap - 4}
else
locomotive_distance = p_y - t_y <= gap_between_locomotive.neg_gap
collapse_distance = p_y - c_y <= gap_between_locomotive.neg_gap_collapse
source = {position.x, locomotive.position.y + gap_between_locomotive.neg_gap + 4}
local p_y = abs(position.y)
if p_y < 300 then
return
end
local t_y = abs(gap_between_locomotive.highest_pos.y)
local c_y = abs(collapse_position.y)
local locomotive_distance_too_far = p_y - t_y > gap_between_locomotive.neg_gap
local collapse_distance_too_far = p_y - c_y > gap_between_locomotive.neg_gap_collapse
if locomotive_distance_too_far then
if adjusted_zones.reversed then
player.teleport({position.x, t_y + gap_between_locomotive.neg_gap - 4}, surface)
else
player.teleport({position.x, (t_y + gap_between_locomotive.neg_gap - 4) * -1}, surface)
end
if locomotive_distance then
player.teleport(source, surface)
player.print(({'breached_wall.hinder'}), Color.warning)
if player.driving then
player.driving = false
@ -201,10 +198,12 @@ local check_distance_between_player_and_locomotive = function(player)
player.character.die('enemy')
end
end
end
if collapse_distance then
player.teleport(source, surface)
elseif collapse_distance_too_far then
if adjusted_zones.reversed then
player.teleport({position.x, t_y + gap_between_locomotive.neg_gap_collapse - 4}, surface)
else
player.teleport({position.x, (t_y + gap_between_locomotive.neg_gap_collapse - 4) * -1}, surface)
end
player.print(({'breached_wall.hinder_collapse'}), Color.warning)
if player.driving then
@ -273,25 +272,13 @@ local compare_player_and_train = function(player, entity)
gap_between_zones.highest_pos = locomotive.position
gap_between_zones = Public.get('gap_between_zones')
local c_y = position.y
local t_y = gap_between_zones.highest_pos.y
local c_y = abs(position.y)
local t_y = abs(gap_between_zones.highest_pos.y)
local adjusted_zones = Public.get('adjusted_zones')
local spidertron_warning_position = gap_between_zones.neg_gap + 50
local locomotive_distance_too_far = c_y - t_y > spidertron_warning_position
local locomotive_distance
local collapse_distance
if adjusted_zones.reversed then
local spidertron_warning_position = abs(gap_between_zones.neg_gap) + 50
locomotive_distance = c_y - t_y >= spidertron_warning_position
collapse_distance = c_y - t_y >= spidertron_warning_position
else
local spidertron_warning_position = gap_between_zones.neg_gap + 50
locomotive_distance = c_y - t_y <= spidertron_warning_position
collapse_distance = c_y - t_y <= spidertron_warning_position
end
if locomotive_distance then
if locomotive_distance_too_far then
local surface = player.surface
surface.create_entity(
{
@ -301,9 +288,6 @@ local compare_player_and_train = function(player, entity)
color = {r = 0.9, g = 0.0, b = 0.0}
}
)
end
if collapse_distance then
if entity.health then
if car and car.health_pool and car.health_pool.health then
car.health_pool.health = car.health_pool.health - 500

30
maps/mountain_fortress_v3/main.lua
View File

@ -229,16 +229,12 @@ function Public.reset_map()
if this.adjusted_zones.reversed then
Explosives.check_growth_below_void(false)
this.gap_between_locomotive.neg_gap = abs(this.gap_between_locomotive.neg_gap)
this.gap_between_locomotive.neg_gap_collapse = abs(this.gap_between_locomotive.neg_gap_collapse)
this.spawn_near_collapse.compare = abs(this.spawn_near_collapse.compare)
Collapse.set_position({0, -130})
Collapse.set_direction('south')
Public.locomotive_spawn(surface, {x = -18, y = -25}, this.adjusted_zones.reversed)
else
Explosives.check_growth_below_void(true)
this.gap_between_locomotive.neg_gap = abs(this.gap_between_locomotive.neg_gap) * -1
this.gap_between_locomotive.neg_gap_collapse = abs(this.gap_between_locomotive.neg_gap_collapse) * -1
this.spawn_near_collapse.compare = abs(this.spawn_near_collapse.compare) * -1
Collapse.set_position({0, 130})
Collapse.set_direction('north')
@ -473,28 +469,18 @@ local compare_collapse_and_train = function()
return
end
local c_y = collapse_pos.y
local t_y = locomotive.position.y
local c_y = abs(collapse_pos.y)
local t_y = abs(locomotive.position.y)
local result = abs(c_y - t_y)
local gap_between_zones = Public.get('gap_between_zones')
local adjusted_zones = Public.get('adjusted_zones')
if adjusted_zones.reversed then
local distance = c_y - t_y >= gap_between_zones.gap
if not distance then
Public.set_difficulty()
else
Collapse.set_speed(1)
Collapse.set_amount(10)
end
local distance = result > gap_between_zones.gap
if not distance then
Public.set_difficulty()
else
local distance = c_y - t_y <= gap_between_zones.gap
if distance then
Public.set_difficulty()
else
Collapse.set_speed(1)
Collapse.set_amount(10)
end
Collapse.set_speed(1)
Collapse.set_amount(10)
end
end

6
maps/mountain_fortress_v3/table.lua
View File

@ -136,14 +136,14 @@ function Public.reset_main_table()
this.gap_between_zones = {
set = false,
gap = 900,
neg_gap = -500,
neg_gap = 500,
highest_pos = 0
}
this.gap_between_locomotive = {
hinders = {},
gap = 900,
neg_gap = -3520, -- earlier 2112 (3 zones, whereas 704 is one zone)
neg_gap_collapse = -5520, -- earlier 2112 (3 zones, whereas 704 is one zone)
neg_gap = 3520, -- earlier 2112 (3 zones, whereas 704 is one zone)
neg_gap_collapse = 5520, -- earlier 2112 (3 zones, whereas 704 is one zone)
highest_pos = nil
}
this.force_chunk = false