Merge pull request #245 from DestinyItemManager/fix-autostat

Fix autoStatMods/includeRuntimeStatBenefits
DestinyItemManager · Oct 22, 2024 · 69ddd46 · 69ddd46
2 parents bc2e0eb + e00c55b
commit 69ddd46
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/api/shapes/loadouts.ts b/api/shapes/loadouts.ts
@@ -209,6 +209,9 @@ export const defaultLoadoutParameters: LoadoutParameters = {
   assumeArmorMasterwork: AssumeArmorMasterwork.None,
   autoStatMods: true,
   includeRuntimeStatBenefits: true,
+  clearArmor: true,
+  clearMods: true,
+  clearWeapons: true,
 };
 
 /** A constraint on the values an armor stat can take */

diff --git a/api/stately/loadouts-queries.test.ts b/api/stately/loadouts-queries.test.ts
@@ -57,6 +57,10 @@ it('can roundtrip loadout parameters', () => {
   const loParams: LoadoutParameters = {
     ...defaultLoadoutParameters,
     exoticArmorHash: 3045642045,
+    autoStatMods: false,
+    clearArmor: true,
+    clearMods: true,
+    clearWeapons: true,
   };
 
   const statelyLoParams = client.create(
@@ -72,6 +76,9 @@ it('can roundtrip loadout parameters w/ a negative armor hash', () => {
   const loParams: LoadoutParameters = {
     ...defaultLoadoutParameters,
     exoticArmorHash: -1,
+    clearArmor: true,
+    clearMods: true,
+    clearWeapons: true,
   };
 
   const statelyLoParams = client.create(

diff --git a/api/stately/loadouts-queries.ts b/api/stately/loadouts-queries.ts
@@ -149,8 +149,6 @@ export function convertLoadoutParametersFromStately(
     modsByBucket: _.isEmpty(modsByBucket)
       ? undefined
       : listToMap('bucketHash', 'modHashes', modsByBucket),
-    autoStatMods: true,
-    includeRuntimeStatBenefits: true,
     artifactUnlocks: artifactUnlocks ? stripTypeName(artifactUnlocks) : undefined,
     inGameIdentifiers: inGameIdentifiers ? stripTypeName(inGameIdentifiers) : undefined,
   };

diff --git a/api/stately/stately-utils.ts b/api/stately/stately-utils.ts
@@ -104,7 +104,7 @@ export function convertEnum(
  */
 export function stripDefaults<T extends Record<string, unknown>>(data: T): Partial<T> {
   return Object.entries(data).reduce<Record<string, unknown>>((result, [key, value]) => {
-    if (value) {
+    if (value || value === false) {
       result[key] = value;
     }
     return result;