Skip to content

Commit dd56828

Browse files
committed
Renamed ContentOptions members (more accurate now)
1 parent cf19f86 commit dd56828

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

build_common.ps1

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -200,22 +200,22 @@ class BuildProject {
200200
$this.contentOptions | Add-Member -MemberType NoteProperty -Name 'missingUncooked' -Value @()
201201
}
202202

203-
if (($this.contentOptions.PSobject.Properties | ForEach-Object {$_.Name}) -notcontains "packagesToMakeSF")
203+
if (($this.contentOptions.PSobject.Properties | ForEach-Object {$_.Name}) -notcontains "sfStandalone")
204204
{
205205
Write-Host "No packages to make SF"
206-
$this.contentOptions | Add-Member -MemberType NoteProperty -Name 'packagesToMakeSF' -Value @()
206+
$this.contentOptions | Add-Member -MemberType NoteProperty -Name 'sfStandalone' -Value @()
207207
}
208208

209-
if (($this.contentOptions.PSobject.Properties | ForEach-Object {$_.Name}) -notcontains "umapsToCook")
209+
if (($this.contentOptions.PSobject.Properties | ForEach-Object {$_.Name}) -notcontains "sfMaps")
210210
{
211211
Write-Host "No umaps to cook"
212-
$this.contentOptions | Add-Member -MemberType NoteProperty -Name 'umapsToCook' -Value @()
212+
$this.contentOptions | Add-Member -MemberType NoteProperty -Name 'sfMaps' -Value @()
213213
}
214214

215-
if (($this.contentOptions.PSobject.Properties | ForEach-Object {$_.Name}) -notcontains "collectionMapsToCook")
215+
if (($this.contentOptions.PSobject.Properties | ForEach-Object {$_.Name}) -notcontains "sfCollectionMaps")
216216
{
217217
Write-Host "No collection maps to cook"
218-
$this.contentOptions | Add-Member -MemberType NoteProperty -Name 'collectionMapsToCook' -Value @()
218+
$this.contentOptions | Add-Member -MemberType NoteProperty -Name 'sfCollectionMaps' -Value @()
219219
}
220220
}
221221

@@ -503,7 +503,7 @@ class BuildProject {
503503
}
504504

505505
[void]_RunCookAssets() {
506-
if (($this.contentOptions.packagesToMakeSF.Length -lt 1) -and ($this.contentOptions.umapsToCook.Length -lt 1)) {
506+
if (($this.contentOptions.sfStandalone.Length -lt 1) -and ($this.contentOptions.sfMaps.Length -lt 1)) {
507507
Write-Host "No asset cooking is requested, skipping"
508508
return
509509
}
@@ -571,11 +571,11 @@ class BuildProject {
571571
}
572572

573573
# Prepare the list of maps to cook
574-
$mapsToCook = $this.contentOptions.umapsToCook
574+
$mapsToCook = $this.contentOptions.sfMaps
575575

576576
# Collection maps also need the actual empty umap file created
577577
# (unless it's already provided for w/e reason)
578-
foreach ($mapDef in $this.contentOptions.collectionMapsToCook) {
578+
foreach ($mapDef in $this.contentOptions.sfCollectionMaps) {
579579
$mapsToCook += $mapDef.name
580580

581581
if ($null -eq (Get-ChildItem -Path $stagingContentForCook -Filter $mapDef.name -Recurse)) {
@@ -681,9 +681,9 @@ class BuildProject {
681681
}
682682

683683
# Copy over the SF packages
684-
for ($i = 0; $i -lt $this.contentOptions.packagesToMakeSF.Length; $i++)
684+
for ($i = 0; $i -lt $this.contentOptions.sfStandalone.Length; $i++)
685685
{
686-
$package = $this.contentOptions.packagesToMakeSF[$i];
686+
$package = $this.contentOptions.sfStandalone[$i];
687687
$dest = [io.path]::Combine($stagingCookedDir, "${package}.upk");
688688

689689
# Mod assets for some reason refuse to load with the _SF suffix
@@ -701,13 +701,13 @@ class BuildProject {
701701

702702
# SF Standalone packages
703703
$lines += "[Engine.PackagesToAlwaysCook]"
704-
foreach ($package in $this.contentOptions.packagesToMakeSF) {
704+
foreach ($package in $this.contentOptions.sfStandalone) {
705705
$lines += "+SeekFreePackage=$package"
706706
}
707707

708708
# Collection maps
709709
$lines += "[Engine.PackagesToForceCookPerMap]"
710-
foreach ($mapDef in $this.contentOptions.collectionMapsToCook) {
710+
foreach ($mapDef in $this.contentOptions.sfCollectionMaps) {
711711
$lines += "+Map=$($mapDef.name)"
712712

713713
foreach ($package in $mapDef.packages) {

0 commit comments

Comments
 (0)