games/Rampant
1
0
Fork 0
mirror of https://github.com/veden/Rampant.git synced 2024-12-26 20:54:12 +02:00
Code Issues Releases Activity

FACTO-266: Fixed base x,y inititalize error

Browse Source
This commit is contained in:
Aaron Veden 2023-03-21 00:02:49 -07:00
parent 6216e8e799
commit 55e1386207
No known key found for this signature in database
GPG Key ID: FF5990B1C6DD3F84
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/BaseUtils.lua
View File

@ -616,8 +616,8 @@ function BaseUtils.createBase(map, chunk, tick)
local base = {
x = x,
y = y,
totalX = x,
totalY = y,
totalX = 0,
totalY = 0,
distanceThreshold = distanceThreshold * Universe.baseDistanceModifier,
tick = tick,
alignment = alignment,

21
libs/ChunkPropertyUtils.lua
View File

@ -52,7 +52,7 @@ local MAGIC_MAXIMUM_NUMBER = Constants.MAGIC_MAXIMUM_NUMBER
local activateMap
local manhattenDistancePoints = MathUtils.manhattenDistancePoints
local euclideanDistancePoints = MathUtils.euclideanDistancePoints
local tableSize = table_size
local mMin = math.min
@ -539,19 +539,12 @@ function ChunkPropertyUtils.findNearbyBase(chunk)
if foundBase then
return foundBase
end
local x = chunk.x
local y = chunk.y
local closest = MAGIC_MAXIMUM_NUMBER
for _, base in pairs(chunk.map.bases) do
local distance = manhattenDistancePoints(base.x, base.y, x, y)
if (distance <= base.distanceThreshold) and (distance < closest) then
closest = distance
foundBase = base
end
end
return foundBase
return ChunkPropertyUtils.findNearbyBaseByPosition(
chunk.map,
chunk.x,
chunk.y
)
end
function ChunkPropertyUtils.findNearbyBaseByPosition(map, x, y)
@ -559,7 +552,7 @@ function ChunkPropertyUtils.findNearbyBaseByPosition(map, x, y)
local closest = MAGIC_MAXIMUM_NUMBER
for _, base in pairs(map.bases) do
local distance = manhattenDistancePoints(base.x, base.y, x, y)
local distance = euclideanDistancePoints(base.x, base.y, x, y)
if (distance <= base.distanceThreshold) and (distance < closest) then
closest = distance
foundBase = base