closes #54

LandOfTheRair · Aug 19, 2024 · 5696494 · 5696494
1 parent d5e3d64
commit 5696494
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/src/app/tabs/droptables/droptables-editor/droptables-editor.component.html b/src/app/tabs/droptables/droptables-editor/droptables-editor.component.html
@@ -51,7 +51,7 @@
       </div>
     </div>
 
-    @for(drop of editingData.drops; track $index) {
+    @for(drop of sortDrops(editingData.drops); track $index) {
     <div class="form-row split">
       <div class="form-column">
         <div class="form-row">

diff --git a/src/app/tabs/droptables/droptables-editor/droptables-editor.component.ts b/src/app/tabs/droptables/droptables-editor/droptables-editor.component.ts
@@ -1,5 +1,11 @@
 import { Component, computed, signal } from '@angular/core';
-import { Holiday, IDroptable, IItemDefinition } from '../../../../interfaces';
+import { sortBy } from 'lodash';
+import {
+  Holiday,
+  IDroptable,
+  IItemDefinition,
+  Rollable,
+} from '../../../../interfaces';
 import { EditorBaseComponent } from '../../../shared/components/editor-base/editor-base.component';
 
 @Component({
@@ -48,4 +54,8 @@ export class DroptablesEditorComponent extends EditorBaseComponent<IDroptable> {
     if (!item) return false;
     return this.editing().drops.some((d) => d.result === item.name);
   }
+
+  public sortDrops(drops: Rollable[]): Rollable[] {
+    return sortBy(drops, 'result');
+  }
 }
diff --git a/src/app/tabs/items/items-editor/items-editor.component.html b/src/app/tabs/items/items-editor/items-editor.component.html
@@ -286,7 +286,7 @@
       </div>
     </div>
 
-    @for(item of editingData.containedItems; track $index) {
+    @for(item of sortContainedItems(editingData.containedItems || []); track $index) {
     <div class="form-row split">
       <div class="form-column">
         <div class="form-row pl-1">
@@ -417,7 +417,7 @@
         </div>
       </div>
 
-      @for(traitName of editingData.randomTrait.name; track $index) {
+      @for(traitName of sortRandomTraits(editingData.randomTrait.name); track $index) {
       <div class="form-row split">
         <div class="form-column">
           <div class="form-row">

diff --git a/src/app/tabs/items/items-editor/items-editor.component.ts b/src/app/tabs/items/items-editor/items-editor.component.ts
@@ -3,6 +3,7 @@ import { isNumber, sortBy } from 'lodash';
 import {
   IItemDefinition,
   ItemClassType,
+  Rollable,
   StatBlock,
   StatType,
 } from '../../../../interfaces';
@@ -364,7 +365,7 @@ export class ItemsEditorComponent
   private extractStats(item: IItemDefinition) {
     this.extractSetStats(item.stats);
 
-    Object.keys(item.randomStats).forEach((statKey) => {
+    Object.keys(item.randomStats ?? {}).forEach((statKey) => {
       const stat = statKey as StatType;
       const value = item.randomStats?.[stat] ?? { min: 0, max: 0 };
       this.allStatEdits.update((s) => [
@@ -380,6 +381,8 @@ export class ItemsEditorComponent
     if (item.randomTrait.name.length > 0) {
       this.currentTraitTab.set('random');
     }
+
+    console.log(item, item.randomTrait, item.trait);
   }
 
   private extractSetStats(stats: StatBlock) {
@@ -569,6 +572,14 @@ export class ItemsEditorComponent
     this.editing.set(item);
   }
 
+  public sortContainedItems(items: Rollable[]): Rollable[] {
+    return sortBy(items, 'result');
+  }
+
+  public sortRandomTraits(items: string[]): string[] {
+    return sortBy(items);
+  }
+
   public doSave() {
     const item = this.editing();
     this.assignStats(item);

diff --git a/src/app/tabs/spawners/spawners-editor/spawners-editor.component.html b/src/app/tabs/spawners/spawners-editor/spawners-editor.component.html
@@ -254,7 +254,7 @@
     </div>
 
 
-    @for(npc of editingData.npcIds; track $index) {
+    @for(npc of sortNPCIds(editingData.npcIds); track $index) {
     <div class="form-row split">
       <div class="form-column">
         <div class="form-row">

diff --git a/src/app/tabs/spawners/spawners-editor/spawners-editor.component.ts b/src/app/tabs/spawners/spawners-editor/spawners-editor.component.ts
@@ -1,5 +1,6 @@
 import { Component, computed, OnInit, signal } from '@angular/core';
-import { INPCDefinition, ISpawnerData } from '../../../../interfaces';
+import { sortBy } from 'lodash';
+import { INPCDefinition, ISpawnerData, Rollable } from '../../../../interfaces';
 import { EditorBaseComponent } from '../../../shared/components/editor-base/editor-base.component';
 
 @Component({
@@ -31,7 +32,8 @@ export class SpawnersEditorComponent
   ngOnInit(): void {
     const spawner = this.editing();
 
-    spawner._paths = spawner.paths.join('\n');
+    spawner.npcAISettings ??= [];
+    spawner._paths = spawner.paths?.join('\n') ?? '';
 
     this.editing.set(spawner);
 
@@ -75,6 +77,10 @@ export class SpawnersEditorComponent
     this.editing.set(spawner);
   }
 
+  public sortNPCIds(npcIds: Rollable[]): Rollable[] {
+    return sortBy(npcIds, 'result');
+  }
+
   public doSave() {
     const spawner = this.editing();