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

planet prison fixes

Browse Source
This commit is contained in:
Gerkiz 2021-04-01 22:06:44 +02:00
parent e22fe4316a
commit cfed977076
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maps/planet_prison.lua
View File

@ -669,7 +669,7 @@ local function print_merchant_position(player)
perks = assign_perks(player)
end
if perks and perks.minimap then
player.print(string.format('>> You received a broadcast with [gps=%d,%d,%d] coordinates', position.x, position.y, player.surface.name))
player.print(string.format('>> You received a broadcast with [gps=%d,%d,%s] coordinates', position.x, position.y, player.surface.name))
else
player.print(string.format('>> You were able to spot him %s from your location', CommonFunctions.get_readable_direction(player.position, position)))
end
@ -1237,6 +1237,10 @@ local function on_tick()
local tick = game.tick
local surf = this.surface
if not surf or not surf.valid then
return
end
if tick % 4 == 0 then
AIFunctions.do_job(surf, AIFunctions.command.seek_and_destroy_player)
end
@ -1248,7 +1252,7 @@ local function on_tick()
Timers.do_job()
end
if (tick + 1) % 100 == 0 then
AfkFunctions.on_inactive_players(5)
AfkFunctions.on_inactive_players(15)
end
if (tick + 1) % 500 == 0 then
remove_offline_players()
@ -1787,7 +1791,6 @@ setmetatable(
{
__newindex = function(_, n, v)
log('Desync warning: attempt to write to undeclared var ' .. n)
--game.print ("Attempt to write to undeclared var " .. n)
global[n] = v
end,
__index = function(_, n)

63
maps/planet_prison/mod/claims.lua
View File

@ -38,15 +38,14 @@ local function claim_new_claim(ent)
}
}
local claims = this._claims_info
if claims[ent.force.name] == nil then
claims[ent.force.name] = {}
claims[ent.force.name].polygons = {}
claims[ent.force.name].claims = {}
claims[ent.force.name].collections = {}
if this._claims_info[ent.force.name] == nil then
this._claims_info[ent.force.name] = {}
this._claims_info[ent.force.name].polygons = {}
this._claims_info[ent.force.name].claims = {}
this._claims_info[ent.force.name].collections = {}
end
insert(claims[ent.force.name].collections, point)
insert(this._claims_info[ent.force.name].collections, point)
end
local function claim_on_build_entity(ent)
@ -60,27 +59,27 @@ local function claim_on_build_entity(ent)
end
local in_range = false
local collections = data.collections
for i = 1, #collections do
local points = collections[i]
for i = 1, #data.collections do
if data.collections[i] then
for _, point in pairs(data.collections[i]) do
if point then
local dist = CommonFunctions.get_distance(point, ent.position)
if max_dist < dist then
goto continue
end
for _, point in pairs(points) do
point = point
local dist = CommonFunctions.get_distance(point, ent.position)
if max_dist < dist then
goto continue
in_range = true
point = {
x = CommonFunctions.get_axis(ent.position, 'x'),
y = CommonFunctions.get_axis(ent.position, 'y')
}
insert(data.collections[i], point)
data.claims[i] = CommonFunctions.get_convex_hull(data.collections[i])
break
::continue::
end
end
in_range = true
point = {
x = CommonFunctions.get_axis(ent.position, 'x'),
y = CommonFunctions.get_axis(ent.position, 'y')
}
insert(points, point)
data.claims[i] = CommonFunctions.get_convex_hull(points)
break
::continue::
end
end
@ -118,19 +117,17 @@ local function claim_on_entity_died(ent)
end
for i = 1, #data.collections do
local points = data.collections[i]
for j = 1, #points do
local point = points[j]
for j = 1, #data.collections[i] do
local point = data.collections[i][j]
if CommonFunctions.positions_equal(point, ent.position) then
remove(points, j)
remove(data.collections[i], j)
data.claims[i] = CommonFunctions.get_convex_hull(points)
data.claims[i] = CommonFunctions.get_convex_hull(data.collections[i])
break
end
end
if #points == 0 then
if #data.collections[i] == 0 then
remove(data.claims, i)
remove(data.collections, i)
break