diff --git a/client/src/app/components/combat-ability/combat-ability.component.scss b/client/src/app/components/combat-ability/combat-ability.component.scss
index 1ada99a..df6d3c1 100644
--- a/client/src/app/components/combat-ability/combat-ability.component.scss
+++ b/client/src/app/components/combat-ability/combat-ability.component.scss
@@ -14,7 +14,7 @@
margin-right: 12px;
.ability-image-container {
- margin-top: 20px;
+ margin-top: 4px;
max-height: 48px;
border-color: #000;
}
@@ -27,6 +27,10 @@
.title {
display: flex;
align-items: center;
+ font-size: 16px;
+ margin-top: 0;
+ margin-bottom: 0;
+ margin-left: 4px;
.name, app-element-icon, .ct, .cd, .type {
margin-right: 5px;
diff --git a/client/src/app/pages/combat/combat.page.scss b/client/src/app/pages/combat/combat.page.scss
index fcbe0e6..8dbcb9a 100644
--- a/client/src/app/pages/combat/combat.page.scss
+++ b/client/src/app/pages/combat/combat.page.scss
@@ -182,7 +182,7 @@
}
.ability-modal {
- --padding-top: 0;
+ --padding-top: 16px;
}
.ability-list {
diff --git a/client/src/app/pages/me/me.page.html b/client/src/app/pages/me/me.page.html
index e15134d..5211ce0 100644
--- a/client/src/app/pages/me/me.page.html
+++ b/client/src/app/pages/me/me.page.html
@@ -24,7 +24,7 @@
- {{ data.player?.job }} Abilities
+ Your Abilities
@@ -67,10 +67,30 @@
+
+ Basic Abilities
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Job Abilities
+
+
diff --git a/client/src/app/pages/me/me.page.ts b/client/src/app/pages/me/me.page.ts
index 2ab80e5..29921e3 100644
--- a/client/src/app/pages/me/me.page.ts
+++ b/client/src/app/pages/me/me.page.ts
@@ -220,7 +220,7 @@ export class MePage implements OnInit {
];
}
- getAbilities(
+ getBasicAbilities(
player: IPlayer,
equipment: Record,
): ICombatAbility[] {
@@ -236,6 +236,13 @@ export class MePage implements OnInit {
.flat(),
];
+ return [...itemAbilities].filter(Boolean) as ICombatAbility[];
+ }
+
+ getJobAbilities(
+ player: IPlayer,
+ equipment: Record,
+ ): ICombatAbility[] {
const jobAbilities = Object.values(this.contentService.abilities).filter(
(ability) => {
return (
@@ -245,9 +252,7 @@ export class MePage implements OnInit {
},
);
- return [...itemAbilities, ...jobAbilities].filter(
- Boolean,
- ) as ICombatAbility[];
+ return [...jobAbilities].filter(Boolean) as ICombatAbility[];
}
nextLevelXp(level: number) {