diff --git a/src/frontend/MartialPoints/OrderParser.ts b/src/frontend/MartialPoints/OrderParser.ts index 3f8aff1..1f9f6ab 100644 --- a/src/frontend/MartialPoints/OrderParser.ts +++ b/src/frontend/MartialPoints/OrderParser.ts @@ -19,16 +19,25 @@ export function getMartialPointsFromOrders(orders: string): MartialPointData { // matches ALH version // ;*** desert (3,1) - let matches = line.match(/;\*\*\* \w+ \((\d+),(\d+)\)/); + // also + // ;*** desert (3,1,underworld) + let matches = line.match(/;\*\*\* \w+ \((\d+),(\d+),?(\w+)?\)/); if (matches) { currentRegion = `${matches[1]},${matches[2]}`; + if (matches[3]) { + currentRegion += `,${matches[3]}`; + } } // matches advisor version // ; desert (3,1) in Great Boldur Desert - matches = line.match(/; \w+ \((\d+),(\d+)\)/); + // ; desert (3,1,underworld) in Great Boldur Desert + matches = line.match(/; \w+ \((\d+),(\d+),?(\w+)?\)/); if (matches) { currentRegion = `${matches[1]},${matches[2]}`; + if (matches[3]) { + currentRegion += `,${matches[3]}`; + } } const hasProduce = !!line.trim().match(/^[@]?produce/);