feat(profile): separate weapon/basic abilities, add move/flee to basic

After-the-End-of-All-Things · Sep 18, 2023 · d2734b8 · d2734b8
1 parent cf3cc18
commit d2734b8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/client/src/app/pages/me/me.page.html b/client/src/app/pages/me/me.page.html
@@ -65,14 +65,14 @@
     </ion-row>
 
     <ion-row *ngIf="view === 'abilities'">
-      <ion-col>
+      <ion-col *ngIf="data.player && data.equipment">
         <ion-card>
           <ion-card-header>
             <ion-card-title>Basic Abilities</ion-card-title>
           </ion-card-header>
 
           <ion-card-content>
-            <ion-list *ngIf="data.player && data.equipment">
+            <ion-list>
               <ion-item
                 *ngFor="let ability of getBasicAbilities(data.player, data.equipment)"
               >
@@ -82,13 +82,29 @@
           </ion-card-content>
         </ion-card>
 
+        <ion-card>
+          <ion-card-header>
+            <ion-card-title>Weapon Abilities</ion-card-title>
+          </ion-card-header>
+
+          <ion-card-content>
+            <ion-list>
+              <ion-item
+                *ngFor="let ability of getWeaponAbilities(data.player, data.equipment)"
+              >
+                <app-combat-ability [ability]="ability"></app-combat-ability>
+              </ion-item>
+            </ion-list>
+          </ion-card-content>
+        </ion-card>
+
         <ion-card>
           <ion-card-header>
             <ion-card-title>Job Abilities</ion-card-title>
           </ion-card-header>
 
           <ion-card-content>
-            <ion-list *ngIf="data.player && data.equipment">
+            <ion-list>
               <ion-item
                 *ngFor="let ability of getJobAbilities(data.player, data.equipment)"
               >

diff --git a/client/src/app/pages/me/me.page.ts b/client/src/app/pages/me/me.page.ts
@@ -229,6 +229,18 @@ export class MePage implements OnInit {
   ): ICombatAbility[] {
     const itemAbilities = [
       this.contentService.getAbilityByName('Unarmed Attack'),
+      this.contentService.getAbilityByName('Move'),
+      this.contentService.getAbilityByName('Flee'),
+    ];
+
+    return [...itemAbilities].filter(Boolean) as ICombatAbility[];
+  }
+
+  getWeaponAbilities(
+    player: IPlayer,
+    equipment: Record<ItemSlot, IEquipment>,
+  ): ICombatAbility[] {
+    const itemAbilities = [
       ...Object.values(equipment)
         .filter(Boolean)
         .map((item) => {