add achievement editor, fix other bugs

src/app/helpers/achievement.ts

@@ -0,0 +1,45 @@
+import {
+  BaseClassType,
+  IAchievement,
+  IAchievementRequirements,
+  SkillType,
+  TradeskillType,
+} from '../../interfaces';
+import { id } from './id';
+
+export const defaultAchievementRequirements: () => IAchievementRequirements =
+  () => ({
+    bindItem: {
+      item: '',
+    },
+    kill: {
+      npc: '',
+    },
+    level: {
+      baseClass: undefined as unknown as BaseClassType,
+      level: 0,
+    },
+    skill: {
+      level: 0,
+      skill: undefined as unknown as SkillType,
+    },
+    tradeskill: {
+      level: 0,
+      tradeskill: undefined as unknown as TradeskillType,
+    },
+  });
+
+export const defaultAchievement: () => IAchievement = () => ({
+  _id: id(),
+  ap: 0,
+  desc: '',
+  icon: 'uncertainty',
+  iconColor: '',
+  iconBgColor: '',
+  iconBorderColor: '',
+  activationType: 'other',
+  hidden: false,
+  name: '',
+  requirements: defaultAchievementRequirements(),
+  shareWithParty: false,
+});

src/app/helpers/exporter.ts

@@ -21,6 +21,7 @@ export function formatMod(modData: IModKit): IModKit {
     cores: modData.cores,
     stems: modData.stems,
     traitTrees: modData.traitTrees,
+    achievements: modData.achievements,
   };
 
   return exported;

src/app/helpers/index.ts

@@ -1,3 +1,4 @@
+export * from './achievement';
 export * from './constants';
 export * from './core';
 export * from './dialog';

src/app/helpers/schemas/_helpers.ts

@@ -9,6 +9,7 @@ import {
 } from 'lodash';
 import {
   Allegiance,
+  BaseClass,
   DamageClass,
   HasIdentification,
   ItemClass,
@@ -20,6 +21,7 @@ import {
   SchemaValidatorMessage,
   Skill,
   Stat,
+  Tradeskill,
 } from '../../../interfaces';
 
 const itemSlots = [
@@ -132,6 +134,10 @@ export function isSkill(val: any): boolean {
   return Object.values(Skill).includes(val as Skill);
 }
 
+export function isTradeskill(val: any): boolean {
+  return Object.values(Tradeskill).includes(val as Tradeskill);
+}
+
 export function isItemSlot(val: any): boolean {
   return itemSlots.includes(val as ItemSlot);
 }
@@ -239,6 +245,10 @@ export function isRequirement(req: any): boolean {
   return !!(req.level || req.baseClass || req.alignment || req.quest);
 }
 
+export function isBaseClass(req: any): boolean {
+  return Object.values(BaseClass).includes(req as BaseClass);
+}
+
 export function isSuccor(suc: any): boolean {
   return suc.map && isInteger(suc.x) && isInteger(suc.y);
 }

src/app/helpers/schemas/achievement.ts

@@ -0,0 +1,38 @@
+import { isBoolean, isNumber, isObject, isString } from 'lodash';
+import { Schema } from '../../../interfaces';
+import { isBaseClass, isSkill, isTradeskill } from './_helpers';
+
+export const achievementSchema: Schema = [
+  ['ap', true, isNumber],
+  ['desc', true, isString],
+  ['name', true, isString],
+  ['hidden', false, isBoolean],
+  ['shareWithParty', false, isBoolean],
+
+  ['activationType', true, isString],
+
+  ['icon', true, isString],
+  ['iconColor', true, isString],
+  ['iconBgColor', true, isString],
+  ['iconBorderColor', true, isString],
+
+  ['requirements', true, isObject],
+
+  ['requirements.bindItem', true, isObject],
+  ['requirements.bindItem.item', false, isString],
+
+  ['requirements.kill', true, isObject],
+  ['requirements.kill.npc', false, isString],
+
+  ['requirements.level', true, isObject],
+  ['requirements.level.baseClass', false, isBaseClass],
+  ['requirements.level.level', false, isNumber],
+
+  ['requirements.skill', true, isObject],
+  ['requirements.skill.skill', false, isSkill],
+  ['requirements.skill.level', false, isNumber],
+
+  ['requirements.tradeskill', true, isObject],
+  ['requirements.tradeskill.skill', false, isTradeskill],
+  ['requirements.tradeskill.level', false, isNumber],
+];

src/app/helpers/schemas/index.ts

@@ -1,3 +1,4 @@
+export * from './achievement';
 export * from './dialog';
 export * from './droptable';
 export * from './item';

src/app/helpers/validate.ts

@@ -22,6 +22,7 @@ import {
   nonexistentItems,
   nonexistentNPCs,
   nonexistentRecipes,
+  validateAchievements,
   validateDialogs,
   validateDialogsItems,
   validateDroptables,
@@ -67,6 +68,7 @@ export function validationMessagesForMod(
     validateSTEMs(mod),
     validateSTEMProperties(mod),
     validateRNGDungeons(mod, classes),
+    validateAchievements(mod),
     nonexistentItems(mod),
     nonexistentNPCs(mod),
     nonexistentRecipes(mod),

src/app/helpers/validators/achievement.ts

@@ -0,0 +1,30 @@
+import {
+  IAchievement,
+  IModKit,
+  ValidationMessage,
+  ValidationMessageGroup,
+} from '../../../interfaces';
+import { achievementSchema } from '../schemas';
+import { validateSchema } from '../schemas/_helpers';
+
+export function validateAchievements(mod: IModKit): ValidationMessageGroup {
+  const itemValidations: ValidationMessageGroup = {
+    header: 'Invalid Achievements',
+    messages: [],
+  };
+
+  mod.achievements.forEach((item) => {
+    const failures = validateSchema<IAchievement>(
+      item.name,
+      item,
+      achievementSchema
+    );
+    const validationFailures: ValidationMessage[] = failures.map((f) => ({
+      type: 'error',
+      message: f,
+    }));
+    itemValidations.messages.push(...validationFailures);
+  });
+
+  return itemValidations;
+}

src/app/helpers/validators/index.ts

@@ -1,3 +1,4 @@
+export * from './achievement';
 export * from './autogenerated';
 export * from './dialog';
 export * from './droptable';

src/app/home/home.component.html

@@ -190,6 +190,10 @@
         <app-trait-trees class="h-full"></app-trait-trees>
         }
 
+        @case (11) {
+        <app-achievements class="h-full"></app-achievements>
+        }
+
         }
       </div>
     </div>

src/app/home/home.component.ts

@@ -102,6 +102,10 @@ export class HomeComponent implements OnInit {
       name: 'Trait Trees',
       count: computed(() => this.modService.mod().traitTrees.length),
     },
+    {
+      name: 'Achievements',
+      count: computed(() => this.modService.mod().achievements.length),
+    },
   ];
 
   constructor() {}

src/app/home/home.module.ts

@@ -12,7 +12,10 @@ import { NgxFloatUiModule } from 'ngx-float-ui';
 
 import { AnalysisComponent } from '../analysis/analysis.component';
 import { PinpointComponent } from '../pinpoint/pinpoint.component';
+import { QueryComponent } from '../query/query.component';
 import { SharedModule } from '../shared/shared.module';
+import { AchievementsEditorComponent } from '../tabs/achievements/achievements-editor/achievements-editor.component';
+import { AchievementsComponent } from '../tabs/achievements/achievements.component';
 import { CoresEditorComponent } from '../tabs/cores/cores-editor/cores-editor.component';
 import { CoresComponent } from '../tabs/cores/cores.component';
 import { DialogsEditorComponent } from '../tabs/dialogs/dialogs-editor/dialogs-editor.component';
@@ -36,7 +39,6 @@ import { TraitTreesEditorComponent } from '../tabs/trait-trees/trait-trees-edito
 import { TraitTreesComponent } from '../tabs/trait-trees/trait-trees.component';
 import { ValidationComponent } from '../validation/validation.component';
 import { HomeComponent } from './home.component';
-import { QueryComponent } from '../query/query.component';
 
 @NgModule({
   declarations: [
@@ -61,6 +63,8 @@ import { QueryComponent } from '../query/query.component';
     CoresEditorComponent,
     TraitTreesComponent,
     TraitTreesEditorComponent,
+    AchievementsComponent,
+    AchievementsEditorComponent,
     StemsComponent,
     StemsEditorComponent,
     PinpointComponent,
@@ -78,8 +82,6 @@ import { QueryComponent } from '../query/query.component';
     CodeEditorModule,
     ColorPickerModule,
   ],
-  exports: [
-    QueryComponent
-  ],
+  exports: [QueryComponent],
 })
 export class HomeModule {}

src/app/services/electron.service.ts

@@ -145,6 +145,7 @@ export class ElectronService {
     // the mod has no backup, which means it was a clean export. it might need some reformatting to get it back in
     window.api.receive('loadmod', (mod: IModKit) => {
       const importedMod = importMod(mod);
+      this.modService.migrateMod(importedMod);
       this.modService.updateMod(importedMod);
       tryEnsureMaps();