implement quest condition for gear categories

soolar · Apr 17, 2023 · 646fa62 · 646fa62
1 parent bb3c2d2
commit 646fa62
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/mafia/data/chitter_gear_categories.json b/mafia/data/chitter_gear_categories.json
@@ -150,7 +150,10 @@
  "name": "rollover",
  "mods": [
  { "mod": "Adventures" },
- { "mod": "PVP Fights", "conditions": { "list": [{ "type": "pvp", "value": true }] } }
+ {
+ "mod": "PVP Fights",
+ "conditions": { "list": [{ "type": "pvp", "value": true }] }
+ }
  ],
  "conditions": { "list": [{ "type": "overdrunk", "value": true }] }
  },
@@ -223,7 +226,7 @@
  "type": "quest",
  "pref": "questS02Monkees",
  "value": "finished",
- "inverted": "true"
+ "comparison": "!"
  }
  ]
  }
@@ -275,7 +278,7 @@
  "type": "quest",
  "pref": "questL11Black",
  "value": "unstarted",
- "inverted": true
+ "comparison": "!"
  },
  {
  "type": "quest",
@@ -334,7 +337,7 @@
  "type": "quest",
  "pref": "questL11Manor",
  "value": "unstarted",
- "inverted": true
+ "comparison": "!"
  },
  {
  "type": "quest",

diff --git a/src/properties.ts b/src/properties.ts
@@ -20,7 +20,6 @@ import {
  Stat,
  StatType,
  storageAmount,
- toInt,
  toSlot,
  weaponHands,
 } from 'kolmafia'
@@ -32,7 +31,6 @@ import {
  numericProperties,
  stringProperties,
 } from 'libram/dist/propertyTypes'
-import { weapon } from 'libram/dist/resources/2008/Stickers'
 import { FieldValue, fieldValueToJSString } from './fieldValue'
 import { BrowserItem, foldableAmount } from './guidelines'
 
@@ -232,10 +230,13 @@ interface GearOverdrunkCondition {
  value: boolean
 }
 
+type ComparisonStr = '>' | '>=' | '<' | '<=' | '!'
+
 interface GearQuestCondition {
  type: 'quest'
  pref: string
  value: string
+ comparison?: ComparisonStr
  inverted?: boolean
 }
 
@@ -289,16 +290,40 @@ interface GearCategory {
 
 const evaluateGearCondition = (cond: GearCondition) => {
  switch (cond.type) {
- case 'quest':
- break
+ case 'quest': {
+ const prefVal = get(cond.pref)
+ if (cond.comparison) {
+ const questStepNum = (stepStr: string) =>
+ stepStr === 'finished'
+ ? 999
+ : stepStr === 'started'
+ ? 0
+ : stepStr.startsWith('step')
+ ? Number(stepStr.substring(5))
+ : -1
+ const compStepNum = questStepNum(cond.value)
+ const realStepNum = questStepNum(prefVal)
+ return cond.comparison === '>'
+ ? realStepNum > compStepNum
+ : cond.comparison === '>='
+ ? realStepNum >= compStepNum
+ : cond.comparison === '<'
+ ? realStepNum < compStepNum
+ : cond.comparison === '<='
+ ? realStepNum <= compStepNum
+ : cond.comparison === '!'
+ ? realStepNum !== compStepNum
+ : false
+ }
+ return prefVal === cond.value
+ }
  case 'mainstat':
  return (myPrimestat() === Stat.get(cond.value)) === !cond.inverted
  case 'overdrunk':
  return myInebriety() > inebrietyLimit() === cond.value
  case 'pvp':
  return hippyStoneBroken() === cond.value
  }
- return true
 }
 
 const evaluateGearConditions = (