closes #48

LandOfTheRair · Aug 17, 2024 · e42d539 · e42d539
1 parent 6dbc76f
commit e42d539
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 12 deletions.
diff --git a/src/app/helpers/constants.ts b/src/app/helpers/constants.ts
@@ -269,7 +269,7 @@ export const typePropDefaults: Record<
   Bottle: { ounces: 1 },
   Food: { ounces: 1 },
   Gem: {},
-  Book: { bookPages: [], bookItemFilter: '', bookFindablePages: '' },
+  Book: { bookPages: [], bookItemFilter: '', bookFindablePages: 0 },
   Trap: { trapUses: 1 },
   Twig: { type: 'Staff' },
 };

diff --git a/src/app/helpers/schemas/_helpers.ts b/src/app/helpers/schemas/_helpers.ts
@@ -94,11 +94,17 @@ export const isPartialSkillObjectFailure = isPartialObjectOfFailure<Skill>(
   Object.values(Skill)
 );
 
-export const isPartialEquipmentObject = isPartialObjectOf<ItemSlot>(
-  Object.values(ItemSlot)
-);
+export const isPartialEquipmentObject = isPartialObjectOf<ItemSlot>([
+  'weapon',
+  'armor',
+  ...Object.values(ItemSlot),
+] as ItemSlot[]);
 export const isPartialEquipmentObjectFailure =
-  isPartialObjectOfFailure<ItemSlot>(Object.values(ItemSlot));
+  isPartialObjectOfFailure<ItemSlot>([
+    'weapon',
+    'armor',
+    ...Object.values(ItemSlot),
+  ] as ItemSlot[]);
 
 export const isPartialReputationObject = isPartialObjectOf<Allegiance>(
   Object.values(Allegiance)
@@ -107,7 +113,9 @@ export const isPartialReputationObjectFailure =
   isPartialObjectOfFailure<Allegiance>(Object.values(Allegiance));
 
 export function isItemSlot(val: any): boolean {
-  return Object.values(ItemSlot).includes(val as ItemSlot);
+  return (
+    ['weapon', 'armor', ...Object.values(ItemSlot)] as ItemSlot[]
+  ).includes(val as ItemSlot);
 }
 
 export function isTraitObject(val: any): boolean {
@@ -204,10 +212,6 @@ export function isEffect(eff: any): boolean {
   return eff.name && isNumber(eff.potency);
 }
 
-export function isEncrust(enc: any): boolean {
-  return !!(enc.stats || enc.equipEffect || enc.strikeEffect);
-}
-
 export function isBookPage(val: any): boolean {
   return val.id === '' && isString(val.text);
 }

diff --git a/src/app/helpers/schemas/item.ts b/src/app/helpers/schemas/item.ts
@@ -5,8 +5,10 @@ import {
   isBookPage,
   isCosmetic,
   isEffect,
-  isEncrust,
   isIntegerBetween,
+  isItemSlot,
+  isObjectWithSome,
+  isObjectWithSomeFailure,
   isPartialStatObject,
   isPartialStatObjectFailure,
   isRandomStatObject,
@@ -81,7 +83,20 @@ export const itemSchema: Schema = [
   ['breakEffect.name', false, isString],
   ['breakEffect.potency', false, isInteger],
 
-  ['encrustGive', false, isEncrust],
+  [
+    'encrustGive',
+    false,
+    isObjectWithSome(['slots', 'stats', 'strikeEffect']),
+    isObjectWithSomeFailure(['slots', 'stats', 'strikeEffect']),
+  ],
+  ['encrustGive.slots', false, isArrayOf(isItemSlot)],
+  ['encrustGive.stats', false, isPartialStatObject, isPartialStatObjectFailure],
+  ['encrustGive.strikeEffect', false, isEffect],
+  ['encrustGive.strikeEffect.name', false, isString],
+  ['encrustGive.strikeEffect.potency', false, isInteger],
+  ['encrustGive.strikeEffect.chance', false, isIntegerBetween(0, 100)],
+  ['encrustGive.strikeEffect.duration', false, isInteger],
+  ['encrustGive.strikeEffect.range', false, isIntegerBetween(0, 5)],
 
   ['tier', false, isInteger],
   ['destroyOnDrop', false, isBoolean],

diff --git a/src/app/tabs/items/items-editor/items-editor.component.html b/src/app/tabs/items/items-editor/items-editor.component.html
@@ -319,6 +319,33 @@
     </div>
     }
 
+    @case('bookPages') {
+    <div class="form-row">
+      <button class="btn btn-accent btn-sm w-full" (click)="addBookPage()">
+        Add book page
+      </button>
+    </div>
+
+    @for(item of editingData.bookPages; track item) {
+    <div class="form-row split">
+      <div class="form-column">
+        <div class="form-row">
+          <app-input-floating-label>Page Text</app-input-floating-label>
+          <input [(ngModel)]="item.text" type="text" placeholder="Enter page text..." class="form-input" />
+        </div>
+      </div>
+
+      <div class="form-column button-column">
+        <div class="form-row w-full flex justify-end">
+          <button class="ml-1 btn btn-error btn-sm" (click)="removeBookPage($index)">
+            <ng-icon name="heroMinus"></ng-icon>
+          </button>
+        </div>
+      </div>
+    </div>
+    }
+    }
+
     @default {
     {{ prop }} ({{ propTypes[prop] }}) has no editor.
     }

diff --git a/src/app/tabs/items/items-editor/items-editor.component.ts b/src/app/tabs/items/items-editor/items-editor.component.ts
@@ -182,6 +182,8 @@ export class ItemsEditorComponent
       chance: 0,
     };
 
+    item.bookPages ??= [];
+
     this.editing.set(item);
   }
 
@@ -505,6 +507,10 @@ export class ItemsEditorComponent
         delete item.encrustGive;
       }
     }
+
+    if (!item.bookPages?.length) {
+      delete item.bookPages;
+    }
   }
 
   changeTraitTab(newTraitSetting: TraitSetting) {
@@ -549,6 +555,20 @@ export class ItemsEditorComponent
     this.editing.set(item);
   }
 
+  public addBookPage() {
+    const item = this.editing();
+    item.bookPages?.push({ id: '', text: '' });
+
+    this.editing.set(item);
+  }
+
+  public removeBookPage(index: number) {
+    const item = this.editing();
+    item.bookPages?.splice(index, 1);
+
+    this.editing.set(item);
+  }
+
   public doSave() {
     const item = this.editing();
     this.assignStats(item);