Skip to content

Commit

Permalink
Version 30
Browse files Browse the repository at this point in the history
Fixed Land Flattened. When survival structures spawn
  • Loading branch information
Jammer-git committed Sep 29, 2023
1 parent 8a84efe commit 63f8482
Show file tree
Hide file tree
Showing 15 changed files with 575 additions and 567 deletions.
Binary file added Preview_Gimp.xcf
Binary file not shown.
17 changes: 14 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ of the Vampire mod.
*From a Friend*

If the map vault does not work for you and a friend has the map, ask them to send you a copy
of their `survival_versus.v0026` in `Documents\My Games\Gas Powered Games\Supreme Commander Forged Alliance\Maps`.
of their `survival_versus.v0030` in `Documents\My Games\Gas Powered Games\Supreme Commander Forged Alliance\Maps`.
Then place that copy into the `Maps` directory.

*Manual Installation*
Expand All @@ -40,7 +40,7 @@ advertised version of the map, ie Survival Versus v24, is in itself not sufficie
many development versions of Survival Versus v24.

* Download the [latest development version of the map][download]
* Extract the zip. The result should be a directory named `survival_versus.v0026`
* Extract the zip. The result should be a directory named `survival_versus.v0030`
* Place the directory into `Documents\My Games\Gas Powered Games\Supreme Commander Forged Alliance\Maps`
* Clone `lib` into `vendor`

Expand All @@ -61,9 +61,20 @@ Shortcuts available via Make, see the `Makefile`.

## Release notes

### New in version 28
### New in version 30

Released on 2023-09-23

* Fixed land being flattened when SurvivalStructures spawn
* Remade the old preview.jpg
* Added Preview_Gimp.xcf for updating preview.jpg open with Gimp.

### New in version 29

Released on 2022-05-24

* Added extra spawn delay lobby options
* Improved lobby preview image

### New in version 27

Expand Down
Binary file added preview.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.v0028/'
local mapPath = '/maps/survival_versus.v0030/'

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.v0028/src/' .. fileName)
return import('/maps/survival_versus.v0030/src/' .. fileName)
end

local function vendorImport(fileName)
return import('/maps/survival_versus.v0028/vendor/EntropyLib/src/' .. fileName)
return import('/maps/survival_versus.v0030/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.v0028/survival_versus_tables.lua'),
import('/maps/survival_versus.v0030/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.v0028/vendor/EntropyLib/src/BaseSpanwer.lua')
local unitModifier = import('/maps/survival_versus.v0028/vendor/EntropyLib/src/CapturableUnitModifier.lua').newInstance()
local spawnerClass = import('/maps/survival_versus.v0030/vendor/EntropyLib/src/BaseSpanwer.lua')
local unitModifier = import('/maps/survival_versus.v0030/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.v0028/vendor/EntropyLib/src/UnitRevealer.lua').newInstance(
import('/maps/survival_versus.v0030/vendor/EntropyLib/src/UnitRevealer.lua').newInstance(
playerArmies.getIndexToNameMap()
),
playerArmies,
positions,
import('/maps/survival_versus.v0028/vendor/EntropyLib/src/UnitCreationCallbacks.lua').newInstance(ScenarioInfo),
import('/maps/survival_versus.v0030/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.v0028/src/survival/SurvivalTransportSpawner.lua')
local unitSpawnerClass = import('/maps/survival_versus.v0028/src/survival/SurvivalUnitSpawner.lua')
local transportSpawnerClass = import('/maps/survival_versus.v0030/src/survival/SurvivalTransportSpawner.lua')
local unitSpawnerClass = import('/maps/survival_versus.v0030/src/survival/SurvivalUnitSpawner.lua')

local AttackLocations = positions.AttackLocations

Expand Down
16 changes: 10 additions & 6 deletions src/survival/SurvivalStructures.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ newInstance = function()
local T3RADAR = "uab3104"
local T1RADAR = "uab3101"

local ScenarioUtils = import('/lua/sim/ScenarioUtilities.lua')
local topPos = ScenarioUtils.MarkerToPosition("SurvivalStructuresTop")
local bottomPos = ScenarioUtils.MarkerToPosition("SurvivalStructuresBottom")

local function configureOmni(omni)
makeInvincible(omni)
omni:SetIntelRadius('Vision', 500)
Expand All @@ -27,22 +31,22 @@ newInstance = function()

return {
createTopParagon = function(owningArmyName)
makeInvincible(CreateUnitHPR(PARAGON, owningArmyName, 0, 0, 0, 0, 0, 0))
makeInvincible(CreateUnitHPR(PARAGON, owningArmyName, topPos[1], topPos[2], topPos[3], 0, 0, 0))
end,
createBottomParagon = function(owningArmyName)
makeInvincible(CreateUnitHPR(PARAGON, owningArmyName, 512, 0, 512, 0, 0, 0))
makeInvincible(CreateUnitHPR(PARAGON, owningArmyName, bottomPos[1], bottomPos[2], bottomPos[3], 0, 0, 0))
end,
createTopRadar = function(owningArmyName)
configureRadar(CreateUnitHPR(T1RADAR, owningArmyName, 0, 0, 0, 0, 0, 0))
configureRadar(CreateUnitHPR(T1RADAR, owningArmyName, topPos[1], topPos[2], topPos[3], 0, 0, 0))
end,
createBottomRadar = function(owningArmyName)
configureRadar(CreateUnitHPR(T1RADAR, owningArmyName, 512, 0, 512, 0, 0, 0))
configureRadar(CreateUnitHPR(T1RADAR, owningArmyName, bottomPos[1], bottomPos[2], bottomPos[3], 0, 0, 0))
end,
createTopOmni = function(owningArmyName)
configureOmni(CreateUnitHPR(T3RADAR, owningArmyName, 0, 0, 0, 0, 0, 0))
configureOmni(CreateUnitHPR(T3RADAR, owningArmyName, topPos[1], topPos[2], topPos[3], 0, 0, 0))
end,
createBottomOmni = function(owningArmyName)
configureOmni(CreateUnitHPR(T3RADAR, owningArmyName, 512, 0, 512, 0, 0, 0))
configureOmni(CreateUnitHPR(T3RADAR, owningArmyName, bottomPos[1], bottomPos[2], bottomPos[3], 0, 0, 0))
end
}
end
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.v0028/src/survival/TeamBonusHealthMultiplier.lua').newInstance(
local hpMultiplier = import('/maps/survival_versus.v0030/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.v0028/src/survival/HealthMultiplier.lua').newInstance(
local healthMultiplier = import('/maps/survival_versus.v0030/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.v0028/vendor/EntropyLib/src/UnitCreator.lua').newUnitCreator()
local unitCreator = import('/maps/survival_versus.v0030/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.v0028/src/survival/DeathEvents.lua').newInstance(playerArmies)
local deathEvents = import('/maps/survival_versus.v0030/src/survival/DeathEvents.lua').newInstance(playerArmies)
deathEvents.startMonitoring()

local finalStageWasCompleted = false
Expand Down
Binary file modified survival_versus.scmap
Binary file not shown.
Loading

0 comments on commit 63f8482

Please sign in to comment.