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

fix for bobs and ne integration

This commit is contained in:
Aaron Veden 2018-01-29 19:04:35 -08:00
parent 4eeb7f583f
commit 40cab5ed60
5 changed files with 19 additions and 16 deletions

View File

@ -191,10 +191,10 @@ function upgrade.attempt(natives)
game.surfaces[1].print("Rampant - Version 0.16.9")
global.version = constants.VERSION_44
end
if (global.version < constants.VERSION_49) then
if (global.version < constants.VERSION_50) then
game.surfaces[1].print("Rampant - Version 0.16.14")
global.version = constants.VERSION_49
game.surfaces[1].print("Rampant - Version 0.16.15")
global.version = constants.VERSION_50
end
return starting ~= global.version, natives

View File

@ -1,3 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 0.16.15
Date: 1. 29. 2018
Bugfixes:
- Fixed NE and bobs integration
---------------------------------------------------------------------------------------------------
Version: 0.16.14
Date: 1. 28. 2018

View File

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

View File

@ -8,7 +8,6 @@ local constants = require("Constants")
local EVOLUTION_INCREMENTS = constants.EVOLUTION_INCREMENTS
local BASE_ALIGNMENT_BOBS = constants.BASE_ALIGNMENT_BOBS
local ENABLED_NE_UNITS = constants.ENABLED_NE_UNITS
-- imported functions

View File

@ -19,7 +19,7 @@ constants.VERSION_33 = 33
constants.VERSION_38 = 38
constants.VERSION_41 = 41
constants.VERSION_44 = 44
constants.VERSION_49 = 49
constants.VERSION_50 = 50
-- misc
@ -186,20 +186,18 @@ constants.BASE_ALIGNMENT_EVOLUTION_BASELINE = {
[constants.BASE_ALIGNMENT_NUCLEAR] = 0.7
}
constants.ENABLED_NE_UNITS = settings.startup["rampant-enableNEUnits"].value
constants.ENABLED_BOBS_UNITS = settings.startup["rampant-enableBobsUnits"].value
local option = settings.startup["NE_Difficulty"]
constants.ENABLED_NE_UNITS = settings.startup["rampant-enableNEUnits"].value and (option and option.value)
local option = settings.startup["bobmods-enemies-enableartifacts"]
if option and option.value and constants.ENABLED_BOBS_UNITS then
-- local t = constants.BASE_ALIGNMENT_PATHS[constants.BASE_ALIGNMENT_NEUTRAL]
-- t[#t+1] = constants.BASE_ALIGNMENT_BOBS
option = settings.startup["bobmods-enemies-enableartifacts"]
constants.ENABLED_BOBS_UNITS = settings.startup["rampant-enableBobsUnits"].value and (option and option.value)
if constants.ENABLED_BOBS_UNITS then
constants.BASE_ALIGNMENT_EVOLUTION_BASELINE[constants.BASE_ALIGNMENT_BOBS] = 0.1
end
option = settings.startup["NE_Difficulty"]
if option and option.value and constants.ENABLED_NE_UNITS then
-- local t = constants.BASE_ALIGNMENT_PATHS[constants.BASE_ALIGNMENT_NEUTRAL]
-- t[#t+1] = constants.BASE_ALIGNMENT_NE
if constants.ENABLED_NE_UNITS then
constants.BASE_ALIGNMENT_EVOLUTION_BASELINE[constants.BASE_ALIGNMENT_NE] = 0.1
end