games/Rampant
1
0
Fork 0
mirror of https://github.com/veden/Rampant.git synced 2024-12-28 21:08:22 +02:00
Code Issues Releases Activity

see changelog

Browse Source
This commit is contained in:
Aaron Veden 2019-03-28 17:27:11 -07:00
parent 64d0b1bd43
commit 5d5b253b3d
4 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changelog.txt
View File

@ -1,3 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 0.17.13
Date: 3. 28. 2019
Bugfixes:
- Fixed bobs and NE find non colliding error
---------------------------------------------------------------------------------------------------
Version: 0.17.12
Date: 3. 27. 2019

2
info.json
View File

@ -1,7 +1,7 @@
{
"name" : "Rampant",
"factorio_version" : "0.17",
"version" : "0.17.12",
"version" : "0.17.13",
"title" : "Rampant",
"author" : "Veden",
"homepage" : "https://forums.factorio.com/viewtopic.php?f=94&t=31445",

2
libs/BaseUtils.lua
View File

@ -398,7 +398,7 @@ function baseUtils.upgradeEntity(entity, surface, baseAlignment, natives, evolut
if spawnerName then
entity.destroy()
local newPosition = surface.find_non_colliding_position(
BUILDING_SPACE_LOOKUP[spawnerName],
BUILDING_SPACE_LOOKUP[spawnerName] or spawnerName,
position,
CHUNK_SIZE,
1,

35
prototypes/SwarmUtils.lua
View File

@ -9,8 +9,6 @@ local mathUtils = require("__Rampant__/libs/MathUtils")
-- imported functions
local gaussianRandomRangeRG = mathUtils.gaussianRandomRangeRG
local roundToNearest = mathUtils.roundToNearest
local mMax = math.max
@ -1202,31 +1200,25 @@ local function addWormDefaults(template, upgrades)
end
local function unitSetToProbabilityTable(upgradeTable, unitSet, tier)
local function unitSetToProbabilityTable(unitSet, tier)
local dividers = {}
for i=1,#unitSet do
dividers[i] = 1
end
-- if upgradeTable then
local points = #unitSet * 2
for _=1,points do
local index
local points = #unitSet * 2
for _=1,points do
local index
if (tier == 1) then
index = mFloor(gaussianRandomRangeRG(tier, 1.3, 1, 2.5, xorRandom))
else
index = mFloor(gaussianRandomRangeRG(tier, 2, tier * 0.1, mMin(tier * 1.1, #unitSet), xorRandom)+1)
end
-- local index = mFloor(xorRandom() * #unitSet)+1
-- local upgrade = upgradeTable[index]
-- print(tier, index)
dividers[index] = dividers[index] + (((index < tier) and 4) or 1)
end
-- end
if (tier == 1) then
index = mFloor(gaussianRandomRangeRG(tier, 1.3, 1, 2.5, xorRandom))
else
index = mFloor(gaussianRandomRangeRG(tier, 2, tier * 0.1, mMin(tier * 1.1, #unitSet), xorRandom)+1)
end
dividers[index] = dividers[index] + (((index < tier) and 4) or 1)
end
local total = 0
for i=1,#dividers do
@ -1598,8 +1590,7 @@ function swarmUtils.buildUnitSpawner(templates, upgradeTable, attackGenerator, v
for i=1,variations.unitSpawner do
local unitSpawner = deepcopy(templates.unitSpawner)
unitSpawner.name = unitSpawner.name .. "-v" .. i .. "-t" .. t
local unitTable = unitSetToProbabilityTable(upgradeTable.probabilityTable,
unitSet,
local unitTable = unitSetToProbabilityTable(unitSet,
tier)
generateApperance(unitSpawner, ut)
unitSpawner.type = "spawner"