Skip to content

Commit

Permalink
bump to v28
Browse files Browse the repository at this point in the history
  • Loading branch information
JeroenDeDauw committed Nov 27, 2021
1 parent b3520e8 commit f5f31c8
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/FinalFactory.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Top level factory / state holder

local mapPath = '/maps/survival_versus.v0027/'
local mapPath = '/maps/survival_versus.v0028/'

local entropyLib = import(mapPath .. 'vendor/EntropyLib/src/EntropyLib.lua').newInstance(mapPath .. 'vendor/EntropyLib/')
local notifier
Expand Down
6 changes: 3 additions & 3 deletions src/FinalRushPro.lua
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
newInstance = function(ScenarioInfo)
local function localImport(fileName)
return import('/maps/survival_versus.v0027/src/' .. fileName)
return import('/maps/survival_versus.v0028/src/' .. fileName)
end

local function vendorImport(fileName)
return import('/maps/survival_versus.v0027/vendor/EntropyLib/src/' .. fileName)
return import('/maps/survival_versus.v0028/vendor/EntropyLib/src/' .. fileName)
end

local options = localImport('FinalRushOptions.lua').newInstance(ScenarioInfo.Options)
Expand Down Expand Up @@ -66,7 +66,7 @@ newInstance = function(ScenarioInfo)
local function setupResourceDeposits()
local resourcesSpawner = localImport('ResourcesSpawner.lua').newInstance(
vendorImport('ResourceCreator.lua').newInstance(),
import('/maps/survival_versus.v0027/survival_versus_tables.lua'),
import('/maps/survival_versus.v0028/survival_versus_tables.lua'),
import('/lua/sim/ScenarioUtilities.lua').GetMarkers(),
playerArmies
)
Expand Down
4 changes: 2 additions & 2 deletions src/survival/IslandBases.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
newInstance = function()
local spawnerClass = import('/maps/survival_versus.v0027/vendor/EntropyLib/src/BaseSpanwer.lua')
local unitModifier = import('/maps/survival_versus.v0027/vendor/EntropyLib/src/CapturableUnitModifier.lua').newInstance()
local spawnerClass = import('/maps/survival_versus.v0028/vendor/EntropyLib/src/BaseSpanwer.lua')
local unitModifier = import('/maps/survival_versus.v0028/vendor/EntropyLib/src/CapturableUnitModifier.lua').newInstance()

local function spawnCentralMex(baseSpawner)
local mex = baseSpawner.spawnCentralStructure("uab1302") -- T3 mex
Expand Down
4 changes: 2 additions & 2 deletions src/survival/Survival.lua
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ newInstance = function(ScenarioInfo, localImport, options, textPrinter, playerAr
localImport('survival/ParagonEvent.lua').newInstance(
ScenarioFramework,
unitCreator,
import('/maps/survival_versus.v0027/vendor/EntropyLib/src/UnitRevealer.lua').newInstance(
import('/maps/survival_versus.v0028/vendor/EntropyLib/src/UnitRevealer.lua').newInstance(
playerArmies.getIndexToNameMap()
),
playerArmies,
positions,
import('/maps/survival_versus.v0027/vendor/EntropyLib/src/UnitCreationCallbacks.lua').newInstance(ScenarioInfo),
import('/maps/survival_versus.v0028/vendor/EntropyLib/src/UnitCreationCallbacks.lua').newInstance(ScenarioInfo),
textPrinter
).setUp()
end
Expand Down
4 changes: 2 additions & 2 deletions src/survival/SurvivalSpawnerFactory.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
newInstance = function(options, ScenarioFramework, unitCreator, playerArmies, positions,
spawnOutEffect, TransportDestinations)

local transportSpawnerClass = import('/maps/survival_versus.v0027/src/survival/SurvivalTransportSpawner.lua')
local unitSpawnerClass = import('/maps/survival_versus.v0027/src/survival/SurvivalUnitSpawner.lua')
local transportSpawnerClass = import('/maps/survival_versus.v0028/src/survival/SurvivalTransportSpawner.lua')
local unitSpawnerClass = import('/maps/survival_versus.v0028/src/survival/SurvivalUnitSpawner.lua')

local AttackLocations = positions.AttackLocations

Expand Down
6 changes: 3 additions & 3 deletions src/survival/SurvivalUnitCreator.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ end

local function setupTeamBalanceBonus(unitCreator, ScenarioInfo)
if ScenarioInfo.Options.opt_FinalRushTeamBonusHP ~= 0 then
local hpMultiplier = import('/maps/survival_versus.v0027/src/survival/TeamBonusHealthMultiplier.lua').newInstance(
local hpMultiplier = import('/maps/survival_versus.v0028/src/survival/TeamBonusHealthMultiplier.lua').newInstance(
ScenarioInfo.Options.opt_FinalRushTeamBonusHP
)

Expand All @@ -37,7 +37,7 @@ end

local function setupHealthMultiplication(unitCreator, ScenarioInfo, options)
if ScenarioInfo.Options.opt_FinalRushHealthIncrease ~= 0 then
local healthMultiplier = import('/maps/survival_versus.v0027/src/survival/HealthMultiplier.lua').newInstance(
local healthMultiplier = import('/maps/survival_versus.v0028/src/survival/HealthMultiplier.lua').newInstance(
ScenarioInfo.Options.opt_FinalRushHealthIncrease
)

Expand Down Expand Up @@ -69,7 +69,7 @@ local function setupHealthMultiplication(unitCreator, ScenarioInfo, options)
end

function newUnitCreator(ScenarioInfo, options, spawnOutEffect)
local unitCreator = import('/maps/survival_versus.v0027/vendor/EntropyLib/src/UnitCreator.lua').newUnitCreator()
local unitCreator = import('/maps/survival_versus.v0028/vendor/EntropyLib/src/UnitCreator.lua').newUnitCreator()

unitCreator.onUnitCreated(function(unit, unitInfo)
unit:SetVeterancy(5)
Expand Down
2 changes: 1 addition & 1 deletion src/survival/SurvivalVictory.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function newInstance(options, textPrinter, playerArmies, notifier)
local deathEvents = import('/maps/survival_versus.v0027/src/survival/DeathEvents.lua').newInstance(playerArmies)
local deathEvents = import('/maps/survival_versus.v0028/src/survival/DeathEvents.lua').newInstance(playerArmies)
deathEvents.startMonitoring()

local finalStageWasCompleted = false
Expand Down
10 changes: 5 additions & 5 deletions survival_versus_scenario.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version = 3
ScenarioInfo = {
name="Survival Versus",
map_version=27,
map_version=28,
description="Survive longer than the other team to win the game. Survive till the end of the final stage for full victory. https://github.com/SupremeCommanderMaps/SurvivalVersus",
norushoffsetX_ARMY_BOTTOM_LEFT=0,
norushoffsetX_ARMY_BOTTOM_LMID=0,
Expand All @@ -20,10 +20,10 @@ ScenarioInfo = {
norushoffsetY_ARMY_TOP_LMID=0,
norushoffsetY_ARMY_TOP_LEFT=0,
norushradius=110,
map="/maps/survival_versus.v0027/survival_versus.scmap",
preview="/maps/survival_versus.v0027/preview.jpg",
save="/maps/survival_versus.v0027/survival_versus_save.lua",
script="/maps/survival_versus.v0027/survival_versus_script.lua",
map="/maps/survival_versus.v0028/survival_versus.scmap",
preview="/maps/survival_versus.v0028/preview.jpg",
save="/maps/survival_versus.v0028/survival_versus_save.lua",
script="/maps/survival_versus.v0028/survival_versus_script.lua",
size={ 512, 512 },
starts=true,
type="skirmish",
Expand Down
2 changes: 1 addition & 1 deletion survival_versus_script.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local finalRush

function OnPopulate()
import('/lua/sim/ScenarioUtilities.lua').InitializeArmies()
finalRush = import('/maps/survival_versus.v0027/src/FinalRushPro.lua').newInstance(ScenarioInfo)
finalRush = import('/maps/survival_versus.v0028/src/FinalRushPro.lua').newInstance(ScenarioInfo)
finalRush.setUp()
Sync.CampaignMode = true
end
Expand Down

0 comments on commit f5f31c8

Please sign in to comment.