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

Fix taking a pluralizable item away from the party

Browse Source
This commit is contained in:
Martin Haye 2021-10-19 07:57:47 -07:00
parent 69d24b0b8c
commit 5ae48fa4fb
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,6 +144,7 @@ class A2PackPartitions
def maxMapSections = 0
def itemNameToFunc = [:]
def itemSingularToPlural = [:]
def playerNameToFunc = [:]
def nWeapons
@ -4011,6 +4012,7 @@ class A2PackPartitions
// Global mapping of item name to function, so that give/take functions can create items.
funcs.each { typeName, func, index, row ->
itemNameToFunc[toSingular(row.@name)] = func
itemSingularToPlural[toSingular(row.@name)] = row.@name
}
// And return the funcs.
@ -5341,8 +5343,9 @@ end
def packTakeItem(blk)
{
def name = getSingle(blk.field, 'NAME').text().trim()
assert itemNameToFunc.containsKey(toSingular(name)) : "Can't locate item '$name'"
outIndented("takeItemFromParty(${escapeString(name)})\n")
def singular = toSingular(name)
assert itemNameToFunc.containsKey(singular) : "Can't locate item '$name'"
outIndented("takeItemFromParty(${escapeString(itemSingularToPlural[singular])})\n")
}
def packBuyFromStore(blk)
@ -5623,8 +5626,9 @@ end
def packHasItem(blk)
{
def name = getSingle(blk.field, "NAME").text().trim()
assert itemNameToFunc.containsKey(toSingular(name)) : "Can't locate item '$name'"
out << "partyHasItem(${escapeString(name)})"
def singular = toSingular(name)
assert itemNameToFunc.containsKey(singular) : "Can't locate item '$name'"
out << "partyHasItem(${escapeString(itemSingularToPlural[singular])})"
}
def packHasPlayer(blk)