Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2024-09-29 11:55:21 +00:00
Code Issues Projects Releases Wiki Activity

Moved New Game script and resources (i.e. portraits) to disk 2

Browse Source
This commit is contained in:
Martin Haye 2021-05-13 09:26:25 -07:00
parent f47713b4e0
commit f102f9b2b3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Platform/Apple/tools/PackPartitions/src/org/badvision/A2PackPartitions.groovy
View File

@ -1889,6 +1889,8 @@ class A2PackPartitions
//println "stuffed most-used portraits for $portraitsSpace bytes, totaling $blks blks."
assert partNum == 1 : "Root resources must fit on disk 1"
}
else if (mapName == "<second>")
reportWriter.println String.format(" %-22s: %6.1fK", "new game", mapSpace / 1024.0)
else {
addedMapNames << mapName
mapsSpaceUsed += mapSpace
@ -2013,7 +2015,7 @@ class A2PackPartitions
recordChunks("story", stories)
// Sort the maps in proper disk order
allMaps << [name:"<root>", order:-999999]
allMaps << [name:"<root>", order:-999999] << [name:"<second>", order: -888888]
Collections.sort(allMaps) { a,b ->
a.order < b.order ? -1 :
a.order > b.order ? 1 :
@ -2025,7 +2027,7 @@ class A2PackPartitions
reportWriter.println "======================== Floppy disk usage ==========================="
// Now fill up disk partitions until we run out of maps.
def mapsToDupe = allMaps.grep{ it.name != "<root>" && it.order < 0 }.collect{ it.name }.toSet()
def mapsToDupe = allMaps.grep{ it.name != "<root>" && it.name != "<second>" && it.order < 0 }.collect{ it.name }.toSet()
def mapsTodo = allMaps.collect { it.name }
def partChunks = []
def totalFloppySpace = 0
@ -2470,7 +2472,7 @@ class A2PackPartitions
}
modules.each { k,v ->
if (!nonReqGlobalScriptModules.contains(k))
if (!nonReqGlobalScriptModules.contains(k) && k != "gs_newGame")
addResourceDep("map", "<root>", "module", k)
}
}
@ -4262,6 +4264,8 @@ end
def gsmod = new ScriptModule()
def name = humanNameToSymbol(script.@name, false)
found << name
curMapName = (name == "newGame") ? "<second>" : "<root>"
addMapDep("module", "gs_" + name)
gsmod.packGlobalScript(new File("build/src/plasma/gs_${name}.pla.new"), script)
addResourceDep("globalFunc", name, "module", "gs_" + name)
replaceIfDiff("build/src/plasma/gs_${name}.pla")
@ -4396,7 +4400,6 @@ end
allPlayerFuncs(dataIn.global.sheets.sheet)
// Translate global scripts to code. Record their deps as system-level.
curMapName = "<root>"
recordGlobalScripts(dataIn)
genAllGlobalScripts(dataIn.global.scripts.script)
curMapName = null

4
Platform/Apple/virtual/src/plasma/diskops.pla
View File

@ -528,9 +528,11 @@ def newGame()#0
global->b_moveMode = 1 // normal
mmgr(START_LOAD, 1) // players module and new game module both in partition 1
playersModule = mmgr(QUEUE_LOAD, MOD_GEN_PLAYERS<<8 | RES_TYPE_MODULE)
newGameModule = mmgr(QUEUE_LOAD, GS_NEW_GAME<<8 | RES_TYPE_MODULE)
partyModule = mmgr(QUEUE_LOAD, MOD_PARTY<<8 | RES_TYPE_MODULE)
mmgr(FINISH_LOAD, 0)
mmgr(START_LOAD, 2) // new game in partition 2
newGameModule = mmgr(QUEUE_LOAD, GS_NEW_GAME<<8 | RES_TYPE_MODULE)
mmgr(FINISH_LOAD, 0)
playersModule()=>makeInitialParty()
loadMainFrameImg()
^EMUSIG_2D_MAP