games/Rampant
1
0
Fork 0
mirror of https://github.com/veden/Rampant.git synced 2025-03-11 14:49:32 +02:00
Code Issues Releases Activity

fixing runtime crashes

Browse Source
This commit is contained in:
Aaron Veden 2021-02-13 22:24:17 -08:00
parent 5f3364da06
commit 7c47a495fd
No known key found for this signature in database
GPG Key ID: FF5990B1C6DD3F84
4 changed files with 22 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.luacheckrc
View File

@ -1,5 +1,6 @@
globals = {
"game",
"data",
"remote",
"settings",
"commands",

3
data-final-fixes.lua
View File

@ -1,11 +1,8 @@
local vanillaBuildings = require("prototypes/buildings/UpdatesVanilla")
local biterFunctions = require("prototypes/utils/BiterUtils")
local swarmUtils = require("prototypes/SwarmUtils")
if settings.startup["rampant-newEnemies"].value then
swarmUtils.processFactions()
swarmUtils.generateSpawnerProxy(data.raw["unit-spawner"]["neutral-biter-spawner-v1-t10-rampant"].result_units)

4
libs/MathUtils.lua
View File

@ -42,8 +42,8 @@ function mathUtils.distort(xorRandom, num, stdDev, min, max)
local amax = max or num * 1.30
local sd = stdDev or 0.17
if (num < 0) then
local t = min
amin = max
local t = amin
amin = amax
amax = t
end
return mathUtils.roundToNearest(mathUtils.gaussianRandomRangeRG(num, num * sd, amin, amax, xorRandom), 0.01)

62
prototypes/SwarmUtils.lua
View File

@ -1,7 +1,6 @@
local swarmUtils = {}
-- imports
local droneUtils = require("utils/DroneUtils")
local bombUtils = require("utils/BombUtils")
local attackFlame = require("utils/AttackFlame")
local energyThiefFaction = require("EnergyThief")
@ -18,16 +17,8 @@ local fireUtils = require("utils/FireUtils")
local constants = require("__Rampant__/libs/Constants")
local mathUtils = require("__Rampant__/libs/MathUtils")
local unitSpawnerUtils = require("UnitSpawnerUtils")
local spawner_idle_animation = unitSpawnerUtils.spawner_idle_animation
-- imported functions
local addFactionAddon = energyThiefFaction.addFactionAddon
local addFactionAddon = poisonFaction.addFactionAddon
local roundToNearest = mathUtils.roundToNearest
local mMax = math.max
@ -35,7 +26,6 @@ local mMin = math.min
local distort = mathUtils.distort
local mFloor = math.floor
local deepcopy = util.table.deepcopy
local TIER_UPGRADE_SET_10 = constants.TIER_UPGRADE_SET_10
@ -67,11 +57,6 @@ local gaussianRandomRangeRG = mathUtils.gaussianRandomRangeRG
local makeBloodFountains = particleUtils.makeBloodFountains
local makeBiterCorpse = biterUtils.makeBiterCorpse
local makeUnitSpawnerCorpse = biterUtils.makeUnitSpawnerCorpse
local makeWormCorpse = biterUtils.makeWormCorpse
local makeSpitterCorpse = biterUtils.makeSpitterCorpse
local makeBubble = beamUtils.makeBubble
local makeBeam = beamUtils.makeBeam
local createElectricAttack = biterUtils.createElectricAttack
@ -125,11 +110,6 @@ local bombAttackNumeric = {
["explosionCount"] = { 2, 3, 4, 5, 6, 8, 10, 12, 13, 14 }
}
local slowStickerNumeric = {
["stickerMovementModifier"] = { 0.8, 0.8, 0.75, 0.75, 0.7, 0.7, 0.65, 0.65, 0.5, 0.5 },
["stickerDuration"] = { 1800, 1800, 1900, 1900, 2000, 2000, 2100, 2100, 2200, 2200 }
}
local streamAttackNumeric = {
["stickerDamagePerTick"] = { 0.6, 0.6, 0.8, 0.8, 0.8, 0.9, 1, 1, 1.3, 1.5 },
["particleTimeout"] = { 3, 3, 4, 4, 5, 5, 6, 6, 7, 7 },
@ -511,7 +491,7 @@ local function fillEntityTemplate(entity)
if not entity.loot then
entity.loot = {}
end
for k,lootTable in pairs(entity.drops) do
for _,lootTable in pairs(entity.drops) do
entity.loot[#entity.loot+1] = lootTable[tier]
end
elseif (key == "explosion") then
@ -709,20 +689,20 @@ function swarmUtils.buildUnits(template)
elseif (unit.type == "biter") then
entity = makeBiter(unit)
elseif (unit.type == "drone") then
if not death then
death = {
type = "direct",
action_delivery =
{
type = "instant",
target_effects =
{
type = "create-entity",
entity_name = "massive-explosion"
}
}
}
end
-- if not unit.death then
-- unit.death = {
-- type = "direct",
-- action_delivery =
-- {
-- type = "instant",
-- target_effects =
-- {
-- type = "create-entity",
-- entity_name = "massive-explosion"
-- }
-- }
-- }
-- end
entity = makeDrone(unit)
end
@ -742,7 +722,6 @@ local function buildEntities(entityTemplates)
for tier=1, 10 do
local effectiveLevel = TIER_UPGRADE_SET_10[tier]
local result = {}
local entityTemplate = entityTemplates[effectiveLevel]
@ -1136,7 +1115,6 @@ local function buildUnitTemplate(faction, unit)
template.resistances = {}
local attackAnimation
if (template.type == "biter") then
template.attackAnimation = biterattackanimation
elseif (template.type == "spitter") then
@ -1195,8 +1173,8 @@ local function buildTurretTemplate(faction, turret)
return template
end
local function buildUnitSpawnerTemplate(faction, template, unitSets)
local template = deepcopy(template)
local function buildUnitSpawnerTemplate(faction, incomingTemplate, unitSets)
local template = deepcopy(incomingTemplate)
template.name = faction.type .. "-" .. template.name
template.tint = faction.tint
@ -1252,8 +1230,8 @@ local function buildUnitSpawnerTemplate(faction, template, unitSets)
return template
end
local function buildHiveTemplate(faction, template)
local template = deepcopy(template)
local function buildHiveTemplate(faction, incomingTemplate)
local template = deepcopy(incomingTemplate)
template.name = faction.type .. "-" .. template.name
template.tint = faction.tint
@ -1278,8 +1256,6 @@ local function buildHiveTemplate(faction, template)
local unitSet = {}
local buildingVariations = settings.startup["rampant-newEnemyVariations"].value
for t=1,10 do
local unitSetTier = unitSet[t]
for i=1,#template.buildSets do